Changeset 8308 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

Timestamp:

2015-05-02T00:55:19+02:00 (9 years ago)

Author:

Don-vip

Message:

fix potential NPEs and Sonar issues related to serialization

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -98 +98 @@
     /** the popup menu and its handler */
     private final ListPopupMenu popupMenu;
-    private final PopupMenuHandler popupMenuHandler;
+    private final transient PopupMenuHandler popupMenuHandler;
 
     /**
@@ -477 +477 @@
         // Variable to store history from currentDataSet()
         private LinkedList<Collection<? extends OsmPrimitive>> history;
-        private final List<OsmPrimitive> selection = new ArrayList<>();
+        private final transient List<OsmPrimitive> selection = new ArrayList<>();
         private DefaultListSelectionModel selectionModel;
 
@@ -737 +737 @@
      */
     protected static class SearchMenuItem extends JMenuItem implements ActionListener {
-        protected final SearchSetting s;
+        protected final transient SearchSetting s;
 
         public SearchMenuItem(SearchSetting s) {
@@ -778 +778 @@
      */
     protected static class SelectionMenuItem extends JMenuItem implements ActionListener {
-        private final DefaultNameFormatter df = DefaultNameFormatter.getInstance();
-        protected Collection<? extends OsmPrimitive> sel;
+        private final transient DefaultNameFormatter df = DefaultNameFormatter.getInstance();
+        protected transient Collection<? extends OsmPrimitive> sel;
 
         public SelectionMenuItem(Collection<? extends OsmPrimitive> sel) {