Author: adietish Date: 2011-07-12 08:28:54 -0400 (Tue, 12 Jul 2011) New Revision: 32843 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java Log: [JBIDE-9215] reformatted/refactored to be better readable 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-12 12:23:22 UTC (rev 32842) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-12 12:28:54 UTC (rev 32843) @@ -63,24 +63,21 @@ } public void stop(boolean force) { int state = getServer().getServerState(); - if( force - || !isProcessRunning() - || state == IServer.STATE_STOPPED + if (force + || !isProcessRunning() + || state == IServer.STATE_STOPPED || nextStopRequiresForce) { forceStop(); - return; - } - - // if we're starting up or shutting down and they've tried again, - // then force it to stop. - if( state == IServer.STATE_STARTING || state == IServer.STATE_STOPPING ) { + } else if (state == IServer.STATE_STARTING + || state == IServer.STATE_STOPPING) { + // if we're starting up or shutting down and they've tried again, + // then force it to stop. stopPolling(); forceStop(); - return; + } else { + setServerStopping(); + gracefullStop(); } - - setServerStopping(); - gracefullStop(); } @Override