Author: dgolovin
Date: 2012-06-03 03:26:41 -0400 (Sun, 03 Jun 2012)
New Revision: 41661
Modified:
trunk/maven/plugins/org.jboss.tools.maven.gwt/
trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java
Log:
JBIDE-12048 Maven GWT compiler seem to assume projects that uses gwt-compiler is always a
WTP project
NullPointerException is fixed
Property changes on: trunk/maven/plugins/org.jboss.tools.maven.gwt
___________________________________________________________________
Modified: svn:ignore
- bin
+ bin
target
Added: svn:mergeinfo
+ /branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.gwt:41461-41660
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-06-03
07:23:42 UTC (rev 41660)
+++
trunk/maven/plugins/org.jboss.tools.maven.gwt/src/org/jboss/tools/maven/gwt/GWTProjectConfigurator.java 2012-06-03
07:26:41 UTC (rev 41661)
@@ -68,9 +68,11 @@
log.debug("Configure Output location for GWT Project {}", projectName);
try {
- IPath webContentPath = getWebContentFolder(projectConfig.getProject(), monitor);
- IFolder outputWorkspaceFolder =
projectConfig.getProject().getWorkspace().getRoot().getFolder(webContentPath);
- WebAppProjectProperties.setLastUsedWarOutLocation(projectConfig.getProject(),
outputWorkspaceFolder.getFullPath());
+ IPath webContentPath =
ProjectHome.getFirstWebContentPath(projectConfig.getProject());
+ if(webContentPath!=null) {
+ IFolder outputWorkspaceFolder =
projectConfig.getProject().getWorkspace().getRoot().getFolder(webContentPath);
+ WebAppProjectProperties.setLastUsedWarOutLocation(projectConfig.getProject(),
outputWorkspaceFolder.getFullPath());
+ }
} catch (BackingStoreException e) {
logError("Exception in Maven GWT Configurator, cannot set war output
location", e);
}
@@ -149,12 +151,4 @@
log.error(message, e);
MavenGWTPlugin.log(message,e);
}
-
- private IPath getWebContentFolder(IProject project, IProgressMonitor monitor) throws
CoreException {
- IPath webContentPath = ProjectHome.getFirstWebContentPath(project);
- Assert.isTrue(webContentPath != null && !webContentPath.isEmpty(),
- MessageFormat
- .format("No web content folder was found in project {0}",
project.getName()));
- return webContentPath;
- }
}
Show replies by date