[jbosstools-commits] JBoss Tools SVN: r7124 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2008-03-25 17:41:54 -0400 (Tue, 25 Mar 2008)
New Revision: 7124

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
Log:
JBIDE-1954

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java	2008-03-25 19:03:49 UTC (rev 7123)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java	2008-03-25 21:41:54 UTC (rev 7124)
@@ -26,6 +26,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -33,6 +34,8 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
 import org.eclipse.wst.server.core.IModule;
 import org.eclipse.wst.server.core.IServer;
 import org.eclipse.wst.server.core.IServerWorkingCopy;
@@ -116,7 +119,8 @@
 			PublishEvent modulePublishEvent = PublisherEventLogger.createModuleRootEvent(publishRootEvent, module, kind, deltaKind, modulePublishState);
 			
 			IModule lastMod = module[module.length -1];
-			if( isJstModule(lastMod) ) {
+			if( lastMod.getProject() != null && 
+					ModuleCoreNature.isFlexibleProject(lastMod.getProject())) {
 				publisher = new JstPublisher(getServer(), modulePublishEvent);
 			} else if( isPackagesTypeModule(lastMod) ) {
 				publisher = new PackagesPublisher(getServer(), modulePublishEvent);
@@ -156,16 +160,6 @@
 		return IJBossServerPublisher.NO_PUBLISH;
 	}
 	
-	/* Temporary and will need to be fixed */
-	// TODO: Change to if it is a flex project. Don't know how to do that yet. 
-	protected boolean isJstModule(IModule mod) {
-		String type = mod.getModuleType().getId();
-		if( type.equals("jst.ejb") || type.equals("jst.web") || 
-				type.equals("jst.ear") || type.equals("jst.utility") || type.equals("jst.appclient"))
-			return true;
-		return false;
-	}
-	
 	protected boolean isPackagesTypeModule(IModule module) {
 		return module.getModuleType().getId().equals(PackageModuleFactory.MODULE_TYPE);
 	}