Author: adietish Date: 2011-07-08 07:07:29 -0400 (Fri, 08 Jul 2011) New Revision: 32753 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.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java Log: [JBIDE-9215] moved #cancelPolling and #stopPolling to the superclass, made pollThread private 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-08 10:18:16 UTC (rev 32752) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-08 11:07:29 UTC (rev 32753) @@ -25,7 +25,7 @@ public abstract class AbstractJBossBehaviourDelegate implements IJBossBehaviourDelegate { private DelegatingServerBehavior actualBehavior; - protected PollThread pollThread = null; + private PollThread pollThread = null; @Override public void setActualBehaviour(DelegatingServerBehavior actualBehaviour) { @@ -95,6 +95,15 @@ this.pollThread = PollThreadUtils.pollServer(expectedState, poller, pollThread, actualBehavior); } + protected void stopPolling() { + cancelPolling(null); + } + + protected void cancelPolling(String message) { + PollThreadUtils.cancelPolling(message, this.pollThread); + this.pollThread = null; + } + protected void setServerStopping() { actualBehavior.setServerStopping(); } 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-08 10:18:16 UTC (rev 32752) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-08 11:07:29 UTC (rev 32753) @@ -41,7 +41,6 @@ import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.LocalStopLaunchConfigurator; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils; -import org.jboss.ide.eclipse.as.core.util.PollThreadUtils; import org.jboss.ide.eclipse.as.core.util.RuntimeUtils; import org.jboss.ide.eclipse.as.core.util.ThreadUtils; @@ -199,15 +198,6 @@ return process; } - protected void stopPolling() { - cancelPolling(null); - } - - protected void cancelPolling(String message) { - PollThreadUtils.cancelPolling(message, this.pollThread); - this.pollThread = null; - } - public void publishStart(final IProgressMonitor monitor) throws CoreException { if( shouldSuspendScanner() ) { ExtensionManager.getDefault().getJMXRunner().beginTransaction(getServer(), this); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-08 10:18:16 UTC (rev 32752) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-08 11:07:29 UTC (rev 32753) @@ -25,9 +25,7 @@ @Override protected void pollServer(final boolean expectedState) { - if( pollThread != null ) - pollThread.cancel(); - + stopPolling(); IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); // IF shutting down a process started OUTSIDE of eclipse, force use the web poller, // since there's no process watch for shutdowns