[jbosstools-commits] JBoss Tools SVN: r7218 - 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-31 15:42:40 -0400 (Mon, 31 Mar 2008)
New Revision: 7218

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
Log:
JBDS-291 - which was filed in the wrong place ;) 
Regression from 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-31 18:53:57 UTC (rev 7217)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java	2008-03-31 19:42:40 UTC (rev 7218)
@@ -26,7 +26,6 @@
 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;
@@ -35,7 +34,6 @@
 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;
@@ -119,13 +117,13 @@
 			PublishEvent modulePublishEvent = PublisherEventLogger.createModuleRootEvent(publishRootEvent, module, kind, deltaKind, modulePublishState);
 			
 			IModule lastMod = module[module.length -1];
-			if( lastMod.getProject() != null && 
-					ModuleCoreNature.isFlexibleProject(lastMod.getProject())) {
-				publisher = new JstPublisher(getServer(), modulePublishEvent);
-			} else if( isPackagesTypeModule(lastMod) ) {
+			if( isPackagesTypeModule(lastMod) ) {
 				publisher = new PackagesPublisher(getServer(), modulePublishEvent);
 			} else if( lastMod.getModuleType().getId().equals("jboss.singlefile")){
 				publisher = new SingleFilePublisher(getServer(), modulePublishEvent);
+			} else if( lastMod.getProject() != null && 
+					ModuleCoreNature.isFlexibleProject(lastMod.getProject())) {
+				publisher = new JstPublisher(getServer(), modulePublishEvent);
 			} else {
 				publisher = new NullPublisher();
 			}