Author: dgolovin Date: 2012-04-02 14:08:05 -0400 (Mon, 02 Apr 2012) New Revision: 39971 Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java Log: https://issues.jboss.org/browse/JBIDE-11244 Auto-discover all the modules and add them to the configuration on GWT project import switched to MavenProject.getPlugin("org.apache.maven.plugins:maven-war-plugin") instead of iteration over plugins as fred suggested Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java 2012-04-02 17:04:07 UTC (rev 39970) +++ trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java 2012-04-02 18:08:05 UTC (rev 39971) @@ -25,34 +25,27 @@ private static final Logger log = LoggerFactory.getLogger(AbstractProjectConfigurator.class); - public static final String CODEHAUS_GROUP_ID = "org.codehaus.mojo"; - public static final String GWT_MAVEN_PLUGIN_ARTIFACT_ID = "gwt-maven-plugin"; + public static final String GWT_WAR_MAVEN_PLUGIN_KEY = "org.apache.maven.plugins:maven-war-plugin"; @Override - public void configure(ProjectConfigurationRequest arg0, IProgressMonitor arg1) throws CoreException { + public void configure(ProjectConfigurationRequest projectConfig, IProgressMonitor monitor) throws CoreException { IPreferenceStore store = Activator.getDefault().getPreferenceStore(); boolean configureGWT = store.getBoolean(Activator.CONFIGURE_GWT); log.debug("GWT Entry Point Modules configuration is {}",configureGWT ? "enabled" : "disabled"); - if(configureGWT) { - List<Plugin> plugins = arg0.getMavenProjectFacade().getMavenProject().getBuildPlugins(); - for (Plugin plugin : plugins) { - if(CODEHAUS_GROUP_ID.equals(plugin.getGroupId()) && GWT_MAVEN_PLUGIN_ARTIFACT_ID.equals(plugin.getArtifactId())) { - log.debug("Configure Entry Point Modules for GWT Project {}", arg0.getProject().getName()); - IModule[] modules = ModuleUtils.findAllModules(JavaCore.create(arg0.getProject()),false); - List<String> modNames = new ArrayList<String>(); - for (IModule iModule : modules) { - modNames.add(iModule.getQualifiedName()); - log.debug("\t {}",iModule.getQualifiedName()); - } - try { - GWTProjectProperties.setEntryPointModules(arg0.getProject(), modNames); - } catch (BackingStoreException e) { - log.error("Ecseption in Maven GWT Configurator", e); - } - break; - } + if(configureGWT && projectConfig.getMavenProject().getPlugin(GWT_WAR_MAVEN_PLUGIN_KEY)!=null) { + log.debug("Configure Entry Point Modules for GWT Project {}", projectConfig.getProject().getName()); + IModule[] modules = ModuleUtils.findAllModules(JavaCore.create(projectConfig.getProject()),false); + List<String> modNames = new ArrayList<String>(); + for (IModule iModule : modules) { + modNames.add(iModule.getQualifiedName()); + log.debug("\t {}",iModule.getQualifiedName()); } + try { + GWTProjectProperties.setEntryPointModules(projectConfig.getProject(), modNames); + } catch (BackingStoreException e) { + log.error("Ecseption in Maven GWT Configurator", e); + } } } }