Author: dgolovin
Date: 2012-04-03 17:28:39 -0400 (Tue, 03 Apr 2012)
New Revision: 40018
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
check for none java project added to avoid NP Exceptions
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-03
21:06:25 UTC (rev 40017)
+++
trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java 2012-04-03
21:28:39 UTC (rev 40018)
@@ -17,6 +17,7 @@
import org.apache.maven.plugin.MojoExecution;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.m2e.core.project.MavenProjectChangedEvent;
@@ -44,18 +45,24 @@
boolean configureGWT = store.getBoolean(Activator.CONFIGURE_GWT);
log.debug("GWT Entry Point Modules configuration is {}",configureGWT ?
"enabled" : "disabled");
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());
+ String projectName = projectConfig.getProject().getName();
+ IJavaProject javaProject = JavaCore.create(projectConfig.getProject());
+ if(javaProject!=null) {
+ log.debug("Configure Entry Point Modules for GWT Project {}",
projectName);
+ IModule[] modules = ModuleUtils.findAllModules(javaProject,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("Exception in Maven GWT Configurator", e);
+ }
+ } else {
+ log.debug("Skip configurator for non Java project {}",projectName);
}
- try {
- GWTProjectProperties.setEntryPointModules(projectConfig.getProject(), modNames);
- } catch (BackingStoreException e) {
- log.error("Exception in Maven GWT Configurator", e);
- }
}
}
}