Author: adietish Date: 2011-06-08 16:33:05 -0400 (Wed, 08 Jun 2011) New Revision: 31922 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 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/util/ServerConverter.java Log: [JBIDE-9100] hid the list of makers (that shall be created) behind accessors in the server behavior. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2011-06-08 18:58:13 UTC (rev 31921) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2011-06-08 20:33:05 UTC (rev 31922) @@ -10,9 +10,6 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.server.internal.v7; -import java.util.ArrayList; -import java.util.List; - import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; @@ -26,7 +23,6 @@ import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; -import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.util.ServerConverter; public class JBoss7JSTPublisher extends AbstractServerToolsPublisher { @@ -55,7 +51,7 @@ publishType == IJBossServerPublisher.INCREMENTAL_PUBLISH) { // Only mark a doDeploy file for the root module, but this must be delayed, // becuase we don't know how many children modules will get published here (SUCK) - JBoss7JSTPublisher.markDeployed(method, ds, module, monitor); + markDeployed(method, ds, module, monitor); } return s; } @@ -75,21 +71,13 @@ } - public static final String MARK_DO_DEPLOY = "org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher.markUndeploy"; //$NON-NLS-1$ // public static final String MARK_UNDEPLOY = "org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher.markUndeploy"; //$NON-NLS-1$ - public static void markDeployed(IJBossServerPublishMethod method,IDeployableServer server, + private void markDeployed(IJBossServerPublishMethod method,IDeployableServer server, IModule[] moduleTree, IProgressMonitor monitor ) throws CoreException { IPath p = PublishUtil.getDeployPath(method, moduleTree, server); - DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(server.getServer()); - Object o = beh.getPublishData(MARK_DO_DEPLOY); - if(!(o instanceof List<?>)) { - o = new ArrayList<IPath>(); - beh.setPublishData(MARK_DO_DEPLOY, o); - } - List<IPath> list = (List<IPath>)o; - if( !list.contains(p)) - list.add(p); + JBoss7ServerBehavior beh = ServerConverter.getJBoss7ServerBehavior(server.getServer()); + beh.markDoDeploy(p); } // public static void markUndeployed( 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 18:58:13 UTC (rev 31921) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-08 20:33:05 UTC (rev 31922) @@ -12,8 +12,8 @@ import java.text.MessageFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import org.eclipse.core.runtime.CoreException; @@ -44,6 +44,8 @@ public class JBoss7ServerBehavior extends JBossServerBehavior { + public static final String MARK_DO_DEPLOY = "org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher.markUndeploy"; //$NON-NLS-1$ + private IProcess serverProcess; private IJBoss7ManagerService service; private IDebugEventSetListener serverProcessListener; @@ -120,17 +122,17 @@ if (method == null) throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Not publishing")); //$NON-NLS-1$ // Handle the dodeploy - DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(getServer()); - Object o = beh.getPublishData(JBoss7JSTPublisher.MARK_DO_DEPLOY); - if (!(o instanceof List<?>)) { - super.publishFinish(monitor); + createDoDeployMarkers(monitor); + super.publishFinish(new SubProgressMonitor(monitor, 1)); + } + + private void createDoDeployMarkers(IProgressMonitor monitor) throws CoreException { + if (!hasMarkedDoDeploy()) { + return; } - - List<IPath> paths = (List<IPath>) o; + List<IPath> paths = getMarkedDoDeploy(); monitor.beginTask("Completing Publishes", paths.size() + 1); //$NON-NLS-1$ - DeploymentMarkerUtils.addDoDeployMarker(method, getServer(), paths, monitor); - - super.publishFinish(new SubProgressMonitor(monitor, 1)); + createDoDeployMarker(paths, monitor); } protected IJBoss7ManagerService getService() throws Exception { @@ -208,4 +210,35 @@ } } } + + public void markDoDeploy(IPath path) { + Object o = getPublishData(MARK_DO_DEPLOY); + if(!(o instanceof List<?>)) { + o = new ArrayList<IPath>(); + setPublishData(MARK_DO_DEPLOY, o); + } + List<IPath> list = (List<IPath>)o; + if( !list.contains(path)) { + list.add(path); + } + + } + + public boolean hasMarkedDoDeploy() { + return getMarkedDoDeploy().size() > 0; + } + + private List<IPath> getMarkedDoDeploy() { + DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(getServer()); + Object o = beh.getPublishData(MARK_DO_DEPLOY); + if (!(o instanceof List<?>)) { + return Collections.emptyList(); + } + return (List<IPath>) o; + } + + private void createDoDeployMarker(List<IPath> paths, IProgressMonitor monitor) throws CoreException { + DeploymentMarkerUtils.addDoDeployMarker(method, getServer(), paths, monitor); + } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-08 18:58:13 UTC (rev 31921) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-08 20:33:05 UTC (rev 31922) @@ -23,6 +23,7 @@ import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerBehavior; /** * @@ -68,6 +69,13 @@ return (DeployableServerBehavior)server.loadAdapter( DeployableServerBehavior.class, new NullProgressMonitor()); } + + public static JBoss7ServerBehavior getJBoss7ServerBehavior(IServer server) { + if( server == null ) return null; + return (JBoss7ServerBehavior)server.loadAdapter( + JBoss7ServerBehavior.class, new NullProgressMonitor()); + } + /** * Return all JBossServer instances from the ServerCore * @return