[jbosstools-commits] JBoss Tools SVN: r7126 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2008-03-25 19:25:47 -0400 (Tue, 25 Mar 2008)
New Revision: 7126

Modified:
   trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
   trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java
Log:
JBIDE-1829

Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java	2008-03-25 21:52:36 UTC (rev 7125)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java	2008-03-25 23:25:47 UTC (rev 7126)
@@ -106,7 +106,7 @@
 		} else if (DB_DEFAULT_SCHEMA_NAME.equals(propertyName)) {
 			return EMPTY_STRING;
 		} else if(JBOSS_AS_TARGET_RUNTIME.equals(propertyName)) {
-			return EMPTY_STRING;
+			return null;
 		}
 		return super.getDefaultProperty(propertyName);
 	}

Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java	2008-03-25 21:52:36 UTC (rev 7125)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java	2008-03-25 23:25:47 UTC (rev 7126)
@@ -159,18 +159,19 @@
 
 	private List<IServer> getServers(String runtimeName) {
 		ArrayList<IServer> list = new ArrayList<IServer>();
-		
-		if (runtimeName != null) {
-			IServer[] servers = ServerCore.getServers(); 
-			for (IServer server : servers) { 
-				IRuntime runtime = server.getRuntime(); 
-				if(runtime!=null) { 
-					String serverRuntimeName = runtime.getName(); 
-					if(runtimeName.equals(serverRuntimeName)) { 
-						list.add(server); 
+		if( runtimeName != null ) {
+			if (runtimeName != null) {
+				IServer[] servers = ServerCore.getServers(); 
+				for (IServer server : servers) { 
+					IRuntime runtime = server.getRuntime(); 
+					if(runtime!=null) { 
+						String serverRuntimeName = runtime.getName(); 
+						if(runtimeName.equals(serverRuntimeName)) { 
+							list.add(server); 
+						} 
 					} 
 				} 
-			} 
+			}
 		}
 		return list;
 	}
@@ -230,6 +231,9 @@
 	}
 	
 	private String getRuntimeName(Object rt) {
+		if( rt == null ) {
+			return null;
+		}
 		String rtName = null;
 		if (rt instanceof org.eclipse.wst.common.project.facet.core.runtime.IRuntime) {
 			rtName = ((org.eclipse.wst.common.project.facet.core.runtime.IRuntime)rt).getName();