status bar convert to pure swing

SukhotinM · Apr 30, 2013 · 8ac2a9a · 8ac2a9a
1 parent c84c8e4
commit 8ac2a9a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/canmonitor/src/ocera/rtcan/monitor/CanMonStatusBar.java b/canmonitor/src/ocera/rtcan/monitor/CanMonStatusBar.java
@@ -35,7 +35,7 @@ public class CanMonStatusBar {
      */
     private void $$$setupUI$$$() {
         panel = new JPanel();
-        panel.setLayout(new GridLayoutManager(1, 3, new Insets(1, 0, 0, 0), 5, 0));
+        panel.setLayout(new  GridLayoutManager(1, 3, new Insets(1, 0, 0, 0), 5, 0));
         panel.setEnabled(false);
         final JPanel panel1 = new JPanel();
         panel1.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, 0));

diff --git a/canmonitor/src/ocera/rtcan/monitor/CanMonitor.java b/canmonitor/src/ocera/rtcan/monitor/CanMonitor.java
@@ -10,6 +10,7 @@
 import com.intellij.uiDesigner.core.GridConstraints;
 import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.uiDesigner.core.Spacer;
+import ocera.rtcan.monitor.ui.SWCanMonStatusBar;
 import ocera.util.xmlconfig.XmlConfig;
 import ocera.util.*;
 import ocera.msg.*;
@@ -83,7 +84,7 @@ public class CanMonitor extends JFrame implements Runnable {
     public static final String CONFIG_FILE_NAME = "CanMonitor.conf.xml";
     protected boolean configChanged = false;
     private ConfigLookup confLookup = new ConfigLookup(".canmonitor", CONFIG_FILE_NAME, this.getClass());
-    private CanMonStatusBar statusBar = new CanMonStatusBar();
+    private SWCanMonStatusBar statusBar = new SWCanMonStatusBar();
     private JButton btSend;
     //private LinkedList candeviceList = new LinkedList();
     private JButton btClearLog;
@@ -436,8 +437,8 @@ private void refreshForm() {
         } else {
             statusBar.lbl1.setText(canConn.getSocket().toString());
         }
-        statusBar.lbl2.setText("");
-        statusBar.lbl3.setText("");
+        statusBar.lbl2.setText("label2");
+        statusBar.lbl3.setText("label3");
     }
 
     public void setTabLabel(int tabix, String lbl) {