Merge pull request #5761 from icklesteve/Cbus-Event-Table

MERG CBUS EVTable Fixes
JMRI · Sep 7, 2018 · 4d42d0d · 4d42d0d
2 parents d922083 + 2dedb02
commit 4d42d0d
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/java/src/jmri/jmrix/can/cbus/swing/eventtable/CbusEventTableDataModel.java b/java/src/jmri/jmrix/can/cbus/swing/eventtable/CbusEventTableDataModel.java
@@ -85,7 +85,6 @@ public class CbusEventTableDataModel extends javax.swing.table.AbstractTableMode
     private int _defaultfeedbackdelay = 5000;
 
     final JFileChooser fileChooser = new JFileChooser(FileUtil.getUserFilesPath());
-    private Timer eventTimer;
     private ActionListener eventFeedbackListener;
 
     CanSystemConnectionMemo memo;
@@ -225,7 +224,7 @@ public String getColumnName(int col) { // not in any order
     }
 
     // order needs to match column list right at top of class
-    protected static String[] columnToolTips = {
+    protected String[] columnToolTips = {
         Bundle.getMessage("EventColTip"),
         Bundle.getMessage("NodeColTip"),
         Bundle.getMessage("NameColTip"),
@@ -325,7 +324,7 @@ public static int getPreferredWidth(int col) {
      * </p>
      * @param col int col number
      */
-    public static int getColumnWidth(int col) {
+    public int getColumnWidth(int col) {
         switch (col) {
             case CANID_COLUMN:
                 return 5;