[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner ScannerWorker.java,1.23,1.24 Scanner.java,1.27,1.28

[<de...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner
In directory sc8-pr-cvs1:/tmp/cvs-serv31468/modules/scanner/src/com/babeldoc/scanner

Modified Files:
	ScannerWorker.java Scanner.java 
Log Message:
Fixing problem with static filed for IConfigInfo object

Index: ScannerWorker.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/ScannerWorker.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ScannerWorker.java	17 Aug 2003 04:12:29 -0000	1.23
--- ScannerWorker.java	5 Sep 2003 13:28:29 -0000	1.24
***************
*** 86,90 ****
   */
  public abstract class ScannerWorker extends Named {
!   /** Use this feeder to submit documents to the pipeline */
    private IFeeder feeder;
  
--- 86,92 ----
   */
  public abstract class ScannerWorker extends Named {
!   private ScannerWorkerInfo info;
! 
! 	/** Use this feeder to submit documents to the pipeline */
    private IFeeder feeder;
  
***************
*** 119,123 ****
     * Creates a new ScannerWorker object.
     */
!   protected ScannerWorker() {
      setStatus(ScannerWorkerStatus.STOPPED);
      setValueObject(new ScannerWorkerVO());
--- 121,126 ----
     * Creates a new ScannerWorker object.
     */
!   protected ScannerWorker(ScannerWorkerInfo info) {
!     this.info = info;
      setStatus(ScannerWorkerStatus.STOPPED);
      setValueObject(new ScannerWorkerVO());
***************
*** 158,162 ****
     * @return information object
     */
!   public abstract IConfigInfo getInfo();
  
    /**
--- 161,167 ----
     * @return information object
     */
!   public IConfigInfo getInfo() {
!   	return info;
!   }
  
    /**

Index: Scanner.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/Scanner.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Scanner.java	14 Aug 2003 02:34:20 -0000	1.27
--- Scanner.java	5 Sep 2003 13:28:29 -0000	1.28
***************
*** 227,231 ****
        } catch (Exception e) {
          getLog().logError("Error starting scanner worker " + sw[i].getName(), e);
!         stop();
        }
      }
--- 227,232 ----
        } catch (Exception e) {
          getLog().logError("Error starting scanner worker " + sw[i].getName(), e);
!         sw[i].stop();
!         //stop();
        }
      }