|
From: <tr...@us...> - 2003-08-14 02:47:43
|
Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/rmi
In directory sc8-pr-cvs1:/tmp/cvs-serv32455/src/com/babeldoc/scanner/rmi
Modified Files:
IRemoteScanner.java RemoteScannerBridge.java
RemoteScannerClient.java
Log Message:
Rearranged the scanner package to use the new configration options. Lots of changes here
Index: IRemoteScanner.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/rmi/IRemoteScanner.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IRemoteScanner.java 27 Jun 2003 14:00:16 -0000 1.4
--- IRemoteScanner.java 14 Aug 2003 02:34:21 -0000 1.5
***************
*** 67,72 ****
import com.babeldoc.scanner.ScannerException;
- import com.babeldoc.scanner.ScannerWorkerConfig;
import com.babeldoc.scanner.ScannerWorkerVO;
/**
--- 67,72 ----
import com.babeldoc.scanner.ScannerException;
import com.babeldoc.scanner.ScannerWorkerVO;
+ import com.babeldoc.core.option.IConfigData;
/**
***************
*** 109,113 ****
* @throws RemoteException
*/
! public void setWorkerConfig(String workerName, ScannerWorkerConfig config)
throws ScannerException, RemoteException;
--- 109,113 ----
* @throws RemoteException
*/
! public void setWorkerConfig(String workerName, IConfigData config)
throws ScannerException, RemoteException;
Index: RemoteScannerBridge.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/rmi/RemoteScannerBridge.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RemoteScannerBridge.java 27 Jun 2003 14:00:15 -0000 1.7
--- RemoteScannerBridge.java 14 Aug 2003 02:34:21 -0000 1.8
***************
*** 68,73 ****
import com.babeldoc.scanner.Scanner;
import com.babeldoc.scanner.ScannerException;
- import com.babeldoc.scanner.ScannerWorkerConfig;
import com.babeldoc.scanner.ScannerWorkerVO;
import java.rmi.RemoteException;
--- 68,73 ----
import com.babeldoc.scanner.Scanner;
import com.babeldoc.scanner.ScannerException;
import com.babeldoc.scanner.ScannerWorkerVO;
+ import com.babeldoc.core.option.IConfigData;
import java.rmi.RemoteException;
***************
*** 117,121 ****
/**
! * get the scanner
*
* @return
--- 117,121 ----
/**
! * getChild the scanner
*
* @return
***************
*** 149,155 ****
* @throws RemoteException
*/
! public void setWorkerConfig(String workerName, ScannerWorkerConfig config)
throws ScannerException, RemoteException {
! this.scanner.setWorketConfig(workerName, config);
}
--- 149,155 ----
* @throws RemoteException
*/
! public void setWorkerConfig(String workerName, IConfigData config)
throws ScannerException, RemoteException {
! this.scanner.listWorker(workerName).setConfig(config);
}
Index: RemoteScannerClient.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/rmi/RemoteScannerClient.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RemoteScannerClient.java 7 Aug 2003 08:46:34 -0000 1.6
--- RemoteScannerClient.java 14 Aug 2003 02:34:21 -0000 1.7
***************
*** 228,232 ****
// IConfig config = scanner.getConfiguration();
//
! // for (Iterator i = config.keys().iterator(); i.hasNext();) {
// String key = i.next().toString();
// String value = config.getString(key);
--- 228,232 ----
// IConfig config = scanner.getConfiguration();
//
! // for (Iterator i = config.getChildrenNameSet().iterator(); i.hasNext();) {
// String key = i.next().toString();
// String value = config.getString(key);
***************
*** 236,240 ****
/**
! * get the thread options
*
* @param scanner
--- 236,240 ----
/**
! * getChild the thread options
*
* @param scanner
***************
*** 247,254 ****
throws RemoteException, ScannerException {
// ScannerThreadConfig config = scanner.getThreadOptions(name);
! // if ((config != null) && (config.keys().size() > 0)) {
! // for (Iterator i = config.keys().iterator(); i.hasNext();) {
// String key = i.next().toString();
! // String value = config.get(key);
// System.out.println(key + " = " + value);
// }
--- 247,254 ----
throws RemoteException, ScannerException {
// ScannerThreadConfig config = scanner.getThreadOptions(name);
! // if ((config != null) && (config.getChildrenNameSet().size() > 0)) {
! // for (Iterator i = config.getChildrenNameSet().iterator(); i.hasNext();) {
// String key = i.next().toString();
! // String value = config.getChild(key);
// System.out.println(key + " = " + value);
// }
|