[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner ScannerThread.java,1.17,1.18 ScannerWorker.java,1.36,1.37

[bruce m. <tr...@us...>]

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

Modified Files:
	ScannerThread.java ScannerWorker.java 
Log Message:
Logging cleanups...

1.  Created log instance variable instead of calling LogService.getInstance().
2.  All logs to debug check if debug level is set.

Index: ScannerWorker.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/ScannerWorker.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** ScannerWorker.java	28 May 2004 10:31:14 -0000	1.36
--- ScannerWorker.java	24 Jul 2004 00:18:52 -0000	1.37
***************
*** 332,338 ****
      this.initialize();
  
!     if (getLog().isDebugEnabled()) {
        getLog().logDebug(this.getName() + " worker initialized successfully");
-     }
  
      //Set status to stopped if worker should be ignored
--- 332,337 ----
      this.initialize();
  
!     if (getLog().isDebugEnabled()) 
        getLog().logDebug(this.getName() + " worker initialized successfully");
  
      //Set status to stopped if worker should be ignored
***************
*** 359,363 ****
    public void process() {
      //do not run in any status other then READY
!     getLog().logDebug(this.getName() + " scanning for new documents");
  
      if (this.getStatus().equals(ScannerWorkerStatus.READY)) {
--- 358,363 ----
    public void process() {
      //do not run in any status other then READY
! 		if (getLog().isDebugEnabled()) 
!   	  getLog().logDebug(this.getName() + " scanning for new documents");
  
      if (this.getStatus().equals(ScannerWorkerStatus.READY)) {

Index: ScannerThread.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/ScannerThread.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ScannerThread.java	17 Aug 2003 04:12:29 -0000	1.17
--- ScannerThread.java	24 Jul 2004 00:18:52 -0000	1.18
***************
*** 102,106 ****
      while (running && !(worker.isCountedDown())) {
        waitToRun();
!       LogService.getInstance().logDebug(this.getName() + "scanning...");
  
        if(!worker.isCronScheduleType()) {
--- 102,107 ----
      while (running && !(worker.isCountedDown())) {
        waitToRun();
!       if(LogService.getInstance().isDebugEnabled())
!       	LogService.getInstance().logDebug(this.getName() + "scanning...");
  
        if(!worker.isCronScheduleType()) {