# HG changeset patch
# User mlang
# Date 1119957243 -7200
# Node ID 631fe7f467b73005d5e4b91dcfa0b3bf8e0753d5
# Parent  62acf19daa74e63f9d0e170d1010dbc0e4c0191d
cosmetics part2

diff -r 62acf19daa74 -r 631fe7f467b7 src/java/isac/bridge/BridgeLogger.java
--- a/src/java/isac/bridge/BridgeLogger.java	Mon Jun 27 18:12:55 2005 +0200
+++ b/src/java/isac/bridge/BridgeLogger.java	Tue Jun 28 13:14:03 2005 +0200
@@ -16,7 +16,7 @@
 public class BridgeLogger {
 
     //The logging text will be stored in this file
-    FileWriter generalLog;
+    FileWriter general_log_;
 
     //minimum severity level of a message to be logged
     //0 == log everything
@@ -30,7 +30,7 @@
      */
     public BridgeLogger(String path) {
         try {
-            generalLog = new FileWriter(path + "../sml/BridgeLog/general.txt");
+            general_log_ = new FileWriter(path + "../sml/BridgeLog/general.txt");
             log(1, "--------------------------");
             log(1, "Server started on " + new Date());
             log(1, "--------------------------");
@@ -50,8 +50,8 @@
     public void log(int level, String msg) {
         if (level > min_log_level_) {
             try {
-                generalLog.write(msg + "\n");
-                generalLog.flush();
+                general_log_.write(msg + "\n");
+                general_log_.flush();
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -63,7 +63,7 @@
      */
     public void close() {
         try {
-            generalLog.close();
+            general_log_.close();
         } catch (IOException e) {
             e.printStackTrace();
         }
diff -r 62acf19daa74 -r 631fe7f467b7 src/java/isac/bridge/BridgeMain.java
--- a/src/java/isac/bridge/BridgeMain.java	Mon Jun 27 18:12:55 2005 +0200
+++ b/src/java/isac/bridge/BridgeMain.java	Tue Jun 28 13:14:03 2005 +0200
@@ -64,11 +64,11 @@
 
     private int transport_mode_ = TRANS_STRING;
 
-    JPanel panel;
+    JPanel panel_;
 
-    JTextArea textArea;
+    JTextArea text_area_;
 
-    JScrollPane scrollPane;
+    JScrollPane scroll_pane_;
 
     private Thread thread_clients2kernel_;
 
@@ -100,7 +100,7 @@
 
     private boolean kernel_responding_ = true;
 
-    static Logger logger = Logger.getLogger(BridgeMain.class.getName());
+    static Logger logger_ = Logger.getLogger(BridgeMain.class.getName());
 
     /**
      * Constructor used to set up the bridge main program
@@ -113,7 +113,7 @@
         //(no longer nescessary with j2sdk1.4.2)
         //System.setProperty("java.util.prefs.syncInterval", "20000000000");
 
-        logger.warn("BridgeMain obj.init: ini_path_=" + iniPath);
+        logger_.warn("BridgeMain obj.init: ini_path_=" + iniPath);
         this.ini_path_ = iniPath;
         readProperties();
 
@@ -126,18 +126,18 @@
 
     private void setUpBridgeLog() {
         this.setLocation(700, 250);
-        panel = new JPanel();
-        panel.setSize(200, 300);
-        panel.setLayout(new BorderLayout());
-        panel.setBackground(Color.white);
+        panel_ = new JPanel();
+        panel_.setSize(200, 300);
+        panel_.setLayout(new BorderLayout());
+        panel_.setBackground(Color.white);
 
-        textArea = new JTextArea();
-        textArea.setFont(new Font("Monospaced", 0, 11));
-        scrollPane = new JScrollPane(textArea,
+        text_area_ = new JTextArea();
+        text_area_.setFont(new Font("Monospaced", 0, 11));
+        scroll_pane_ = new JScrollPane(text_area_,
                 JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
                 JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
-        panel.add("Center", scrollPane);
-        getContentPane().add(panel);
+        panel_.add("Center", scroll_pane_);
+        getContentPane().add(panel_);
 
         setTitle("BridgeLog Java <=> SML");
         WindowListener l = new WindowAdapter() {
@@ -212,7 +212,7 @@
 
     //Start sml Threads and catch in- and output-streams
     private void startSMLThread() {
-        logger.warn("startSMLThread");
+        logger_.warn("startSMLThread");
         SMLThread smlThread = new SMLThread(this, kernel_exec_, kernel_args_);
         thread_sml_ = new Thread(smlThread, "java_bridge_execution");
         thread_sml_.setDaemon(true);
@@ -244,7 +244,7 @@
     }
 
     private void startThreadsFirstTime() {
-        logger.warn("startThreadsFirstTime");
+        logger_.warn("startThreadsFirstTime");
         startSMLThread();
 
         Clients2KernelServer c2k = new Clients2KernelServer(this);
@@ -368,7 +368,7 @@
      */
     public void log(int level, String msg) {
         this.bridge_logger_.log(level, msg);
-        this.textArea.append(msg + "\n");
+        this.text_area_.append(msg + "\n");
     }
 
     public ClientList getClientList() {
@@ -376,7 +376,7 @@
     }
 
     public BufferedReader getSmlReader() {
-        logger.warn("getSmlReader x");
+        logger_.warn("getSmlReader x");
         return sml_reader_;
     }
 
@@ -397,7 +397,7 @@
     }
 
     public void setRMI(BridgeRMI bridgeRMI) {
-        logger.warn("setRMI: bridge_rmi_=" + bridgeRMI);
+        logger_.warn("setRMI: bridge_rmi_=" + bridgeRMI);
         this.bridge_rmi_ = bridgeRMI;
         bridgeRMI.setRmiID(1); //only one BridgeRMI used so far
     }
diff -r 62acf19daa74 -r 631fe7f467b7 src/java/isac/bridge/Clients2KernelServer.java
--- a/src/java/isac/bridge/Clients2KernelServer.java	Mon Jun 27 18:12:55 2005 +0200
+++ b/src/java/isac/bridge/Clients2KernelServer.java	Tue Jun 28 13:14:03 2005 +0200
@@ -25,7 +25,7 @@
 
     private BridgeMain bridge_;
 
-    static Logger logger = Logger.getLogger(Clients2KernelServer.class
+    static Logger logger_ = Logger.getLogger(Clients2KernelServer.class
             .getName());
 
     /**
@@ -34,7 +34,7 @@
      * @param bridge_
      */
     public Clients2KernelServer(BridgeMain bridge) {
-        logger.warn("Clients2KernelServer: bridge_=" + bridge);
+        logger_.warn("Clients2KernelServer: bridge_=" + bridge);
         this.bridge_ = bridge;
     }
 
diff -r 62acf19daa74 -r 631fe7f467b7 src/java/isac/bridge/Kernel2ClientsServer.java
--- a/src/java/isac/bridge/Kernel2ClientsServer.java	Mon Jun 27 18:12:55 2005 +0200
+++ b/src/java/isac/bridge/Kernel2ClientsServer.java	Tue Jun 28 13:14:03 2005 +0200
@@ -32,12 +32,12 @@
 
     private Vector time_out_times_;
 
-    static Logger logger = Logger.getLogger(Kernel2ClientsServer.class
+    static Logger logger_ = Logger.getLogger(Kernel2ClientsServer.class
             .getName());
 
     //---------------------------------------------------------------
     public Kernel2ClientsServer(BridgeMain bridge) {
-        logger.warn("Kernel2ClientsServer: bridge_=" + bridge);
+        logger_.warn("Kernel2ClientsServer: bridge_=" + bridge);
         //this.smlReader = bridge_.getSmlReader();
         this.client_list_ = bridge.getClientList();
         this.time_out_times_ = bridge.getTimeOutTimes();
diff -r 62acf19daa74 -r 631fe7f467b7 src/java/isac/bridge/MathEngine.java
--- a/src/java/isac/bridge/MathEngine.java	Mon Jun 27 18:12:55 2005 +0200
+++ b/src/java/isac/bridge/MathEngine.java	Tue Jun 28 13:14:03 2005 +0200
@@ -42,11 +42,11 @@
     // and hands them out to the dialog after startSolving//WN00827 ???
     private Map calc_trees_;
 
-    static Logger logger = Logger.getLogger(MathEngine.class.getName());
+    static Logger logger_ = Logger.getLogger(MathEngine.class.getName());
 
     // This is a Singleton Class: A private constructor is needed
     private MathEngine(String hostName) {
-        logger.debug("MathEngine(" + hostName + ")");
+        logger_.debug("MathEngine(" + hostName + ")");
         try {
             //connect to bridge
             bridge_rmi_ = (IBridgeRMI) Naming.lookup("//" + hostName
@@ -79,14 +79,14 @@
      *            Host name on which the Bridge is running
      */
     public static void init(String hostName) {
-        logger.fatal("  DG->BR: init(" + hostName + ")");
+        logger_.fatal("  DG->BR: init(" + hostName + ")");
         if (singleton_ == null) {
             singleton_ = new MathEngine(hostName);
         }
     }
 
     public static MathEngine getMathEngine() {
-        logger.fatal("  DG<>BR: getMathEngine()");
+        logger_.fatal("  DG<>BR: getMathEngine()");
         return singleton_;
     }
 
@@ -104,7 +104,7 @@
      * Integer(id));//WN040922 TODO simplify
      */
     public CalcTree startCalculation(Formalization f) {
-        logger.fatal("  DG->BR: startCalculation(" + f.toSMLString() + ")");
+        logger_.fatal("  DG->BR: startCalculation(" + f.toSMLString() + ")");
         CalcTree calcTree = null;//WN
         try {
             int id = bridge_rmi_.startCalculation(f);
@@ -118,7 +118,7 @@
         } catch (RemoteException e) {
             e.printStackTrace();
         }
-        logger.fatal("  DG<-BR: startCalculation <- calcTree=" + calcTree);
+        logger_.fatal("  DG<-BR: startCalculation <- calcTree=" + calcTree);
         return calcTree;
     }
 
@@ -232,7 +232,7 @@
 
     CalcChanged autoCalculate(int id, int scope, int nSteps)
             throws RemoteException {
-        logger.debug("autoCalculate: id=" + id + ", scope=" + scope
+        logger_.debug("autoCalculate: id=" + id + ", scope=" + scope
                 + ", nSteps=" + nSteps);
         return bridge_rmi_.autoCalculate(id, scope, nSteps);
     }
@@ -263,12 +263,12 @@
     }
 
     int iterator(int id) throws RemoteException {
-        logger.debug("iterator: id=" + id);
+        logger_.debug("iterator: id=" + id);
         return bridge_rmi_.iterator(id);
     }
 
     Position moveRoot(int calcTreeID, int iteratorID) throws RemoteException {
-        logger.debug("moveRoot: calcTreeID=" + calcTreeID + ", iteratorID="
+        logger_.debug("moveRoot: calcTreeID=" + calcTreeID + ", iteratorID="
                 + iteratorID);
         return bridge_rmi_.moveRoot(calcTreeID, iteratorID);
     }
@@ -280,7 +280,7 @@
 
     Position moveDown(int calcTreeID, int iteratorID, Position p)
             throws RemoteException {
-        logger.debug("moveDown: calcTreeID=" + calcTreeID + ", sml_pos_=" + p);
+        logger_.debug("moveDown: calcTreeID=" + calcTreeID + ", sml_pos_=" + p);
         return bridge_rmi_.moveDown(calcTreeID, iteratorID, p);
     }
 
diff -r 62acf19daa74 -r 631fe7f467b7 src/java/isac/bridge/TimeCheckerThread.java
--- a/src/java/isac/bridge/TimeCheckerThread.java	Mon Jun 27 18:12:55 2005 +0200
+++ b/src/java/isac/bridge/TimeCheckerThread.java	Tue Jun 28 13:14:03 2005 +0200
@@ -27,7 +27,7 @@
     //Reference to the bridgeMain object
     private BridgeMain bridge_;
 
-    static Logger logger = Logger.getLogger(TimeCheckerThread.class.getName());
+    static Logger logger_ = Logger.getLogger(TimeCheckerThread.class.getName());
 
     /**
      * Constructor: instantiate a new TimeCheckerThread
@@ -38,7 +38,7 @@
      *            Time to wait for response from kernel before restarting
      */
     public TimeCheckerThread(BridgeMain bridge, long waitMillis) {
-        logger.warn("TimeCheckerThread: bridge_=" + bridge + ", wait_millis_"
+        logger_.warn("TimeCheckerThread: bridge_=" + bridge + ", wait_millis_"
                 + waitMillis);
         this.bridge_ = bridge;
         this.time_out_times_ = bridge.getTimeOutTimes();