Author: dgolovin Date: 2012-04-02 17:01:19 -0400 (Mon, 02 Apr 2012) New Revision: 39974 Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java Log: https://issues.jboss.org/browse/JBIDE-11244 Auto-discover all the modules and add them to the configuration on GWT project import patch to maven.ui to let enable/disable GWT Configurator plugin Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2012-04-02 20:55:30 UTC (rev 39973) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2012-04-02 21:01:19 UTC (rev 39974) @@ -87,6 +87,10 @@ public static final boolean CONFIGURE_JPA_VALUE = true; + public static final String CONFIGURE_GWT = "configureGWT"; //$NON-NLS-1$ + + public static final boolean CONFIGURE_GWT_VALUE = true; + // The shared instance private static Activator plugin; Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java 2012-04-02 20:55:30 UTC (rev 39973) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java 2012-04-02 21:01:19 UTC (rev 39974) @@ -56,6 +56,7 @@ public static String ConfiguratorPreferencePage_Configure_Seam_Runtime; public static String ConfiguratorPreferencePage_Configure_Seam_when_importing_Maven_projects; public static String ConfiguratorPreferencePage_When_importing_Maven_projects_configure_the_following; + public static String ConfiguratorPreferencePage_Configure_GWT; public static String ProfileManager_Updating_maven_profiles; public static String ProfileSelectionHandler_Loading_maven_profiles; Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2012-04-02 20:55:30 UTC (rev 39973) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2012-04-02 21:01:19 UTC (rev 39974) @@ -34,7 +34,9 @@ ConfiguratorPreferencePage_Configure_Seam_Artifacts=Seam Artifacts (view folder, model source folder, package ...) ConfiguratorPreferencePage_Configure_Seam_Runtime=Seam Runtime ConfiguratorPreferencePage_Configure_Seam_when_importing_Maven_projects=Seam +ConfiguratorPreferencePage_Configure_GWT=GWT Entry Point Modules + ConfiguratorPreferencePage_When_importing_Maven_projects_configure_the_following=When importing Maven projects configure the following: ProfileManager_Updating_maven_profiles=Updating maven profiles Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java 2012-04-02 20:55:30 UTC (rev 39973) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencePage.java 2012-04-02 21:01:19 UTC (rev 39974) @@ -43,6 +43,7 @@ private static final String ORG_JBOSS_TOOLS_MAVEN_SEAM = "org.jboss.tools.maven.seam"; //$NON-NLS-1$ private static final String ORG_JBOSS_TOOLS_MAVEN_JAXRS = "org.jboss.tools.maven.jaxrs"; //$NON-NLS-1$ private static final String ORG_JBOSS_TOOLS_MAVEN_JPA = "org.jboss.tools.maven.jpa"; //$NON-NLS-1$ + private static final String ORG_JBOSS_TOOLS_MAVEN_GWT = "org.jboss.tools.maven.gwt"; //$NON-NLS-1$ private Button configureSeamButton; private Button configureSeamRuntimeButton; @@ -56,6 +57,7 @@ private Button configureHibernateButton; private Button configureJaxRsButton; private Button configureJpaButton; + private Button configureGwtButton; @Override protected Control createContents(Composite parent) { @@ -156,6 +158,14 @@ configureJpaButton.setSelection(configureJpa); } + if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_GWT)) { + configureGwtButton = new Button(composite,SWT.CHECK); + configureGwtButton.setText(Messages.ConfiguratorPreferencePage_Configure_GWT); + boolean configureJpa = store.getBoolean(Activator.CONFIGURE_GWT); + configureGwtButton.setSelection(configureJpa); + } + + return composite; } @@ -233,6 +243,10 @@ store.setValue(Activator.CONFIGURE_JPA, Activator.CONFIGURE_JPA_VALUE); } + if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_GWT)) { + store.setValue(Activator.CONFIGURE_GWT, Activator.CONFIGURE_GWT_VALUE); + } + super.performDefaults(); } @@ -272,6 +286,10 @@ store.setValue(Activator.CONFIGURE_JPA, configureJpaButton.getSelection()); } + if (bundleExists(ORG_JBOSS_TOOLS_MAVEN_GWT)) { + store.setValue(Activator.CONFIGURE_GWT, configureGwtButton.getSelection()); + } + return super.performOk(); } Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java 2012-04-02 20:55:30 UTC (rev 39973) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/preferences/ConfiguratorPreferencesInitializer.java 2012-04-02 21:01:19 UTC (rev 39974) @@ -62,7 +62,10 @@ Activator.CONFIGURE_JAXRS_VALUE); node.putBoolean( Activator.CONFIGURE_JPA, - Activator.CONFIGURE_JPA_VALUE); + Activator.CONFIGURE_JPA_VALUE); + node.putBoolean( + Activator.CONFIGURE_GWT, + Activator.CONFIGURE_GWT_VALUE); } }