[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner Scanner.java,1.31,1.32 ScannerWorker.java,1.32,1.33

[Michael A. <mic...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16790/modules/scanner/src/com/babeldoc/scanner

Modified Files:
	Scanner.java ScannerWorker.java 
Log Message:
General improvements in the JMX ScannerService, as well as including pipelines in the refresh.

Index: Scanner.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/Scanner.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Scanner.java	4 Dec 2003 00:44:42 -0000	1.31
--- Scanner.java	29 Mar 2004 20:49:13 -0000	1.32
***************
*** 343,351 ****
  	}
  	
! 	public void refreshConfig() {
  		log.logInfo("Refreshing configuration");
  		log.logInfo("Status: " + I18n.get(stateDescriptions[status]));
  		if (status == Scanner.STATE_STOPPED) {
  			factory.flushConfig();
  		}
  	}
--- 343,353 ----
  	}
  	
! 	public void refreshConfig() throws ScannerException {
  		log.logInfo("Refreshing configuration");
  		log.logInfo("Status: " + I18n.get(stateDescriptions[status]));
  		if (status == Scanner.STATE_STOPPED) {
  			factory.flushConfig();
+ 		} else {
+ 			throw new com.babeldoc.scanner.ScannerException("Invalid state: " + I18n.get(stateDescriptions[status]));
  		}
  	}

Index: ScannerWorker.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/ScannerWorker.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** ScannerWorker.java	14 Jan 2004 10:12:29 -0000	1.32
--- ScannerWorker.java	29 Mar 2004 20:49:13 -0000	1.33
***************
*** 125,131 ****
    protected ScannerWorker(ScannerWorkerInfo info) {
      this.info = info;
-     setStatus(ScannerWorkerStatus.STOPPED);
      setValueObject(new ScannerWorkerVO());
!     getValueObject().setDateStarted(System.currentTimeMillis());
    }
  
--- 125,130 ----
    protected ScannerWorker(ScannerWorkerInfo info) {
      this.info = info;
      setValueObject(new ScannerWorkerVO());
!     setStatus(ScannerWorkerStatus.STOPPED);
    }
  
***************
*** 496,499 ****
--- 495,499 ----
      this.setLastStatusChangeTime(System.currentTimeMillis());
      this.status = newStatus;
+     this.valueObject.setStatus(newStatus);
    }
  
***************
*** 569,572 ****
--- 569,573 ----
    protected void setTimeStarted(long timeStarted) {
      this.timeStarted = timeStarted;
+     this.valueObject.setDateStarted(timeStarted);
    }