Author: adietish Date: 2011-06-08 14:19:51 -0400 (Wed, 08 Jun 2011) New Revision: 31920 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java Log: [JBIDE-9054] extracted method to add deploy markers for several artifacts to DeploymentMarkerUtils Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-06-08 17:55:51 UTC (rev 31919) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-06-08 18:19:51 UTC (rev 31920) @@ -14,6 +14,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.util.Iterator; +import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -22,6 +24,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.model.IModuleFile; @@ -86,6 +89,14 @@ return Status.OK_STATUS; } + public static IStatus addDoDeployMarker(IJBossServerPublishMethod method, IServer server, + List<IPath> deployPaths, IProgressMonitor monitor) throws CoreException { + for(Iterator<IPath> pathsIterator = deployPaths.iterator(); pathsIterator.hasNext(); ) { + addDoDeployMarker(method, server, pathsIterator.next(), new SubProgressMonitor(monitor, 1)); + } + return Status.OK_STATUS; + } + private static IModuleFile createBlankModule() { return new ModuleFile(getOrCreateBlankFile(), "", new Path("/")); //$NON-NLS-1$ //$NON-NLS-2$ } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-08 17:55:51 UTC (rev 31919) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-08 18:19:51 UTC (rev 31920) @@ -122,18 +122,15 @@ // Handle the dodeploy DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(getServer()); Object o = beh.getPublishData(JBoss7JSTPublisher.MARK_DO_DEPLOY); - if (o != null && (o instanceof List<?>)) { - List<IPath> l = (List<IPath>) o; - int size = l.size(); - monitor.beginTask("Completing Publishes", size + 1); //$NON-NLS-1$ - Iterator<IPath> i = l.iterator(); - while (i.hasNext()) { - DeploymentMarkerUtils.addDoDeployMarker(method, getServer(), i.next(), new SubProgressMonitor(monitor, - 1)); - } - super.publishFinish(new SubProgressMonitor(monitor, 1)); - } else + if (!(o instanceof List<?>)) { super.publishFinish(monitor); + } + + List<IPath> paths = (List<IPath>) o; + monitor.beginTask("Completing Publishes", paths.size() + 1); //$NON-NLS-1$ + DeploymentMarkerUtils.addDoDeployMarker(method, getServer(), paths, monitor); + + super.publishFinish(new SubProgressMonitor(monitor, 1)); } protected IJBoss7ManagerService getService() throws Exception {