[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner/gui ScannerMonitorFrame.java,1.6,1.7 ScannerOptionNode.java,1.3,1.4 ScannerWorkerNode.java,1.3,1.4

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

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

Modified Files:
	ScannerMonitorFrame.java ScannerOptionNode.java 
	ScannerWorkerNode.java 
Log Message:
Rearranged the scanner package to use the new configration options.  Lots of changes here

Index: ScannerMonitorFrame.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/gui/ScannerMonitorFrame.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ScannerMonitorFrame.java	27 Jun 2003 14:00:14 -0000	1.6
--- ScannerMonitorFrame.java	14 Aug 2003 02:34:20 -0000	1.7
***************
*** 73,77 ****
  
  import com.babeldoc.scanner.ScannerException;
- import com.babeldoc.scanner.ScannerWorkerConfig;
  import com.babeldoc.scanner.rmi.IRemoteScanner;
  import com.babeldoc.scanner.rmi.RemoteScannerClient;
--- 73,76 ----
***************
*** 229,233 ****
  //        IConfigInfo optionsMeta = scanner.getWorkerInfoObject(threadNames[i]);
  //
! //        Iterator optionKeys = options.keys().iterator();
  //        scannerNode.add(new DefaultMutableTreeNode("name=" + threadNames[i]));
  //
--- 228,232 ----
  //        IConfigInfo optionsMeta = scanner.getWorkerInfoObject(threadNames[i]);
  //
! //        Iterator optionKeys = options.getChildrenNameSet().iterator();
  //        scannerNode.add(new DefaultMutableTreeNode("name=" + threadNames[i]));
  //

Index: ScannerOptionNode.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/gui/ScannerOptionNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ScannerOptionNode.java	27 Jun 2003 14:00:14 -0000	1.3
--- ScannerOptionNode.java	14 Aug 2003 02:34:20 -0000	1.4
***************
*** 67,72 ****
  
  import com.babeldoc.core.option.ConfigOption;
! 
! import com.babeldoc.scanner.ScannerWorkerConfig;
  
  
--- 67,71 ----
  
  import com.babeldoc.core.option.ConfigOption;
! import com.babeldoc.core.option.IConfigData;
  
  
***************
*** 79,83 ****
  public class ScannerOptionNode {
    private ConfigOption optionMeta;
!   private ScannerWorkerConfig config;
    private String key;
    private String value;
--- 78,82 ----
  public class ScannerOptionNode {
    private ConfigOption optionMeta;
!   private IConfigData config;
    private String key;
    private String value;
***************
*** 89,96 ****
     * @param config DOCUMENT ME!
     */
!   public ScannerOptionNode(ConfigOption option, ScannerWorkerConfig config) {
      this.config = config;
      this.key = option.getName();
!     this.value = config.get(key);
      this.optionMeta = option;
    }
--- 88,95 ----
     * @param config DOCUMENT ME!
     */
!   public ScannerOptionNode(ConfigOption option, IConfigData config) {
      this.config = config;
      this.key = option.getName();
!     this.value = config.getValue(key);
      this.optionMeta = option;
    }
***************
*** 121,125 ****
    public void setNewValue(String value) {
      this.value = value;
!     config.put(key, value);
    }
  
--- 120,124 ----
    public void setNewValue(String value) {
      this.value = value;
!     config.setValue(value);
    }
  

Index: ScannerWorkerNode.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/gui/ScannerWorkerNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ScannerWorkerNode.java	27 Jun 2003 14:00:14 -0000	1.3
--- ScannerWorkerNode.java	14 Aug 2003 02:34:20 -0000	1.4
***************
*** 67,74 ****
  
  import com.babeldoc.scanner.ScannerException;
- import com.babeldoc.scanner.ScannerWorkerConfig;
- import com.babeldoc.scanner.ScannerWorkerStatus;
  import com.babeldoc.scanner.ScannerWorkerVO;
  import com.babeldoc.scanner.rmi.IRemoteScanner;
  
  import java.rmi.RemoteException;
--- 67,73 ----
  
  import com.babeldoc.scanner.ScannerException;
  import com.babeldoc.scanner.ScannerWorkerVO;
  import com.babeldoc.scanner.rmi.IRemoteScanner;
+ import com.babeldoc.core.option.IConfigData;
  
  import java.rmi.RemoteException;
***************
*** 83,87 ****
  public class ScannerWorkerNode {
    private IRemoteScanner scanner;
!   private ScannerWorkerConfig configOptions;
    private String lastDescription = "";
    private String workerName = "";
--- 82,86 ----
  public class ScannerWorkerNode {
    private IRemoteScanner scanner;
!   private IConfigData configOptions;
    private String lastDescription = "";
    private String workerName = "";
***************
*** 95,99 ****
     */
    public ScannerWorkerNode(String workerName, IRemoteScanner scanner,
!     ScannerWorkerConfig config) {
      this.scanner = scanner;
      this.workerName = workerName;
--- 94,98 ----
     */
    public ScannerWorkerNode(String workerName, IRemoteScanner scanner,
!     IConfigData config) {
      this.scanner = scanner;
      this.workerName = workerName;
***************
*** 106,110 ****
     * @param newConfigOptions DOCUMENT ME!
     */
!   public void setConfigOptions(ScannerWorkerConfig newConfigOptions) {
      configOptions = newConfigOptions;
    }
--- 105,109 ----
     * @param newConfigOptions DOCUMENT ME!
     */
!   public void setConfigOptions(IConfigData newConfigOptions) {
      configOptions = newConfigOptions;
    }
***************
*** 115,119 ****
     * @return DOCUMENT ME!
     */
!   public ScannerWorkerConfig getConfigOptions() {
      return configOptions;
    }
--- 114,118 ----
     * @return DOCUMENT ME!
     */
!   public IConfigData getConfigOptions() {
      return configOptions;
    }
***************
*** 158,162 ****
      try {
        ScannerWorkerVO worker = scanner.getWorker(workerName);
!       lastDescription = worker.status.toString() + "....";
      } catch (Exception re) {
        //
--- 157,161 ----
      try {
        ScannerWorkerVO worker = scanner.getWorker(workerName);
!       lastDescription = worker.getStatus().toString() + "....";
      } catch (Exception re) {
        //