1.1 --- a/src/java/isac/bridge/BridgeMain.java	Mon Jun 27 18:12:55 2005 +0200
     1.2 +++ b/src/java/isac/bridge/BridgeMain.java	Tue Jun 28 13:14:03 2005 +0200
     1.3 @@ -64,11 +64,11 @@
     1.4  
     1.5      private int transport_mode_ = TRANS_STRING;
     1.6  
     1.7 -    JPanel panel;
     1.8 +    JPanel panel_;
     1.9  
    1.10 -    JTextArea textArea;
    1.11 +    JTextArea text_area_;
    1.12  
    1.13 -    JScrollPane scrollPane;
    1.14 +    JScrollPane scroll_pane_;
    1.15  
    1.16      private Thread thread_clients2kernel_;
    1.17  
    1.18 @@ -100,7 +100,7 @@
    1.19  
    1.20      private boolean kernel_responding_ = true;
    1.21  
    1.22 -    static Logger logger = Logger.getLogger(BridgeMain.class.getName());
    1.23 +    static Logger logger_ = Logger.getLogger(BridgeMain.class.getName());
    1.24  
    1.25      /**
    1.26       * Constructor used to set up the bridge main program
    1.27 @@ -113,7 +113,7 @@
    1.28          //(no longer nescessary with j2sdk1.4.2)
    1.29          //System.setProperty("java.util.prefs.syncInterval", "20000000000");
    1.30  
    1.31 -        logger.warn("BridgeMain obj.init: ini_path_=" + iniPath);
    1.32 +        logger_.warn("BridgeMain obj.init: ini_path_=" + iniPath);
    1.33          this.ini_path_ = iniPath;
    1.34          readProperties();
    1.35  
    1.36 @@ -126,18 +126,18 @@
    1.37  
    1.38      private void setUpBridgeLog() {
    1.39          this.setLocation(700, 250);
    1.40 -        panel = new JPanel();
    1.41 -        panel.setSize(200, 300);
    1.42 -        panel.setLayout(new BorderLayout());
    1.43 -        panel.setBackground(Color.white);
    1.44 +        panel_ = new JPanel();
    1.45 +        panel_.setSize(200, 300);
    1.46 +        panel_.setLayout(new BorderLayout());
    1.47 +        panel_.setBackground(Color.white);
    1.48  
    1.49 -        textArea = new JTextArea();
    1.50 -        textArea.setFont(new Font("Monospaced", 0, 11));
    1.51 -        scrollPane = new JScrollPane(textArea,
    1.52 +        text_area_ = new JTextArea();
    1.53 +        text_area_.setFont(new Font("Monospaced", 0, 11));
    1.54 +        scroll_pane_ = new JScrollPane(text_area_,
    1.55                  JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
    1.56                  JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
    1.57 -        panel.add("Center", scrollPane);
    1.58 -        getContentPane().add(panel);
    1.59 +        panel_.add("Center", scroll_pane_);
    1.60 +        getContentPane().add(panel_);
    1.61  
    1.62          setTitle("BridgeLog Java <=> SML");
    1.63          WindowListener l = new WindowAdapter() {
    1.64 @@ -212,7 +212,7 @@
    1.65  
    1.66      //Start sml Threads and catch in- and output-streams
    1.67      private void startSMLThread() {
    1.68 -        logger.warn("startSMLThread");
    1.69 +        logger_.warn("startSMLThread");
    1.70          SMLThread smlThread = new SMLThread(this, kernel_exec_, kernel_args_);
    1.71          thread_sml_ = new Thread(smlThread, "java_bridge_execution");
    1.72          thread_sml_.setDaemon(true);
    1.73 @@ -244,7 +244,7 @@
    1.74      }
    1.75  
    1.76      private void startThreadsFirstTime() {
    1.77 -        logger.warn("startThreadsFirstTime");
    1.78 +        logger_.warn("startThreadsFirstTime");
    1.79          startSMLThread();
    1.80  
    1.81          Clients2KernelServer c2k = new Clients2KernelServer(this);
    1.82 @@ -368,7 +368,7 @@
    1.83       */
    1.84      public void log(int level, String msg) {
    1.85          this.bridge_logger_.log(level, msg);
    1.86 -        this.textArea.append(msg + "\n");
    1.87 +        this.text_area_.append(msg + "\n");
    1.88      }
    1.89  
    1.90      public ClientList getClientList() {
    1.91 @@ -376,7 +376,7 @@
    1.92      }
    1.93  
    1.94      public BufferedReader getSmlReader() {
    1.95 -        logger.warn("getSmlReader x");
    1.96 +        logger_.warn("getSmlReader x");
    1.97          return sml_reader_;
    1.98      }
    1.99  
   1.100 @@ -397,7 +397,7 @@
   1.101      }
   1.102  
   1.103      public void setRMI(BridgeRMI bridgeRMI) {
   1.104 -        logger.warn("setRMI: bridge_rmi_=" + bridgeRMI);
   1.105 +        logger_.warn("setRMI: bridge_rmi_=" + bridgeRMI);
   1.106          this.bridge_rmi_ = bridgeRMI;
   1.107          bridgeRMI.setRmiID(1); //only one BridgeRMI used so far
   1.108      }