1.1 --- a/src/java/isac/session/ObjectManager.java	Mon Jul 25 17:14:24 2005 +0200
     1.2 +++ b/src/java/isac/session/ObjectManager.java	Mon Jul 25 17:21:47 2005 +0200
     1.3 @@ -4,7 +4,6 @@
     1.4  package isac.session;
     1.5  
     1.6  import isac.browserdialog.BDialog;
     1.7 -import isac.util.InformationProcessor;
     1.8  import isac.wsdialog.IWorksheetDialog;
     1.9  
    1.10  import java.rmi.Naming;

     2.1 --- a/src/java/isac/session/SessionDialog.java	Mon Jul 25 17:14:24 2005 +0200
     2.2 +++ b/src/java/isac/session/SessionDialog.java	Mon Jul 25 17:21:47 2005 +0200
     2.3 @@ -37,15 +37,13 @@
     2.4  
     2.5      private int counter_;
     2.6  
     2.7 -    private static UMHandler um_handler_ = new UMHandler();
     2.8 -
     2.9      private static WSDHandler dg_handler_ = new WSDHandler();
    2.10  
    2.11      private Map username_map_sessionid_ = new HashMap();
    2.12  
    2.13 +    //private static UMHandler um_handler_ = new UMHandler();WN050725
    2.14      private Map sessionid_map_user_ = new HashMap();
    2.15  
    2.16 -    //FIXME.WN050708 Map unnecessary: only _one_ BrowserDialog per Session
    2.17      //actually holds (1) null from loadHierarchy (2) "x0" or "
    2.18      private Map bdialogmap_ = new HashMap();
    2.19  
    2.20 @@ -129,7 +127,8 @@
    2.21      }
    2.22  
    2.23      /**
    2.24 -     * create a new WSDialog and assign it to session <code>session</code>
    2.25 +     * create a new <code>WorksheetDialog</code> and assign it to session
    2.26 +     * <code>session</code>
    2.27       */
    2.28      public String openDGuide(String session) {
    2.29          return dg_handler_.newDGuide(this, session);
    2.30 @@ -153,15 +152,7 @@
    2.31  
    2.32      private static void init() {
    2.33          try {
    2.34 -            // Invoke me as <http://localhost:8080/RPC2>.
    2.35              System.out.println("SessionDialog main");
    2.36 -            WebServer server = new WebServer(1050);//FIXME.WN0503 fix port !
    2.37 -            //MK050712 ^^^^^ 3?rd call throws exception and 
    2.38 -            //quits recursion (in constructor) ???!?!?!?!
    2.39 -            server.setParanoid(false);
    2.40 -            // server.addHandler("sample", new JavaServer());
    2.41 -            server.addHandler("SDialog", getInstance());
    2.42 -            server.addHandler(" WSDialog", dg_handler_);
    2.43  
    2.44          } catch (Exception exception) {
    2.45              System.err.println("SessionDialog: " + exception.toString());

     3.1 --- a/src/java/isac/session/WSDHandler.java	Mon Jul 25 17:14:24 2005 +0200
     3.2 +++ b/src/java/isac/session/WSDHandler.java	Mon Jul 25 17:21:47 2005 +0200
     3.3 @@ -12,6 +12,7 @@
     3.4  import java.rmi.RemoteException;
     3.5  import java.util.HashMap;
     3.6  import java.util.Map;
     3.7 +import java.util.TreeMap;
     3.8  import java.util.Vector;
     3.9  
    3.10  import org.apache.log4j.Logger;
    3.11 @@ -23,7 +24,7 @@
    3.12   * To change the template for this generated type comment go to
    3.13   * Window>Preferences>Java>Code Generation>Code and Comments
    3.14   */
    3.15 -public class WSDHandler extends Handler implements XmlRpcHandler {
    3.16 +public class WSDHandler {
    3.17  
    3.18      static Logger logger_ = Logger.getLogger(SessionDialog.class.getName());
    3.19  
    3.20 @@ -31,17 +32,9 @@
    3.21  
    3.22      private int counter_ = 0;
    3.23  
    3.24 -    public Object execute(String arg0, Vector arg1) throws Exception {
    3.25 -        String wsd_id = (String) arg1.remove(0);
    3.26 -        WSDialog wsd = (WSDialog) storage_.get(wsd_id);
    3.27 -        if (wsd != null)
    3.28 -            return methodCall(wsd, arg0, arg1);
    3.29 -        else
    3.30 -            throw new Exception("no WSDHandler available ! wrong wsdid ?");
    3.31 -    }
    3.32 -
    3.33      /**
    3.34 -     * @param session
    3.35 +     * @param session_dialog
    3.36 +     *            unused..WN050725
    3.37       * @return
    3.38       */
    3.39      protected String newDGuide(SDialog session_dialog, String session_id) {