[Smartfrog-checkins] core/smartfrog/src/org/smartfrog/services/shellscript ScriptRun.java,1.1,1.2 ScriptRunImpl.java,1.1,1.2

[Steve L. <st...@us...>]

Update of /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/services/shellscript
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19346/smartfrog/src/org/smartfrog/services/shellscript

Modified Files:
	ScriptRun.java ScriptRunImpl.java 
Log Message:
bit of refactoring

Index: ScriptRun.java
===================================================================
RCS file: /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/services/shellscript/ScriptRun.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ScriptRun.java	15 Mar 2005 03:11:08 -0000	1.1
--- ScriptRun.java	17 Mar 2005 16:05:25 -0000	1.2
***************
*** 29,33 ****
      static final int STATE_PROCESSING = 3;
  
!     long ID = -1;
  
      public ScriptRun( long ID)
--- 29,33 ----
      static final int STATE_PROCESSING = 3;
  
!     private long ID = -1;
  
      public ScriptRun( long ID)
***************
*** 40,42 ****
--- 40,49 ----
      public abstract void stopScriptRunner( long ID) throws Exception;
  
+     public long getID() {
+         return ID;
+     }
+ 
+     public void setID(long ID) {
+         this.ID = ID;
+     }
  }

Index: ScriptRunImpl.java
===================================================================
RCS file: /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/services/shellscript/ScriptRunImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ScriptRunImpl.java	15 Mar 2005 03:11:08 -0000	1.1
--- ScriptRunImpl.java	17 Mar 2005 16:05:26 -0000	1.2
***************
*** 1,3 ****
! /** (C) Copyright 1998-2004 Hewlett-Packard Development Company, LP
  
  This library is free software; you can redistribute it and/or
--- 1,3 ----
! /** (C) Copyright 1998-2005 Hewlett-Packard Development Company, LP
  
  This library is free software; you can redistribute it and/or
***************
*** 38,42 ****
  
    private int state = STATE_INACTIVE;
-   private long ID = -1;
  
    private String hostName = null;
--- 38,41 ----
***************
*** 49,53 ****
    }
  
!   java.lang.Runtime runtime = null;
  
    private LogSF sfLog = LogFactory.sfGetProcessLog(); //Temp log until getting its own.
--- 48,52 ----
    }
  
!   Runtime runtime = null;
  
    private LogSF sfLog = LogFactory.sfGetProcessLog(); //Temp log until getting its own.
***************
*** 73,81 ****
    }
  
!   public synchronized void stop() {
      if (runProcess != null) {
        runProcess.kill();
        runProcess = null;
!       ID = -1;
      }
    }
--- 72,80 ----
    }
  
!     public synchronized void stop() {
      if (runProcess != null) {
        runProcess.kill();
        runProcess = null;
!       setID(-1);
      }
    }
***************
*** 130,134 ****
      }
  
!     this.ID = ID;
  
      try {
--- 129,133 ----
      }
  
!     this.setID(ID);
  
      try {
***************
*** 148,152 ****
      String message = null;
  
!     if (this.ID != ID) {
        message = "It is not processing  ID: " + ID;
      }
--- 147,151 ----
      String message = null;
  
!     if (this.getID() != ID) {
        message = "It is not processing  ID: " + ID;
      }
***************
*** 162,166 ****
        runProcess.kill();
        runProcess = null;
!       this.ID = -1;
      }
    }
--- 161,165 ----
        runProcess.kill();
        runProcess = null;
!       this.setID(-1);
      }
    }