[Babeldoc-devel] babeldoc/modules/gui/src/com/babeldoc/gui/scanner/rmiscanmon ScannerWorkerNode.java, 1.1, 1.2 ScannerMonitorFrame.java, 1.1, 1.2

[paspes <pa...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/scanner/rmiscanmon
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20577/modules/gui/src/com/babeldoc/gui/scanner/rmiscanmon

Modified Files:
	ScannerWorkerNode.java ScannerMonitorFrame.java 
Log Message:
Activate RMI scanner (babeldoc scanmon) and add Scanner controler

Index: ScannerMonitorFrame.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/scanner/rmiscanmon/ScannerMonitorFrame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ScannerMonitorFrame.java	25 Jul 2004 15:46:02 -0000	1.1
--- ScannerMonitorFrame.java	3 Dec 2007 16:37:19 -0000	1.2
***************
*** 67,70 ****
--- 67,72 ----
  
  import com.babeldoc.core.option.ConfigOption;
+ import com.babeldoc.core.option.IConfigData;
+ import com.babeldoc.core.option.IConfigInfo;
  import com.babeldoc.core.option.IConfigOptionType;
  
***************
*** 87,90 ****
--- 89,93 ----
  
  import java.util.Enumeration;
+ import java.util.Iterator;
  
  import javax.swing.BorderFactory;
***************
*** 107,110 ****
--- 110,114 ----
  import javax.swing.border.BevelBorder;
  import javax.swing.event.TreeSelectionEvent;
+ import javax.swing.event.TreeSelectionListener;
  import javax.swing.tree.DefaultMutableTreeNode;
  import javax.swing.tree.TreeNode;
***************
*** 214,274 ****
     */
    TreeNode createTree(IRemoteScanner scanner) {
! //    try {
! //      //scanner.configure();
! //      String[] threadNames = scanner.getScannerThreadNames();
! //      DefaultMutableTreeNode root = new DefaultMutableTreeNode("Scanners");
! //
! //      for (int i = 0; i < threadNames.length; i++) {
! //        ScannerThreadConfig options = scanner.getThreadOptions(threadNames[i]);
! //        DefaultMutableTreeNode scannerNode = new DefaultMutableTreeNode(new ScannerWorkerNode(
! //            threadNames[i], scanner, options));
! //
! //        IConfigInfo optionsMeta = scanner.getWorkerInfoObject(threadNames[i]);
! //
! //        Iterator optionKeys = options.getChildrenNameSet().iterator();
! //        scannerNode.add(new DefaultMutableTreeNode("name=" + threadNames[i]));
! //
! //        DefaultMutableTreeNode configNode = new DefaultMutableTreeNode(
! //            "Configurable options");
! //
! //        while (optionKeys.hasNext()) {
! //          String optionKey = (String) optionKeys.next();
! //          ConfigOption optionMeta = optionsMeta.getActionOption(optionKey);
! //          DefaultMutableTreeNode optionNode = new DefaultMutableTreeNode(new ScannerOptionNode(
! //              optionMeta, options));
! //
! //          //add option node to config node if mutable
! //          if (optionMeta.isMutable()) {
! //            configNode.add(optionNode);
! //          } else {
! //            scannerNode.add(optionNode);
! //          }
! //        }
! //
! //        //add config node to scanner node
! //        scannerNode.add(configNode);
! //
! //        //add scanner node to root node
! //        root.add(scannerNode);
! //      }
! //
! //      //create tree
! //      scannerTree = new JTree(root);
! //
! //      //event handling
! //      scannerTree.addTreeSelectionListener(new TreeSelectionListener() {
! //        public void valueChanged(TreeSelectionEvent e) {
! //          scannerTree_valueChanged(e);
! //        }
! //      });
! //      jScrollPane1.getViewport().add(scannerTree, null);
! //      menuFileSave.setEnabled(true);
! //
! //      return root;
! //    } catch (Exception e) {
! //      System.err.println(e.toString());
! //    }
!     return null;
    }
  
    /**
--- 218,283 ----
     */
    TreeNode createTree(IRemoteScanner scanner) {
!     try {
!       //scanner.configure();
!       //Paspes reemplazado String[] threadNames = scanner.getScannerThreadNames();
!       String[] threadNames =  RemoteScannerClient.listThreadNames(scanner);
!       DefaultMutableTreeNode root = new DefaultMutableTreeNode("Scanners");
! 
!      for (int i = 0; i < threadNames.length; i++) {
!         //Paspes remplazado ScannerThreadConfig options = scanner.getThreadOptions(threadNames[i]);
!     	IConfigData options = RemoteScannerClient.getThreadOptions(scanner,i);
!         DefaultMutableTreeNode scannerNode = new DefaultMutableTreeNode(new ScannerWorkerNode(
!             threadNames[i], scanner, options));
!        //Paspes reemplazado IConfigInfo optionsMeta = scanner.getWorkerInfoObject(threadNames[i]);
!         IConfigInfo optionsMeta = RemoteScannerClient.getScannerConfiguration(scanner,i);
!         
!         Iterator optionKeys = options.getChildrenNameSet().iterator();
!         scannerNode.add(new DefaultMutableTreeNode("name=" + threadNames[i]));
! 
!         DefaultMutableTreeNode configNode = new DefaultMutableTreeNode("Configurable options");
!         
!         while (optionKeys.hasNext()) {
!         	String optionKey = (String) optionKeys.next();
! //        	Paspes reemplazado ConfigOption optionMeta = optionsMeta.getActionOption(optionKey);
!         	ConfigOption optionMeta = optionsMeta.getOption(optionKey);
!             DefaultMutableTreeNode optionNode = new DefaultMutableTreeNode(new ScannerOptionNode(optionMeta, options));
!  
!             //add option node to config node if mutable
!             if (optionMeta.isMutable()) {
!             	configNode.add(optionNode);
!             } else {
!             	scannerNode.add(optionNode);
!             }
!         }
! 
!         //add config node to scanner node
!         scannerNode.add(configNode);
! 
!         //add scanner node to root node
!         root.add(scannerNode);
!       }
! 
!       //create tree
!       scannerTree = new JTree(root);
! 
!       //event handling
!       scannerTree.addTreeSelectionListener(new TreeSelectionListener() {
!         public void valueChanged(TreeSelectionEvent e) {
!           scannerTree_valueChanged(e);
!         }
!       });
!       
!       jScrollPane1.getViewport().add(scannerTree, null);
!       menuFileSave.setEnabled(true);
! 
!       return root;
!     } catch (Exception e) {
!       System.err.println(e.toString());
!       e.printStackTrace();
!     }
!    return null;
    }
+   
+   
  
    /**
***************
*** 435,441 ****
            if (!scannerNode.isScanning()) {
              scannerNode.resumeScanner();
!             System.out.println("Start " + scannerNode.getName() + "\n");
            } else {
!             System.out.println("Start " + scannerNode.getName() + "\n");
            }
          } else {
--- 444,451 ----
            if (!scannerNode.isScanning()) {
              scannerNode.resumeScanner();
!             System.out.println("Restart " + scannerNode.getName() + " restarted");
            } else {
!         	  scannerNode.resumeScanner();
!               System.out.println( scannerNode.getName() + " resumed");
            }
          } else {
***************
*** 702,708 ****
            if (!scannerNode.isScanning()) {
              scannerNode.resumeScanner();
!             System.out.println("Resume " + scannerNode.getName() + "\n");
            } else {
!             System.out.println("Resume " + scannerNode.getName() + "\n");
            }
          } else {
--- 712,718 ----
            if (!scannerNode.isScanning()) {
              scannerNode.resumeScanner();
!             System.out.println( scannerNode.getName() + " resumed");
            } else {
!             System.out.println(scannerNode.getName() + " not resumed because its started");
            }
          } else {
***************
*** 743,749 ****
            if (scannerNode.isScanning()) {
              scannerNode.pauseScanner();
!             System.out.println(scannerNode.getName() + " paused");
            } else {
!             System.out.println(scannerNode.getName() + " paused");
            }
          } else {
--- 753,759 ----
            if (scannerNode.isScanning()) {
              scannerNode.pauseScanner();
!             System.out.println(scannerNode.getName() + " paused ");
            } else {
!             System.out.println(scannerNode.getName() + " not paused because its stoped");
            }
          } else {

Index: ScannerWorkerNode.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/gui/src/com/babeldoc/gui/scanner/rmiscanmon/ScannerWorkerNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ScannerWorkerNode.java	25 Jul 2004 15:46:02 -0000	1.1
--- ScannerWorkerNode.java	3 Dec 2007 16:37:19 -0000	1.2
***************
*** 67,70 ****
--- 67,71 ----
  
  import com.babeldoc.scanner.ScannerException;
+ import com.babeldoc.scanner.ScannerWorkerStatus;
  import com.babeldoc.scanner.ScannerWorkerVO;
  import com.babeldoc.scanner.rmi.IRemoteScanner;
***************
*** 136,140 ****
     */
    public boolean isScanning() throws RemoteException, ScannerException {
!     return false;
    }
  
--- 137,145 ----
     */
    public boolean isScanning() throws RemoteException, ScannerException {
! 	  ScannerWorkerVO worker = scanner.getWorker(workerName);
! 	  if (worker.getStatus().equals(ScannerWorkerStatus.STOPPED)) {
! 		return false;  
! 	  }
!     return true;
    }
  
***************
*** 161,165 ****
        //
      }
- 
      return lastDescription;
    }
--- 166,169 ----