bugspot

JMRI · Feb 7, 2020 · e3a5afb · e3a5afb
1 parent 197eddd
commit e3a5afb
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 32 deletions.
diff --git a/java/src/jmri/jmrix/can/cbus/node/CbusBasicNodeEvent.java b/java/src/jmri/jmrix/can/cbus/node/CbusBasicNodeEvent.java
@@ -40,11 +40,11 @@ protected void setEditTableModel( CbusNodeSingleEventTableDataModel model ) {
     }
 
     protected void notifyModel(){
-        if ( eventDataModel != null ) {
-            jmri.util.ThreadingUtil.runOnGUI( ()->{
+        jmri.util.ThreadingUtil.runOnGUI( ()->{
+            if ( eventDataModel != null ) {
                 eventDataModel.fireTableDataChanged();
+            }
         });
-        }
     }
 
     /**
@@ -81,7 +81,9 @@ public final int getIndex(){
      * @param tempName the name to use
      */
     public final void setTempFcuNodeName( String tempName){
-        _fcuNodeName = tempName;
+        if ( tempName !=null ){
+            _fcuNodeName = tempName;
+        }
     }
 
     /**

diff --git a/java/src/jmri/jmrix/can/cbus/node/CbusNodeBackupManager.java b/java/src/jmri/jmrix/can/cbus/node/CbusNodeBackupManager.java
@@ -484,7 +484,7 @@ protected void resetBupArray() {
      */
     @Nonnull
     public BackupType getSessionBackupStatus() {
-        if (backupStarted ) {
+        if (backupStarted && getBackups().size() >0 ) {
             return getBackups().get(0).getBackupResult();
         } else {
             return BackupType.OUTSTANDING;

diff --git a/java/src/jmri/jmrix/can/cbus/node/CbusNodeCanListener.java b/java/src/jmri/jmrix/can/cbus/node/CbusNodeCanListener.java
@@ -115,7 +115,7 @@ public void reply(CanReply m) {
             case CbusConstants.CBUS_PARAN:
                 // response from node
 
-                processParan(m);
+                processParam(m);
                 break;
             case CbusConstants.CBUS_NUMEV:
                 // response from node
@@ -203,11 +203,9 @@ else if ( opc == CbusConstants.CBUS_CMDERR ) { // response from node
 
     }
 
-    private void processParan(CanReply m){
-
+    private void processParam(CanReply m){
         _node.getNodeTimerManager().clearAllParamTimeout();
         if (m.getElement(3)==0) { // reset parameters
-
             int [] myarray = new int[(m.getElement(4)+1)]; // +1 to account for index 0 being the parameter count
             java.util.Arrays.fill(myarray, -1);
             // node may already be aware of some params via the initial PNN or STAT

diff --git a/java/src/jmri/jmrix/can/cbus/node/CbusNodeEventManager.java b/java/src/jmri/jmrix/can/cbus/node/CbusNodeEventManager.java
@@ -472,7 +472,7 @@ private void teachEventsComplete(){
             String err;
             if ( _node.getNodeTimerManager().sendEvErrorCount==0 ) {
                 log.info("Completed Event Write with No errors, node {}.", _node );
-                err = null;
+                err = "";
             }
             else {
                 err = "Event Write Failed with "+ _node.getNodeTimerManager().sendEvErrorCount +" errors.";

diff --git a/java/src/jmri/jmrix/can/cbus/swing/nodeconfig/CbusNodeRestoreFcuFrame.java b/java/src/jmri/jmrix/can/cbus/swing/nodeconfig/CbusNodeRestoreFcuFrame.java
@@ -37,12 +37,12 @@ public class CbusNodeRestoreFcuFrame extends JmriJFrame {
 
     private JPanel infoPane = new JPanel();
     private JTabbedPane tabbedPane;
-    private CbusNodeTableDataModel nodeModel = null;
+    private CbusNodeTableDataModel nodeModel;
     private CanSystemConnectionMemo _memo;
     private final NodeConfigToolPane mainpane;
     private CbusNodeNVEditTablePane nodevarPane;
     private CbusNodeEventTablePane nodeEventPane;
-    public JSplitPane split;
+    private JSplitPane split;
     private CbusNodeInfoPane nodeinfoPane;
     private JTable nodeTable;
     private JButton openFCUButton;
@@ -98,6 +98,8 @@ private void initMainPane() {
         buttonPane.add(importEventNamesButton );
         buttonPane.add(importNodeNamesButton );
 
+        updateImportEventsButton();
+
         nvMenuPane.add(buttonPane);
 
         CbusNodeFcuTablePane fcuTablePane = new CbusNodeFcuTablePane();
@@ -169,7 +171,7 @@ private void initMainPane() {
 
         tabbedPane = new JTabbedPane();
 
-        nodeinfoPane = new CbusNodeInfoPane();
+        nodeinfoPane = new CbusNodeInfoPane(null);
 
         CbusNodeNVTableDataModel nodeNVModel = new CbusNodeNVTableDataModel(_memo, 5,
             CbusNodeNVTableDataModel.MAX_COLUMN); // controller, row, column
@@ -323,12 +325,12 @@ private void updateTabs() {
                     nodeEventPane.setNode( nodeFromSelectedRow() );
                     break;
                 default:
-                    nodeinfoPane.initComponents( nodeFromSelectedRow() );
+                    nodeinfoPane.setNode( nodeFromSelectedRow() );
                     break;
             }
         }
         else {
-            nodeinfoPane.initComponents( null );
+            nodeinfoPane.setNode( null );
         }
 
     }
@@ -471,23 +473,8 @@ private void addFile(File inputFile) {
                     }
                 }
             }
-
-            if ( nodeList.getLength() > 0 ) {
-                importNodeNamesButton.setEnabled(true);
-                importNodeNamesButton.setToolTipText(null);
-            }
-
-            try {
-                CbusEventTableDataModel eventModel = jmri.InstanceManager.getNullableDefault(
-                    jmri.jmrix.can.cbus.eventtable.CbusEventTableDataModel.class);
-                log.debug("event table active {}",eventModel);
-                if ( eventList.getLength() > 0 ) {
-                    importEventNamesButton.setEnabled(true);
-                    importEventNamesButton.setToolTipText(null);
-                }
-            } catch (NullPointerException e) {
-                importEventNamesButton.setToolTipText("CBUS Event Table not running.");
-            }
+
+            updateImportEventsButton();
         }
         catch (RuntimeException e) {
             log.warn("Error importing xml file {}", e);
@@ -501,6 +488,34 @@ private void addFile(File inputFile) {
         }
     }
 
+    private boolean eventsOnTable() {
+        for (int i = 0; i < cbusNodeFcuDataModel.getRowCount(); i++){
+            if ( (int) cbusNodeFcuDataModel.getValueAt(i, CbusNodeFromFcuTableDataModel.FCU_NODE_EVENTS_COLUMN)>0){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void updateImportEventsButton() {
+        CbusEventTableDataModel eventModel = jmri.InstanceManager.getNullableDefault(
+            jmri.jmrix.can.cbus.eventtable.CbusEventTableDataModel.class);
+        if (eventModel==null){
+            importEventNamesButton.setEnabled(false);
+            importEventNamesButton.setToolTipText("CBUS Event Table Not Running");
+        }
+        else {
+            if ( eventsOnTable() ) {
+                importEventNamesButton.setEnabled(true);
+                importEventNamesButton.setToolTipText(null);
+            }
+            else {
+                importEventNamesButton.setEnabled(false);
+                importEventNamesButton.setToolTipText("No Events to Import");
+            }
+        }
+    }
+
     private void teachJmriEventNamesFromNode( CbusNode nodeWithEvents ){
 
         CbusEventTableDataModel eventModel;