[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server ...

[Robert Stryker]

  User: rawb    
  Date: 06/07/13 00:15:11

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server 
                        ServerStateChecker.java
  Log:
  Added log element for canceled state changes. 
  
  Revision  Changes    Path
  1.8       +17 -2     jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerStateChecker.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- ServerStateChecker.java	10 Jul 2006 18:48:47 -0000	1.7
  +++ ServerStateChecker.java	13 Jul 2006 04:15:11 -0000	1.8
  @@ -21,8 +21,8 @@
    */
   package org.jboss.ide.eclipse.as.core.server;
   
  -import org.eclipse.ant.internal.ui.preferences.AddPropertyDialog;
   import org.eclipse.debug.core.model.IProcess;
  +import org.eclipse.wst.server.core.IServer;
   import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
   import org.jboss.ide.eclipse.as.core.client.TwiddleLauncher;
   import org.jboss.ide.eclipse.as.core.client.TwiddleLauncher.TwiddleLogEvent;
  @@ -30,7 +30,6 @@
   import org.jboss.ide.eclipse.as.core.model.ServerProcessLog.ProcessLogEvent;
   import org.jboss.ide.eclipse.as.core.model.ServerProcessModel.ProcessData;
   import org.jboss.ide.eclipse.as.core.model.ServerProcessModel.ServerProcessModelEntity;
  -import org.jboss.ide.eclipse.as.core.util.ASDebug;
   
   public class ServerStateChecker extends Thread implements IServerProcessListener {
   
  @@ -91,6 +90,13 @@
   		
   		boolean twiddleResults = !expectedState;
   		while( current < max && twiddleResults != expectedState && !canceled) {
  +			// short circuit
  +			if( jbServer.getServer().getServerState() == IServer.STATE_STOPPED || 
  +					jbServer.getServer().getServerState() == IServer.STATE_STARTED) { canceled = true; }
  +
  +			if( ServerProcessModel.allProcessesTerminated(ent.getProcesses(ServerProcessModel.START_PROCESSES))) {
  +				canceled = true;
  +			}
   			
   			int res = getTwiddleResults(ent, jbServer, args);
   			if( res == STATE_TRUE ) {
  @@ -135,6 +141,7 @@
   	}
   	
   	private void dieCanceled() {
  +		eventLog.addChild(new StateCheckerLogEvent(StateCheckerLogEvent.SERVER_STATE_CHANGE_CANCELED));
   		eventLog.setComplete();
   		ent.getEventLog().branchChanged();
   		ent.removeSPListener(this);
  @@ -148,6 +155,8 @@
   		public static final String EVENT_TYPE = "_EVENT_TYPE_";
   		public static final String TIME = "_TIME_";
   		
  +		
  +		public static final int SERVER_STATE_CHANGE_CANCELED = 1;
   		public static final int SERVER_STARTING = 2;
   		public static final int SERVER_STOPPING = 3;
   		public static final int SERVER_UP = 4;
  @@ -180,10 +189,16 @@
   			setProperty(CURRENT_STATE, new Integer(type));
   		}
   		
  +		public StateCheckerLogEvent(int type) {
  +			super(type);
  +			setProperty(CURRENT_STATE, new Integer(type));
  +		}
  +		
   		public String[] getAvailableProperties() {
   			if( getEventType() == BEFORE ) return new String[] {EXPECTED_STATE};
   			if( getEventType() == DURING ) return new String[] {CURRENT_STATE, TIME, TwiddleLogEvent.ARGS, TwiddleLogEvent.OUT};
   			if( getEventType() == AFTER ) return new String[] {EXPECTED_STATE, CURRENT_STATE, SUCCESS, TIME};
  +			if( getEventType() == SERVER_STATE_CHANGE_CANCELED ) return new String[] {};
   			return new String[] {};
   		}