Fix spotbugs note

JMRI · Nov 10, 2019 · 6d989a3 · 6d989a3
1 parent 04eecf5
commit 6d989a3
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 24 deletions.
diff --git a/java/src/jmri/jmrit/beantable/oblock/BlockPathTableModel.java b/java/src/jmri/jmrit/beantable/oblock/BlockPathTableModel.java
@@ -250,9 +250,9 @@ public void setValueAt(Object value, int row, int col) {
                             _tempLen *= 25.4f;                            
                         }
                     } catch (ParseException e) {
-                        msg = Bundle.getMessage("BadNumber", tempRow[LENGTHCOL]);                    
+                        msg = Bundle.getMessage("BadNumber", tempRow[LENGTHCOL]);
                     }
-                    return;
+                    break;
                 case UNITSCOL:
                     _units.set(row, (Boolean)value);
                     fireTableRowsUpdated(row, row);
@@ -443,7 +443,8 @@ public void propertyChange(PropertyChangeEvent e) {
             if (log.isDebugEnabled()) {
                 log.debug("propertyChange \"" + property + "\".  source= " + e.getSource());
             }
-            if (property.equals("portalCount") || property.equals("pathCount")) {
+            if (property.equals("portalCount") || property.equals("pathCount")
+                    || property.equals("pathDelete")) {
                 fireTableDataChanged();
             }
         }

diff --git a/java/src/jmri/jmrit/beantable/oblock/OBlockTableModel.java b/java/src/jmri/jmrit/beantable/oblock/OBlockTableModel.java
@@ -678,6 +678,7 @@ void deleteBean(OBlock bean) {
             if (!(listener instanceof OBlockTableModel) && 
                     !(listener instanceof BlockPathTableModel) && 
                     !(listener instanceof PathTurnoutTableModel) &&
+                    !(listener instanceof jmri.jmrit.picker.PickListModel) &&
                     !(listener instanceof OBlockManager)) {
                 sb.append("\n");
                 sb.append(Bundle.getMessage("InUseBy", bean.getDisplayName(), listener.getClass().getName()));

diff --git a/java/src/jmri/jmrit/beantable/oblock/PathTurnoutTableModel.java b/java/src/jmri/jmrit/beantable/oblock/PathTurnoutTableModel.java
@@ -44,19 +44,14 @@ public class PathTurnoutTableModel extends AbstractTableModel implements Propert
     static final String[] turnoutStates = {closed, thrown};//, unknown, inconsistent};
 
     private String[] tempRow = new String[NUMCOLS];
+    TableFrames.PathTurnoutFrame _parent;
     private OPath _path;
 
-    public PathTurnoutTableModel() {
-        super();
-    }
-
-    public PathTurnoutTableModel(OPath path) {
+    public PathTurnoutTableModel(OPath path, TableFrames.PathTurnoutFrame parent) {
         super();
         _path = path;
-    }
-
-    public void init() {
         _path.getBlock().addPropertyChangeListener(this);
+        _parent = parent;
     }
 
     public void removeListener() {
@@ -266,8 +261,14 @@ public int getPreferredWidth(int col) {
     }
 
     public void propertyChange(PropertyChangeEvent e) {
-        if (_path.getBlock().equals(e.getSource()) && e.getPropertyName().equals("pathCount")) {
-            fireTableDataChanged();
+        if (_path.getBlock().equals(e.getSource())) {
+            String property = e.getPropertyName();
+            if (property.equals("pathCount")) {
+                fireTableDataChanged();
+            } else if (property.equals("pathDelete") && _path.equals(e.getOldValue())) {
+                removeListener();
+                _parent.dispose();
+            }
         }
     }
 

diff --git a/java/src/jmri/jmrit/beantable/oblock/TableFrames.java b/java/src/jmri/jmrit/beantable/oblock/TableFrames.java
@@ -867,19 +867,15 @@ protected static class PathTurnoutFrame extends JInternalFrame {
         /**
          *
          */
-        PathTurnoutTableModel PathTurnoutModel;
+        PathTurnoutTableModel pathTurnoutModel;
 
         public PathTurnoutFrame(String title, boolean resizable, boolean closable,
                 boolean maximizable, boolean iconifiable) {
             super(title, resizable, closable, maximizable, iconifiable);
         }
 
-        public void init(OBlock block, TableFrames parent) {
-            PathTurnoutModel = new PathTurnoutTableModel();
-        }
-
         public PathTurnoutTableModel getModel() {
-            return PathTurnoutModel;
+            return pathTurnoutModel;
         }
     }
 
@@ -897,8 +893,7 @@ protected JInternalFrame makePathTurnoutFrame(OBlock block, String pathName) {
         if (path == null) {
             return null;
         }
-        PathTurnoutTableModel PathTurnoutModel = new PathTurnoutTableModel(path);
-        PathTurnoutModel.init();
+        PathTurnoutTableModel PathTurnoutModel = new PathTurnoutTableModel(path, frame);
         JTable PathTurnoutTable = new JTable(PathTurnoutModel);
         PathTurnoutTable.setTransferHandler(new jmri.util.DnDTableImportExportHandler(
                 new int[]{PathTurnoutTableModel.SETTINGCOLUMN, PathTurnoutTableModel.DELETE_COL}));

diff --git a/java/src/jmri/jmrit/logix/OBlock.java b/java/src/jmri/jmrit/logix/OBlock.java
@@ -3,6 +3,7 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.awt.Color;
 import java.awt.Font;
+import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -14,6 +15,7 @@
 import jmri.Path;
 import jmri.Sensor;
 import jmri.Turnout;
+import jmri.jmrit.beantable.oblock.OBlockTableModel;
 import jmri.util.ThreadingUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -788,10 +790,9 @@ public boolean removeOPath(OPath path) {
             return false;
         }
         path.clearSettings();
-        int oldSize = getPaths().size();
         super.removePath(path);
         path.dispose();
-        firePropertyChange("pathCount", oldSize, getPaths().size());
+        firePropertyChange("pathDelete", path, getPaths().size());
         return true;
     }
 
@@ -924,6 +925,9 @@ public void dispose() {
         for (Path pa : getPaths()) {
             removeOPath((OPath)pa);
         }
+        for (PropertyChangeListener listener : getPropertyChangeListeners()) {
+            removePropertyChangeListener(listener);
+        }
         jmri.InstanceManager.getDefault(OBlockManager.class).deregister(this);
         super.dispose();
     }

diff --git a/java/src/jmri/jmrit/logix/PortalManager.java b/java/src/jmri/jmrit/logix/PortalManager.java
@@ -45,7 +45,7 @@ public class PortalManager implements jmri.InstanceManagerAutoDefault, PropertyC
     private PropertyChangeSupport pcs = new PropertyChangeSupport(this);
     private ArrayList<Portal> _nameList = new ArrayList<>();   // stores Portal in loaded order
     private Hashtable<String, Portal> _portalMap = new Hashtable<>();   // stores portal by current name
-    private Integer _nextIndex = new Integer(1);
+    private Integer _nextIndex = Integer.valueOf(1);
 
     public PortalManager() {
     }