Author: adietish Date: 2011-07-07 09:17:26 -0400 (Thu, 07 Jul 2011) New Revision: 32706 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java Log: [JBIDE-9215] moved polling related code to superclass of all delegates Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-07 13:14:10 UTC (rev 32705) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-07 13:17:26 UTC (rev 32706) @@ -16,14 +16,17 @@ import org.eclipse.core.runtime.Status; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IJBoss6Server; +import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; +import org.jboss.ide.eclipse.as.core.util.PollThreadUtils; import org.jboss.ide.eclipse.as.core.util.ServerConverter; public abstract class AbstractJBossBehaviourDelegate implements IJBossBehaviourDelegate { private DelegatingServerBehavior actualBehavior; - + protected PollThread pollThread = null; + @Override public void setActualBehaviour(DelegatingServerBehavior actualBehaviour) { this.actualBehavior = actualBehaviour; @@ -87,4 +90,13 @@ return args; } + protected void pollServer(final boolean expectedState) { + IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); + this.pollThread = PollThreadUtils.pollServer(expectedState, poller , pollThread, getActualBehavior()); + } + + protected void pollServer(boolean expectedState, IServerStatePoller poller) { + this.pollThread = PollThreadUtils.pollServer(expectedState, poller, pollThread, getActualBehavior()); + } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-07 13:14:10 UTC (rev 32705) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-07 13:17:26 UTC (rev 32706) @@ -53,7 +53,6 @@ private static final String STOP_LAUNCH_TYPE = "org.jboss.ide.eclipse.as.core.server.stopLaunchConfiguration"; //$NON-NLS-1$ - protected PollThread pollThread = null; protected IProcess process; protected boolean nextStopRequiresForce = false; public LocalJBossBehaviorDelegate() { @@ -209,16 +208,6 @@ return process; } - protected void pollServer(final boolean expectedState) { - IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); - this.pollThread = PollThreadUtils.pollServer(expectedState, poller , pollThread, getActualBehavior()); - } - - protected void pollServer(boolean expectedState, IServerStatePoller poller) { - this.pollThread = PollThreadUtils.pollServer(expectedState, poller, pollThread, getActualBehavior()); - } - - protected void stopPolling() { cancelPolling(null); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-07 13:14:10 UTC (rev 32705) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-07 13:17:26 UTC (rev 32706) @@ -14,12 +14,9 @@ import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.internal.AbstractJBossBehaviourDelegate; -import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences; -import org.jboss.ide.eclipse.as.core.util.PollThreadUtils; public abstract class AbstractRSEBehaviourDelegate extends AbstractJBossBehaviourDelegate { - private PollThread pollThread = null; @Override public String getBehaviourTypeId() { @@ -61,7 +58,4 @@ pollServer(IServerStatePoller.SERVER_DOWN); } - protected void pollServer(final boolean expectedState) { - IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); - this.pollThread = PollThreadUtils.pollServer(expectedState, poller, pollThread, getActualBehavior()); } }