Author: adietish Date: 2011-07-07 09:39:21 -0400 (Thu, 07 Jul 2011) New Revision: 32709 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/DelegatingServerBehavior.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 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/RSEBehaviourDelegate.java Log: [JBIDE-9215] removed #getActualBehaviour and allowed access to delegating behavior for superclass only 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:29:35 UTC (rev 32708) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-07 13:39:21 UTC (rev 32709) @@ -32,10 +32,6 @@ this.actualBehavior = actualBehaviour; } - public DelegatingServerBehavior getActualBehavior() { - return actualBehavior; - } - public IServer getServer() { return actualBehavior.getServer(); } @@ -92,11 +88,27 @@ protected void pollServer(final boolean expectedState) { IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); - this.pollThread = PollThreadUtils.pollServer(expectedState, poller , pollThread, getActualBehavior()); + this.pollThread = PollThreadUtils.pollServer(expectedState, poller , pollThread, actualBehavior); } protected void pollServer(boolean expectedState, IServerStatePoller poller) { - this.pollThread = PollThreadUtils.pollServer(expectedState, poller, pollThread, getActualBehavior()); + this.pollThread = PollThreadUtils.pollServer(expectedState, poller, pollThread, actualBehavior); } + protected void setServerStopping() { + actualBehavior.setServerStopping(); + } + + protected void setServerStopped() { + actualBehavior.setServerStopped(); + } + + protected void setServerStarted() { + actualBehavior.setServerStarted(); + } + + protected void setServerStarting() { + actualBehavior.setServerStarting(); + } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-07 13:29:35 UTC (rev 32708) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-07 13:39:21 UTC (rev 32709) @@ -122,6 +122,7 @@ super.publishFinish(monitor); } + @Deprecated protected boolean shouldSuspendScanner() { if( getServer().getServerState() != IServer.STATE_STARTED) return false; 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:29:35 UTC (rev 32708) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-07 13:39:21 UTC (rev 32709) @@ -79,7 +79,7 @@ return; } - getActualBehavior().setServerStopping(); + setServerStopping(); gracefullStop(); } @@ -99,7 +99,7 @@ if (stopProcess.getExitValue() == 0) { // TODO: correct concurrent access to process, pollThread and nextStopRequiresForce if( isProcessRunning() ) { - getActualBehavior().setServerStarted(); + setServerStarted(); cancelPolling(Messages.STOP_FAILED_MESSAGE); nextStopRequiresForce = true; } @@ -137,7 +137,7 @@ } } process = null; - getActualBehavior().setServerStopped(); + setServerStopped(); } protected void addForceStopFailedEvent(DebugException e) { @@ -251,12 +251,12 @@ } } } - + protected boolean shouldSuspendScanner() { - return getActualBehavior().shouldSuspendScanner() && - ExtensionManager.getDefault().getJMXRunner() != null; + return getServer().getServerState() != IServer.STATE_STARTED + && ExtensionManager.getDefault().getJMXRunner() != null; } - + protected void suspendDeployment(final MBeanServerConnection connection, IProgressMonitor monitor) throws Exception { ObjectName name = new ObjectName(IJBossRuntimeConstants.DEPLOYMENT_SCANNER_MBEAN_NAME); launchDeployCommand(connection, name, IJBossRuntimeConstants.STOP, monitor); 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-07 13:29:35 UTC (rev 32708) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-07 13:39:21 UTC (rev 32709) @@ -15,13 +15,15 @@ import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate; -import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.util.PollThreadUtils; public class LocalJBoss7BehaviorDelegate extends LocalJBossBehaviorDelegate { + public IStatus canChangeState(String launchMode) { return Status.OK_STATUS; } + + @Override protected void pollServer(final boolean expectedState) { if( pollThread != null ) pollThread.cancel(); @@ -29,10 +31,12 @@ 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 - if( !expectedState && process == null ) + if( !expectedState + && process == null ) { poller = PollThreadUtils.getPoller(WebPortPoller.WEB_POLLER_ID); - - this.pollThread = new PollThread(expectedState, poller, getActualBehavior()); - pollThread.start(); + pollServer(expectedState, poller); + } else { + super.pollServer(expectedState); + } } } 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:29:35 UTC (rev 32708) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-07 13:39:21 UTC (rev 32709) @@ -30,15 +30,15 @@ } if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) { - getActualBehavior().setServerStopped(); + setServerStopped(); return; } - getActualBehavior().setServerStopping(); + setServerStopping(); if (!gracefullStop().isOK()) { - getActualBehavior().setServerStarted(); + setServerStarted(); } else { - getActualBehavior().setServerStopped(); + setServerStopped(); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-07 13:29:35 UTC (rev 32708) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-07 13:39:21 UTC (rev 32709) @@ -28,8 +28,7 @@ @Override protected void forceStop() { - getActualBehavior().setServerStopped(); - return; + setServerStopped(); } @Override