Changeset 8308 in josm for trunk/src/org/openstreetmap/josm/gui/download

Timestamp:

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

Author:

Don-vip

Message:

fix potential NPEs and Sonar issues related to serialization

Location:

trunk/src/org/openstreetmap/josm/gui/download

Files:

• DownloadDialog.java (modified) (1 diff)
• PlaceSelection.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -70 +70 @@
 
     protected SlippyMapChooser slippyMapChooser;
-    protected final List<DownloadSelection> downloadSelections = new ArrayList<>();
+    protected final transient List<DownloadSelection> downloadSelections = new ArrayList<>();
     protected final JTabbedPane tpDownloadAreaSelectors = new JTabbedPane();
     protected JCheckBox cbNewLayer;
     protected JCheckBox cbStartup;
     protected final JLabel sizeCheck = new JLabel();
-    protected Bounds currentBounds = null;
+    protected transient Bounds currentBounds = null;
     protected boolean canceled;
 

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -328 +328 @@
         private String searchExpression;
         private HttpURLConnection connection;
-        private List<SearchResult> data;
+        private transient List<SearchResult> data;
         private boolean canceled = false;
         private Server useserver;
@@ -409 +409 @@
 
     static class NamedResultTableModel extends DefaultTableModel {
-        private List<SearchResult> data;
-        private ListSelectionModel selectionModel;
+        private transient List<SearchResult> data;
+        private transient ListSelectionModel selectionModel;
 
         public NamedResultTableModel(ListSelectionModel selectionModel) {