Author: adietish Date: 2011-07-07 09:14:10 -0400 (Thu, 07 Jul 2011) New Revision: 32705 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/IJBossBehaviourDelegate.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 trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java Log: [JBIDE-9215] renamed #setServerStarting and #setServerStopping to #serverIsStopping and #serverIsStarting since those methods should be called by the delegating server behavior to notify 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:01:44 UTC (rev 32704) +++ 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) @@ -49,14 +49,10 @@ protected abstract IStatus gracefullStop(); - @Deprecated - public void serverStarting() { - setServerStarting(); + public void serverIsStarting() { } - @Deprecated - public void serverStopping() { - setServerStopping(); + public void serverIsStopping() { } @Override 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:01:44 UTC (rev 32704) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-07 13:14:10 UTC (rev 32705) @@ -103,13 +103,13 @@ @Override public void setServerStarting() { super.setServerStarting(); - getDelegate().setServerStarting(); + getDelegate().serverIsStarting(); } @Override public void setServerStopping() { super.setServerStopping(); - getDelegate().setServerStopping(); + getDelegate().serverIsStopping(); } protected void publishStart(final IProgressMonitor monitor) throws CoreException { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2011-07-07 13:01:44 UTC (rev 32704) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2011-07-07 13:14:10 UTC (rev 32705) @@ -27,9 +27,9 @@ public void publishFinish(final IProgressMonitor monitor) throws CoreException; - public void setServerStarting(); + public void serverIsStarting(); - public void setServerStopping(); + public void serverIsStopping(); public IStatus canChangeState(String launchMode); 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:01:44 UTC (rev 32704) +++ 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) @@ -196,20 +196,12 @@ && !process.isTerminated(); } - /** - * ATTENTION: don't call this directly, use {@link #getActualBehavior().getServerStarting()} instead. - * if we would call the delegating server behavior here to set it's state, we would cause an infinite loop. - */ - public void setServerStarting() { + public void serverIsStarting() { nextStopRequiresForce = false; pollServer(IServerStatePoller.SERVER_UP); } - /** - * ATTENTION: don't call this directly, use {@link #getActualBehavior().getServerStopping()} instead. - * if we would call the delegating server behavior here to set it's state, we would cause an infinite loop. - */ - public void setServerStopping() { + public void serverIsStopping() { pollServer(IServerStatePoller.SERVER_DOWN); } 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:01:44 UTC (rev 32704) +++ 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) @@ -49,7 +49,7 @@ * ATTENTION: don't call this directly, use {@link #getActualBehavior().getServerStarting()} instead. * if we would call the delegating server behavior here to set it's state, we would cause an infinite loop. */ - public void setServerStarting() { + public void serverIsStarting() { pollServer(IServerStatePoller.SERVER_UP); } @@ -57,7 +57,7 @@ * ATTENTION: don't call this directly, use {@link #getActualBehavior().getServerStopping()} instead. * if we would call the delegating server behavior here to set it's state, we would cause an infinite loop. */ - public void setServerStopping() { + public void serverIsStopping() { pollServer(IServerStatePoller.SERVER_DOWN); } 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:01:44 UTC (rev 32704) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-07 13:14:10 UTC (rev 32705) @@ -56,11 +56,11 @@ } } - public void setServerStarting() { + public void serverIsStarting() { pollServer(IServerStatePoller.SERVER_UP); } - public void setServerStopping() { + public void serverIsStopping() { pollServer(IServerStatePoller.SERVER_DOWN); } }