Author: dgolovin
Date: 2008-01-29 03:39:00 -0500 (Tue, 29 Jan 2008)
New Revision: 6005
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
Log:
fix test errors
java.lang.NullPointerException
at
org.jboss.tools.seam.core.project.facet.SeamRuntimeManager.getDefaultRuntimeForProject(SeamRuntimeManager.java:256)
at org.jboss.tools.seam.internal.core.SeamProject.getRuntime(SeamProject.java:171)
at org.jboss.tools.seam.internal.core.SeamProject.getRuntimeName(SeamProject.java:152)
at
org.jboss.tools.seam.internal.core.validation.SeamRuntimeValidation.validate(SeamRuntimeValidation.java:36)
there is no concept 'deaultSeamRuntime' for seam project
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java 2008-01-29
08:38:52 UTC (rev 6004)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java 2008-01-29
08:39:00 UTC (rev 6005)
@@ -244,7 +244,7 @@
* @param project
* @return
*/
- public static SeamRuntime getDefaultRuntimeForProject(IProject project) {
+ public static SeamRuntime getDefaultRuntimeForProject1(IProject project) {
if(project==null) {
throw new IllegalArgumentException("Project must not be null.");
}
@@ -253,6 +253,7 @@
IFacetedProject facetedProject = ProjectFacetsManager.create(project);
if(facetedProject!=null) {
IProjectFacetVersion facetVersion = facetedProject.getInstalledVersion(facet);
+ if(facetVersion==null) return null;
SeamVersion seamVersion =
SeamVersion.parseFromString(facetVersion.getVersionString());
return getInstance().getDefaultRuntime(seamVersion);
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-01-29
08:38:52 UTC (rev 6004)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-01-29
08:39:00 UTC (rev 6005)
@@ -167,9 +167,6 @@
ISeamProject sp = SeamCorePlugin.getSeamProject(p, false);
return sp == null ? null : sp.getRuntime();
}
- if(runtimeName == null) {
- return SeamRuntimeManager.getDefaultRuntimeForProject(project);
- }
return runtimeName == null ? null :
SeamRuntimeManager.getInstance().findRuntimeByName(runtimeName);
}
@@ -181,7 +178,7 @@
public void setRuntimeName(String runtimeName) {
if(this.runtimeName == runtimeName) return;
if(this.runtimeName != null && this.runtimeName.equals(runtimeName)) return;
- SeamRuntime d = SeamRuntimeManager.getDefaultRuntimeForProject(project);
+ SeamRuntime d = SeamRuntimeManager.getInstance().getRuntimeForProject(project);
boolean useDefaultRuntime = d != null && d.getName().equals(runtimeName);
if(useDefaultRuntime) {
Show replies by date