Author: adietish Date: 2011-07-06 10:03:29 -0400 (Wed, 06 Jul 2011) New Revision: 32649 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/JBossServerBehavior.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/RSEBehaviourDelegate.java Log: [JBIDE-9215] renamed #serverStarting and #serverStopping to #setServerStarting and #setServerStopping 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-06 13:58:44 UTC (rev 32648) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-06 14:03:29 UTC (rev 32649) @@ -48,11 +48,21 @@ public void publishFinish(IProgressMonitor monitor) throws CoreException { } + @Deprecated public void serverStarting() { + setServerStarting(); + } + + public void setServerStarting() { actualBehavior.setServerStarting(); } + @Deprecated public void serverStopping() { + setServerStopping(); + } + + public void setServerStopping() { actualBehavior.setServerStopping(); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2011-07-06 13:58:44 UTC (rev 32648) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2011-07-06 14:03:29 UTC (rev 32649) @@ -52,8 +52,8 @@ public void stop(boolean force); public void publishStart(final IProgressMonitor monitor) throws CoreException; public void publishFinish(final IProgressMonitor monitor) throws CoreException; - public void serverStarting(); - public void serverStopping(); + public void setServerStarting(); + public void setServerStopping(); public IStatus canChangeState(String launchMode); public String getDefaultStopArguments() throws CoreException; } @@ -117,12 +117,12 @@ public void serverStarting() { setServerStarting(); - getDelegate().serverStarting(); + getDelegate().setServerStarting(); } public void serverStopping() { setServerStopping(); - getDelegate().serverStopping(); + getDelegate().setServerStopping(); } 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/LocalJBossBehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-06 13:58:44 UTC (rev 32648) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-06 14:03:29 UTC (rev 32649) @@ -80,7 +80,7 @@ return; } - serverStopping(); + setServerStopping(); gracefullStop(); } @@ -196,12 +196,12 @@ && !process.isTerminated(); } - public void serverStarting() { + public void setServerStarting() { nextStopRequiresForce = false; pollServer(IServerStatePoller.SERVER_UP); } - public void serverStopping() { + public void setServerStopping() { getActualBehavior().setServerStopping(); 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-06 13:58:44 UTC (rev 32648) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-06 14:03:29 UTC (rev 32649) @@ -41,12 +41,12 @@ } if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) { - serverStopping(); + setServerStopping(); serverStopped(); return; } - serverStopping(); + setServerStopping(); if (!gracefullStop().isOK()) { serverStarted(); } else { @@ -84,7 +84,7 @@ } } - public void serverStarting() { + public void setServerStarting() { pollServer(IServerStatePoller.SERVER_UP); } @@ -92,7 +92,7 @@ getActualBehavior().setServerStarted(); } - public void serverStopping() { + public void setServerStopping() { getActualBehavior().setServerStopping(); pollServer(IServerStatePoller.SERVER_DOWN); }