Consolidate the GWT Menus.

Author: branflake2267

plugins/com.google.gdt.eclipse.core/plugin.xml

@@ -31,10 +31,7 @@
       <page
             class="com.google.gdt.eclipse.core.properties.ui.CoreProjectPropertyPage"
             id="com.google.gdt.eclipse.core.properties.coreProjectPropertyPage"
-            name="Google Classic">
-         <enabledWhen>
-            <reference definitionId="com.google.gdt.eclipse.core.isGpeSelected"/>
-         </enabledWhen>
+            name="GWT">
       </page>
       <page
             category="com.google.gdt.eclipse.core.properties.coreProjectPropertyPage"

plugins/com.google.gdt.eclipse.core/src/com/google/gdt/eclipse/core/properties/ui/CoreProjectPropertyPage.java

@@ -39,7 +39,7 @@ protected Control createContents(Composite parent) {
     panel.setLayout(new GridLayout(1, false));
 
     Label blank = new Label(panel, SWT.NONE);
-    blank.setText("Expand the tree to configure your Google project properties.");
+    blank.setText("Expand the tree to configure your GWT project properties.");
 
     return panel;
   }

plugins/com.google.gdt.eclipse.maven/src/com/google/gdt/eclipse/maven/configurators/MavenProjectConfigurator.java

@@ -123,7 +123,7 @@ private void persistGwtNatureSettings(IProject project, MavenProject mavenProjec
       throws BackingStoreException {
     IPath warOutDir = getWarOutDir(project, mavenProject);
 
-    WebAppProjectProperties.setWarSrcDir(project, new Path(getWarSrcDir(mavenConfig))); // src/main/webapp
+    WebAppProjectProperties.setWarSrcDir(project, getWarSrcDir(mavenProject, mavenConfig)); // src/main/webapp
     WebAppProjectProperties.setWarSrcDirIsOutput(project, getLaunchFromHere(mavenConfig)); // false
 
     // TODO the extension should be used, from WarArgProcessor
@@ -337,29 +337,46 @@ private void resolveGwtDevJar(MavenProject mavenProject, IProgressMonitor monito
       } catch (CoreException exception) {
         Activator.logError(
             "MavenProjectConfigurator: Problem configuring the maven project because it could not download the "
-                + "gwt-dev.jar which is used to determine the version.", exception);
+                + "gwt-dev.jar which is used to determine the version.",
+            exception);
       }
     }
   }
 
   /**
    * Returns the war source directory such as src/main/webapp
    *
+   * @param mavenProject
+   *
    * @param config
    *          gwt-maven-maven config DOM
    * @return the {@link #WAR_SRC_DIR_PROPERTY_KEY} value from the config if it exists, {@link #WAR_SRC_DIR_DEFAULT}
    *         otherwise or if config is null
    */
-  private static final String getWarSrcDir(Xpp3Dom config) {
-    if (config == null) {
-      return WAR_SRC_DIR_DEFAULT;
+  private static final IPath getWarSrcDir(MavenProject mavenProject, Xpp3Dom config) {
+    String spath = WAR_SRC_DIR_DEFAULT;
+
+    if (config != null) {
+      for (Xpp3Dom child : config.getChildren()) {
+        if (child != null && WAR_SRC_DIR_PROPERTY_KEY.equals(child.getName())) {
+          spath = child.getValue() == null ? WAR_SRC_DIR_DEFAULT : child.getValue().trim();
+        }
+      }
     }
-    for (Xpp3Dom child : config.getChildren()) {
-      if (child != null && WAR_SRC_DIR_PROPERTY_KEY.equals(child.getName())) {
-        return child.getValue() == null ? WAR_SRC_DIR_DEFAULT : child.getValue().trim();
+
+    IPath path = null;
+    if (spath != null) {
+      path = new Path(spath);
+
+      String basePath = mavenProject.getBasedir().toPath().toAbsolutePath().toString();
+      String fullPath = basePath + "/" + spath;
+      java.io.File fullPathFile = new java.io.File(fullPath);
+      if (!fullPathFile.exists()) {
+        path = null;
       }
     }
-    return WAR_SRC_DIR_DEFAULT;
+
+    return path;
   }
 
   /**
@@ -376,8 +393,8 @@ private final boolean getLaunchFromHere(Xpp3Dom config) {
     }
     for (Xpp3Dom child : config.getChildren()) {
       if (child != null && ECLIPSE_LAUNCH_SRC_DIR_PROPERTY_KEY.equals(child.getName())) {
-        return child.getValue() == null ? ECLIPSE_LAUNCH_SRC_DIR_DEFAULT : Boolean
-            .parseBoolean(child.getValue().trim());
+        return child.getValue() == null ? ECLIPSE_LAUNCH_SRC_DIR_DEFAULT
+            : Boolean.parseBoolean(child.getValue().trim());
       }
     }
     return ECLIPSE_LAUNCH_SRC_DIR_DEFAULT;

plugins/com.google.gwt.eclipse.core/plugin.xml

@@ -691,7 +691,7 @@
             category="com.google.gdt.eclipse.core.properties.coreProjectPropertyPage"
             class="com.google.gwt.eclipse.core.properties.ui.GWTProjectPropertyPage"
             id="com.google.gwt.eclipse.core.properties.ui.gwtProjectPropertyPage"
-            name="GWT Classic">
+            name="Settings">
          <enabledWhen>
             <reference definitionId="com.google.gdt.eclipse.core.isGpeSelected"/>
          </enabledWhen>

plugins/com.google.gwt.eclipse.wtp/plugin.xml

@@ -91,18 +91,9 @@
   <!-- GWT Facet Properties -->
   <extension
 	     point="org.eclipse.ui.propertyPages">
-	  <!-- GWT -->
-	  <page
-	        class="com.google.gwt.eclipse.wtp.properties.ui.GWTRootProjectPropertyPage"
-	        id="com.google.gwt.eclipse.wtp.properties.ui.gwtRootProjectPropertyPage"
-	        name="GWT">
-	     <enabledWhen>
-	        <reference definitionId="com.google.gwt.eclipse.wtp.isGWTFacet"/>
-	     </enabledWhen>
-	  </page>
 	  <!-- GWT Facet -->
 	  <page
-	        category="com.google.gwt.eclipse.wtp.properties.ui.gwtRootProjectPropertyPage" 
+	        category="com.google.gdt.eclipse.core.properties.coreProjectPropertyPage" 
 	        class="com.google.gwt.eclipse.wtp.properties.ui.GWTFacetProjectPropertyPage"
 	        id="com.google.gwt.eclipse.wtp.properties.ui.gwtFacetProjectPropertyPage" 
 	        name="Facet Settings">