1.1 --- a/src/java/isac/bridge/MathEngine.java	Mon Jun 27 18:12:55 2005 +0200
     1.2 +++ b/src/java/isac/bridge/MathEngine.java	Tue Jun 28 13:14:03 2005 +0200
     1.3 @@ -42,11 +42,11 @@
     1.4      // and hands them out to the dialog after startSolving//WN00827 ???
     1.5      private Map calc_trees_;
     1.6  
     1.7 -    static Logger logger = Logger.getLogger(MathEngine.class.getName());
     1.8 +    static Logger logger_ = Logger.getLogger(MathEngine.class.getName());
     1.9  
    1.10      // This is a Singleton Class: A private constructor is needed
    1.11      private MathEngine(String hostName) {
    1.12 -        logger.debug("MathEngine(" + hostName + ")");
    1.13 +        logger_.debug("MathEngine(" + hostName + ")");
    1.14          try {
    1.15              //connect to bridge
    1.16              bridge_rmi_ = (IBridgeRMI) Naming.lookup("//" + hostName
    1.17 @@ -79,14 +79,14 @@
    1.18       *            Host name on which the Bridge is running
    1.19       */
    1.20      public static void init(String hostName) {
    1.21 -        logger.fatal("  DG->BR: init(" + hostName + ")");
    1.22 +        logger_.fatal("  DG->BR: init(" + hostName + ")");
    1.23          if (singleton_ == null) {
    1.24              singleton_ = new MathEngine(hostName);
    1.25          }
    1.26      }
    1.27  
    1.28      public static MathEngine getMathEngine() {
    1.29 -        logger.fatal("  DG<>BR: getMathEngine()");
    1.30 +        logger_.fatal("  DG<>BR: getMathEngine()");
    1.31          return singleton_;
    1.32      }
    1.33  
    1.34 @@ -104,7 +104,7 @@
    1.35       * Integer(id));//WN040922 TODO simplify
    1.36       */
    1.37      public CalcTree startCalculation(Formalization f) {
    1.38 -        logger.fatal("  DG->BR: startCalculation(" + f.toSMLString() + ")");
    1.39 +        logger_.fatal("  DG->BR: startCalculation(" + f.toSMLString() + ")");
    1.40          CalcTree calcTree = null;//WN
    1.41          try {
    1.42              int id = bridge_rmi_.startCalculation(f);
    1.43 @@ -118,7 +118,7 @@
    1.44          } catch (RemoteException e) {
    1.45              e.printStackTrace();
    1.46          }
    1.47 -        logger.fatal("  DG<-BR: startCalculation <- calcTree=" + calcTree);
    1.48 +        logger_.fatal("  DG<-BR: startCalculation <- calcTree=" + calcTree);
    1.49          return calcTree;
    1.50      }
    1.51  
    1.52 @@ -232,7 +232,7 @@
    1.53  
    1.54      CalcChanged autoCalculate(int id, int scope, int nSteps)
    1.55              throws RemoteException {
    1.56 -        logger.debug("autoCalculate: id=" + id + ", scope=" + scope
    1.57 +        logger_.debug("autoCalculate: id=" + id + ", scope=" + scope
    1.58                  + ", nSteps=" + nSteps);
    1.59          return bridge_rmi_.autoCalculate(id, scope, nSteps);
    1.60      }
    1.61 @@ -263,12 +263,12 @@
    1.62      }
    1.63  
    1.64      int iterator(int id) throws RemoteException {
    1.65 -        logger.debug("iterator: id=" + id);
    1.66 +        logger_.debug("iterator: id=" + id);
    1.67          return bridge_rmi_.iterator(id);
    1.68      }
    1.69  
    1.70      Position moveRoot(int calcTreeID, int iteratorID) throws RemoteException {
    1.71 -        logger.debug("moveRoot: calcTreeID=" + calcTreeID + ", iteratorID="
    1.72 +        logger_.debug("moveRoot: calcTreeID=" + calcTreeID + ", iteratorID="
    1.73                  + iteratorID);
    1.74          return bridge_rmi_.moveRoot(calcTreeID, iteratorID);
    1.75      }
    1.76 @@ -280,7 +280,7 @@
    1.77  
    1.78      Position moveDown(int calcTreeID, int iteratorID, Position p)
    1.79              throws RemoteException {
    1.80 -        logger.debug("moveDown: calcTreeID=" + calcTreeID + ", sml_pos_=" + p);
    1.81 +        logger_.debug("moveDown: calcTreeID=" + calcTreeID + ", sml_pos_=" + p);
    1.82          return bridge_rmi_.moveDown(calcTreeID, iteratorID, p);
    1.83      }
    1.84