Author: adietish Date: 2011-07-19 04:15:43 -0400 (Tue, 19 Jul 2011) New Revision: 33035 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 trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java Log: [JBIDE-9364] renamed #serverIsStarting to #onServerStarting and #serverIsStopping to #onServerStopping 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-19 00:29:48 UTC (rev 33034) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-19 08:15:43 UTC (rev 33035) @@ -48,10 +48,10 @@ protected abstract IStatus gracefullStop(); - public void serverIsStarting() { + public void onServerStarting() { } - public void serverIsStopping() { + public void onServerStopping() { } @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-19 00:29:48 UTC (rev 33034) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-19 08:15:43 UTC (rev 33035) @@ -108,13 +108,13 @@ @Override public void setServerStarting() { super.setServerStarting(); - getDelegate().serverIsStarting(); + getDelegate().onServerStarting(); } @Override public void setServerStopping() { super.setServerStopping(); - getDelegate().serverIsStopping(); + getDelegate().onServerStopping(); } 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-19 00:29:48 UTC (rev 33034) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2011-07-19 08:15:43 UTC (rev 33035) @@ -27,9 +27,9 @@ public void publishFinish(final IProgressMonitor monitor) throws CoreException; - public void serverIsStarting(); + public void onServerStarting(); - public void serverIsStopping(); + public void onServerStopping(); 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-19 00:29:48 UTC (rev 33034) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-19 08:15:43 UTC (rev 33035) @@ -183,12 +183,12 @@ && !process.isTerminated(); } - public void serverIsStarting() { + public void onServerStarting() { nextStopRequiresForce = false; pollServer(IServerStatePoller.SERVER_UP); } - public void serverIsStopping() { + public void onServerStopping() { 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-19 00:29:48 UTC (rev 33034) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-19 08:15:43 UTC (rev 33035) @@ -45,19 +45,13 @@ protected abstract String getShutdownCommand(IServer server) throws CoreException; - /** - * 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 serverIsStarting() { + @Override + public void onServerStarting() { 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 serverIsStopping() { + @Override + public void onServerStopping() { 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-19 00:29:48 UTC (rev 33034) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-19 08:15:43 UTC (rev 33035) @@ -59,12 +59,12 @@ } @Override - public void serverIsStarting() { + public void onServerStarting() { pollServer(IServerStatePoller.SERVER_UP); } @Override - public void serverIsStopping() { + public void onServerStopping() { pollServer(IServerStatePoller.SERVER_DOWN); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-19 00:29:48 UTC (rev 33034) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-19 08:15:43 UTC (rev 33035) @@ -41,12 +41,12 @@ } @Override - public void serverIsStarting() { + public void onServerStarting() { pollServer(IServerStatePoller.SERVER_UP); } @Override - public void serverIsStopping() { + public void onServerStopping() { pollServer(IServerStatePoller.SERVER_DOWN); }