1.1 --- a/src/java/isac/gui/util/CalcModelHierarchy.java Wed Feb 23 14:19:00 2005 +0100
1.2 +++ b/src/java/isac/gui/util/CalcModelHierarchy.java Wed Feb 23 14:19:00 2005 +0100
1.3 @@ -200,21 +200,22 @@
1.4 //FIXME: LK remove as soon as iterator can compare positions
1.5 public static int compareIterators(ICalcIterator it1, ICalcIterator it2){
1.6 try {
1.7 - ICalcElement f1 = it1.getFormula();
1.8 - ICalcElement f2 = it2.getFormula();
1.9 - Position p1 = null;
1.10 - Position p2 = null;
1.11 - if (f1 instanceof CalcFormula) {
1.12 - p1 = ((CalcFormula)f1).getPosition();
1.13 - } else {
1.14 - p1 = ((CalcHead)f1).getPosition();
1.15 - }
1.16 - if (f2 instanceof CalcFormula) {
1.17 - p2 = ((CalcFormula)f2).getPosition();
1.18 - } else {
1.19 - p2 = ((CalcHead)f2).getPosition();
1.20 - }
1.21 - return p1.compareTo(p2);
1.22 +// ICalcElement f1 = it1.getFormula();
1.23 +// ICalcElement f2 = it2.getFormula();
1.24 +// Position p1 = null;
1.25 +// Position p2 = null;
1.26 +// if (f1 instanceof CalcFormula) {
1.27 +// p1 = ((CalcFormula)f1).getPosition();
1.28 +// } else {
1.29 +// p1 = ((CalcHead)f1).getPosition();
1.30 +// }
1.31 +// if (f2 instanceof CalcFormula) {
1.32 +// p2 = ((CalcFormula)f2).getPosition();
1.33 +// } else {
1.34 +// p2 = ((CalcHead)f2).getPosition();
1.35 +// }
1.36 +// return p1.compareTo(p2);
1.37 + return it1.getPosition().compareTo(it2.getPosition());
1.38 } catch (RemoteException e) {
1.39 return 0;
1.40 }
2.1 --- a/src/java/isac/gui/util/CalcModelNode.java Wed Feb 23 14:19:00 2005 +0100
2.2 +++ b/src/java/isac/gui/util/CalcModelNode.java Wed Feb 23 14:19:00 2005 +0100
2.3 @@ -159,7 +159,9 @@
2.4 public String toString() {
2.5 if (it_ != null) {
2.6 try {
2.7 + logger.fatal(" WS->DG: toString>getFormula");
2.8 ICalcElement element = it_.getFormula();
2.9 + logger.fatal(" WS<-DG: element="+element.toSMLString());
2.10 if (element instanceof CalcFormula) {
2.11 return ((CalcFormula)element).toString();
2.12 } else if (element instanceof CalcHead) {
3.1 --- a/src/java/isac/session/SessionDialog.java Wed Feb 23 14:19:00 2005 +0100
3.2 +++ b/src/java/isac/session/SessionDialog.java Wed Feb 23 14:19:00 2005 +0100
3.3 @@ -8,6 +8,7 @@
3.4
3.5 import isac.browserdialog.BDialog;
3.6 import isac.browserdialog.BrowserDialog;
3.7 +import isac.gui.WindowApplication;
3.8 import isac.wsdialog.DGuide;
3.9
3.10 import java.io.Serializable;
3.11 @@ -18,6 +19,7 @@
3.12 import java.util.Map;
3.13 import java.util.Vector;
3.14
3.15 +import org.apache.log4j.Logger;
3.16 import org.apache.xmlrpc.WebServer;
3.17
3.18 /**
3.19 @@ -32,7 +34,10 @@
3.20 */
3.21 public class SessionDialog extends UnicastRemoteObject implements SDialog,
3.22 Serializable {
3.23 - private Map dguide_map_ = new HashMap();
3.24 +
3.25 + static Logger logger_ = Logger.getLogger(SessionDialog.class.getName());
3.26 +
3.27 + private Map dguide_map_ = new HashMap();
3.28
3.29 private int counter_;
3.30
3.31 @@ -82,14 +87,16 @@
3.32 public Vector login(String username, String pass) {
3.33 Vector return_val = new Vector();
3.34 User user = UserManager.getUser(username, pass);
3.35 + String sessionid = null;
3.36 if (user != null) {
3.37 - String sessionid;
3.38 + //WN050222 String sessionid;
3.39 if ((sessionid = (String) sessionmap_.get(username)) == null) {
3.40 sessionmap_.put(username, (sessionid = username + counter_++));
3.41 um_handler_.newUserModel(username, sessionid);
3.42 }
3.43 return_val.add(sessionid);
3.44 }
3.45 + logger_.fatal("WA<-SH: login <- sessionid=" + sessionid);
3.46 return return_val;
3.47 }
3.48
3.49 @@ -150,7 +157,7 @@
3.50 server.setParanoid(false);
3.51 // server.addHandler("sample", new JavaServer());
3.52 server.addHandler("SDialog", getInstance());
3.53 - server.addHandler("WSDialog", dg_handler_);
3.54 + server.addHandler(" WSDialog", dg_handler_);
3.55 // LK 04.09.02: new temorary user management
3.56 //server.addHandler("UserModel", um_handler_);
3.57
4.1 --- a/src/java/isac/session/WSDHandler.java Wed Feb 23 14:19:00 2005 +0100
4.2 +++ b/src/java/isac/session/WSDHandler.java Wed Feb 23 14:19:00 2005 +0100
4.3 @@ -14,6 +14,7 @@
4.4 import java.util.Map;
4.5 import java.util.Vector;
4.6
4.7 +import org.apache.log4j.Logger;
4.8 import org.apache.xmlrpc.XmlRpcHandler;
4.9
4.10 /**
4.11 @@ -23,6 +24,7 @@
4.12 * Window>Preferences>Java>Code Generation>Code and Comments
4.13 */
4.14 public class WSDHandler extends Handler implements XmlRpcHandler{
4.15 + static Logger logger_ = Logger.getLogger(SessionDialog.class.getName());
4.16 private Map storage_ = new HashMap();
4.17 private int counter_=0;
4.18
4.19 @@ -41,6 +43,7 @@
4.20 */
4.21 protected String newDGuide(String session) {
4.22 DGuide dg=null;
4.23 + logger_.fatal(" SH->DG: newDGuide("+session+")");
4.24 try {
4.25 dg = new DialogGuide("localhost");//session);
4.26 } catch (RemoteException e) {
4.27 @@ -48,6 +51,7 @@
4.28 }
4.29 String wsd_id = session+"_"+counter_++;
4.30 storage_.put(wsd_id, dg);
4.31 +
4.32 return wsd_id;
4.33 }
4.34
5.1 --- a/src/java/isac/util/interfaces/ICalcIterator.java Wed Feb 23 14:19:00 2005 +0100
5.2 +++ b/src/java/isac/util/interfaces/ICalcIterator.java Wed Feb 23 14:19:00 2005 +0100
5.3 @@ -121,6 +121,11 @@
5.4 public boolean isLast() throws RemoteException;
5.5
5.6 /**
5.7 + * is the Iterator on a CalcHead or not
5.8 + */
5.9 + public boolean onCalcHead() throws RemoteException;
5.10 +
5.11 + /**
5.12 * Use this to get the current element and check the type by calling
5.13 * getType().
5.14 *