1.1 --- a/src/java/isac/bridge/BridgeLogger.java Mon Jun 27 18:12:55 2005 +0200
1.2 +++ b/src/java/isac/bridge/BridgeLogger.java Tue Jun 28 13:14:03 2005 +0200
1.3 @@ -16,7 +16,7 @@
1.4 public class BridgeLogger {
1.5
1.6 //The logging text will be stored in this file
1.7 - FileWriter generalLog;
1.8 + FileWriter general_log_;
1.9
1.10 //minimum severity level of a message to be logged
1.11 //0 == log everything
1.12 @@ -30,7 +30,7 @@
1.13 */
1.14 public BridgeLogger(String path) {
1.15 try {
1.16 - generalLog = new FileWriter(path + "../sml/BridgeLog/general.txt");
1.17 + general_log_ = new FileWriter(path + "../sml/BridgeLog/general.txt");
1.18 log(1, "--------------------------");
1.19 log(1, "Server started on " + new Date());
1.20 log(1, "--------------------------");
1.21 @@ -50,8 +50,8 @@
1.22 public void log(int level, String msg) {
1.23 if (level > min_log_level_) {
1.24 try {
1.25 - generalLog.write(msg + "\n");
1.26 - generalLog.flush();
1.27 + general_log_.write(msg + "\n");
1.28 + general_log_.flush();
1.29 } catch (IOException e) {
1.30 e.printStackTrace();
1.31 }
1.32 @@ -63,7 +63,7 @@
1.33 */
1.34 public void close() {
1.35 try {
1.36 - generalLog.close();
1.37 + general_log_.close();
1.38 } catch (IOException e) {
1.39 e.printStackTrace();
1.40 }
2.1 --- a/src/java/isac/bridge/BridgeMain.java Mon Jun 27 18:12:55 2005 +0200
2.2 +++ b/src/java/isac/bridge/BridgeMain.java Tue Jun 28 13:14:03 2005 +0200
2.3 @@ -64,11 +64,11 @@
2.4
2.5 private int transport_mode_ = TRANS_STRING;
2.6
2.7 - JPanel panel;
2.8 + JPanel panel_;
2.9
2.10 - JTextArea textArea;
2.11 + JTextArea text_area_;
2.12
2.13 - JScrollPane scrollPane;
2.14 + JScrollPane scroll_pane_;
2.15
2.16 private Thread thread_clients2kernel_;
2.17
2.18 @@ -100,7 +100,7 @@
2.19
2.20 private boolean kernel_responding_ = true;
2.21
2.22 - static Logger logger = Logger.getLogger(BridgeMain.class.getName());
2.23 + static Logger logger_ = Logger.getLogger(BridgeMain.class.getName());
2.24
2.25 /**
2.26 * Constructor used to set up the bridge main program
2.27 @@ -113,7 +113,7 @@
2.28 //(no longer nescessary with j2sdk1.4.2)
2.29 //System.setProperty("java.util.prefs.syncInterval", "20000000000");
2.30
2.31 - logger.warn("BridgeMain obj.init: ini_path_=" + iniPath);
2.32 + logger_.warn("BridgeMain obj.init: ini_path_=" + iniPath);
2.33 this.ini_path_ = iniPath;
2.34 readProperties();
2.35
2.36 @@ -126,18 +126,18 @@
2.37
2.38 private void setUpBridgeLog() {
2.39 this.setLocation(700, 250);
2.40 - panel = new JPanel();
2.41 - panel.setSize(200, 300);
2.42 - panel.setLayout(new BorderLayout());
2.43 - panel.setBackground(Color.white);
2.44 + panel_ = new JPanel();
2.45 + panel_.setSize(200, 300);
2.46 + panel_.setLayout(new BorderLayout());
2.47 + panel_.setBackground(Color.white);
2.48
2.49 - textArea = new JTextArea();
2.50 - textArea.setFont(new Font("Monospaced", 0, 11));
2.51 - scrollPane = new JScrollPane(textArea,
2.52 + text_area_ = new JTextArea();
2.53 + text_area_.setFont(new Font("Monospaced", 0, 11));
2.54 + scroll_pane_ = new JScrollPane(text_area_,
2.55 JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
2.56 JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
2.57 - panel.add("Center", scrollPane);
2.58 - getContentPane().add(panel);
2.59 + panel_.add("Center", scroll_pane_);
2.60 + getContentPane().add(panel_);
2.61
2.62 setTitle("BridgeLog Java <=> SML");
2.63 WindowListener l = new WindowAdapter() {
2.64 @@ -212,7 +212,7 @@
2.65
2.66 //Start sml Threads and catch in- and output-streams
2.67 private void startSMLThread() {
2.68 - logger.warn("startSMLThread");
2.69 + logger_.warn("startSMLThread");
2.70 SMLThread smlThread = new SMLThread(this, kernel_exec_, kernel_args_);
2.71 thread_sml_ = new Thread(smlThread, "java_bridge_execution");
2.72 thread_sml_.setDaemon(true);
2.73 @@ -244,7 +244,7 @@
2.74 }
2.75
2.76 private void startThreadsFirstTime() {
2.77 - logger.warn("startThreadsFirstTime");
2.78 + logger_.warn("startThreadsFirstTime");
2.79 startSMLThread();
2.80
2.81 Clients2KernelServer c2k = new Clients2KernelServer(this);
2.82 @@ -368,7 +368,7 @@
2.83 */
2.84 public void log(int level, String msg) {
2.85 this.bridge_logger_.log(level, msg);
2.86 - this.textArea.append(msg + "\n");
2.87 + this.text_area_.append(msg + "\n");
2.88 }
2.89
2.90 public ClientList getClientList() {
2.91 @@ -376,7 +376,7 @@
2.92 }
2.93
2.94 public BufferedReader getSmlReader() {
2.95 - logger.warn("getSmlReader x");
2.96 + logger_.warn("getSmlReader x");
2.97 return sml_reader_;
2.98 }
2.99
2.100 @@ -397,7 +397,7 @@
2.101 }
2.102
2.103 public void setRMI(BridgeRMI bridgeRMI) {
2.104 - logger.warn("setRMI: bridge_rmi_=" + bridgeRMI);
2.105 + logger_.warn("setRMI: bridge_rmi_=" + bridgeRMI);
2.106 this.bridge_rmi_ = bridgeRMI;
2.107 bridgeRMI.setRmiID(1); //only one BridgeRMI used so far
2.108 }
3.1 --- a/src/java/isac/bridge/Clients2KernelServer.java Mon Jun 27 18:12:55 2005 +0200
3.2 +++ b/src/java/isac/bridge/Clients2KernelServer.java Tue Jun 28 13:14:03 2005 +0200
3.3 @@ -25,7 +25,7 @@
3.4
3.5 private BridgeMain bridge_;
3.6
3.7 - static Logger logger = Logger.getLogger(Clients2KernelServer.class
3.8 + static Logger logger_ = Logger.getLogger(Clients2KernelServer.class
3.9 .getName());
3.10
3.11 /**
3.12 @@ -34,7 +34,7 @@
3.13 * @param bridge_
3.14 */
3.15 public Clients2KernelServer(BridgeMain bridge) {
3.16 - logger.warn("Clients2KernelServer: bridge_=" + bridge);
3.17 + logger_.warn("Clients2KernelServer: bridge_=" + bridge);
3.18 this.bridge_ = bridge;
3.19 }
3.20
4.1 --- a/src/java/isac/bridge/Kernel2ClientsServer.java Mon Jun 27 18:12:55 2005 +0200
4.2 +++ b/src/java/isac/bridge/Kernel2ClientsServer.java Tue Jun 28 13:14:03 2005 +0200
4.3 @@ -32,12 +32,12 @@
4.4
4.5 private Vector time_out_times_;
4.6
4.7 - static Logger logger = Logger.getLogger(Kernel2ClientsServer.class
4.8 + static Logger logger_ = Logger.getLogger(Kernel2ClientsServer.class
4.9 .getName());
4.10
4.11 //---------------------------------------------------------------
4.12 public Kernel2ClientsServer(BridgeMain bridge) {
4.13 - logger.warn("Kernel2ClientsServer: bridge_=" + bridge);
4.14 + logger_.warn("Kernel2ClientsServer: bridge_=" + bridge);
4.15 //this.smlReader = bridge_.getSmlReader();
4.16 this.client_list_ = bridge.getClientList();
4.17 this.time_out_times_ = bridge.getTimeOutTimes();
5.1 --- a/src/java/isac/bridge/MathEngine.java Mon Jun 27 18:12:55 2005 +0200
5.2 +++ b/src/java/isac/bridge/MathEngine.java Tue Jun 28 13:14:03 2005 +0200
5.3 @@ -42,11 +42,11 @@
5.4 // and hands them out to the dialog after startSolving//WN00827 ???
5.5 private Map calc_trees_;
5.6
5.7 - static Logger logger = Logger.getLogger(MathEngine.class.getName());
5.8 + static Logger logger_ = Logger.getLogger(MathEngine.class.getName());
5.9
5.10 // This is a Singleton Class: A private constructor is needed
5.11 private MathEngine(String hostName) {
5.12 - logger.debug("MathEngine(" + hostName + ")");
5.13 + logger_.debug("MathEngine(" + hostName + ")");
5.14 try {
5.15 //connect to bridge
5.16 bridge_rmi_ = (IBridgeRMI) Naming.lookup("//" + hostName
5.17 @@ -79,14 +79,14 @@
5.18 * Host name on which the Bridge is running
5.19 */
5.20 public static void init(String hostName) {
5.21 - logger.fatal(" DG->BR: init(" + hostName + ")");
5.22 + logger_.fatal(" DG->BR: init(" + hostName + ")");
5.23 if (singleton_ == null) {
5.24 singleton_ = new MathEngine(hostName);
5.25 }
5.26 }
5.27
5.28 public static MathEngine getMathEngine() {
5.29 - logger.fatal(" DG<>BR: getMathEngine()");
5.30 + logger_.fatal(" DG<>BR: getMathEngine()");
5.31 return singleton_;
5.32 }
5.33
5.34 @@ -104,7 +104,7 @@
5.35 * Integer(id));//WN040922 TODO simplify
5.36 */
5.37 public CalcTree startCalculation(Formalization f) {
5.38 - logger.fatal(" DG->BR: startCalculation(" + f.toSMLString() + ")");
5.39 + logger_.fatal(" DG->BR: startCalculation(" + f.toSMLString() + ")");
5.40 CalcTree calcTree = null;//WN
5.41 try {
5.42 int id = bridge_rmi_.startCalculation(f);
5.43 @@ -118,7 +118,7 @@
5.44 } catch (RemoteException e) {
5.45 e.printStackTrace();
5.46 }
5.47 - logger.fatal(" DG<-BR: startCalculation <- calcTree=" + calcTree);
5.48 + logger_.fatal(" DG<-BR: startCalculation <- calcTree=" + calcTree);
5.49 return calcTree;
5.50 }
5.51
5.52 @@ -232,7 +232,7 @@
5.53
5.54 CalcChanged autoCalculate(int id, int scope, int nSteps)
5.55 throws RemoteException {
5.56 - logger.debug("autoCalculate: id=" + id + ", scope=" + scope
5.57 + logger_.debug("autoCalculate: id=" + id + ", scope=" + scope
5.58 + ", nSteps=" + nSteps);
5.59 return bridge_rmi_.autoCalculate(id, scope, nSteps);
5.60 }
5.61 @@ -263,12 +263,12 @@
5.62 }
5.63
5.64 int iterator(int id) throws RemoteException {
5.65 - logger.debug("iterator: id=" + id);
5.66 + logger_.debug("iterator: id=" + id);
5.67 return bridge_rmi_.iterator(id);
5.68 }
5.69
5.70 Position moveRoot(int calcTreeID, int iteratorID) throws RemoteException {
5.71 - logger.debug("moveRoot: calcTreeID=" + calcTreeID + ", iteratorID="
5.72 + logger_.debug("moveRoot: calcTreeID=" + calcTreeID + ", iteratorID="
5.73 + iteratorID);
5.74 return bridge_rmi_.moveRoot(calcTreeID, iteratorID);
5.75 }
5.76 @@ -280,7 +280,7 @@
5.77
5.78 Position moveDown(int calcTreeID, int iteratorID, Position p)
5.79 throws RemoteException {
5.80 - logger.debug("moveDown: calcTreeID=" + calcTreeID + ", sml_pos_=" + p);
5.81 + logger_.debug("moveDown: calcTreeID=" + calcTreeID + ", sml_pos_=" + p);
5.82 return bridge_rmi_.moveDown(calcTreeID, iteratorID, p);
5.83 }
5.84
6.1 --- a/src/java/isac/bridge/TimeCheckerThread.java Mon Jun 27 18:12:55 2005 +0200
6.2 +++ b/src/java/isac/bridge/TimeCheckerThread.java Tue Jun 28 13:14:03 2005 +0200
6.3 @@ -27,7 +27,7 @@
6.4 //Reference to the bridgeMain object
6.5 private BridgeMain bridge_;
6.6
6.7 - static Logger logger = Logger.getLogger(TimeCheckerThread.class.getName());
6.8 + static Logger logger_ = Logger.getLogger(TimeCheckerThread.class.getName());
6.9
6.10 /**
6.11 * Constructor: instantiate a new TimeCheckerThread
6.12 @@ -38,7 +38,7 @@
6.13 * Time to wait for response from kernel before restarting
6.14 */
6.15 public TimeCheckerThread(BridgeMain bridge, long waitMillis) {
6.16 - logger.warn("TimeCheckerThread: bridge_=" + bridge + ", wait_millis_"
6.17 + logger_.warn("TimeCheckerThread: bridge_=" + bridge + ", wait_millis_"
6.18 + waitMillis);
6.19 this.bridge_ = bridge;
6.20 this.time_out_times_ = bridge.getTimeOutTimes();