Changeset 33770 in osm for applications/editors/josm/plugins/public_transport

Timestamp:

2017-11-04T19:16:44+01:00 (7 years ago)

Author:

donvip

Message:

fix #josm13696, fix #josm14432 - NPE

Location:

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs

Files:

• GTFSImporterDialog.java (modified) (2 diffs)
• StopImporterDialog.java (modified) (3 diffs)

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/GTFSImporterDialog.java

@@ -19 +19 @@
 
 public class GTFSImporterDialog extends AbstractImporterDialog<GTFSImporterAction> {
-    private JTable gtfsStopTable = null;
+    private final JTable gtfsStopTable = new JTable();
 
     public GTFSImporterDialog(GTFSImporterAction controller) {
@@ -229 +229 @@
      controller.getFocusWaypointDeleteAction());*/
 
-        gtfsStopTable = new JTable();
         JScrollPane tableSP = new JScrollPane(gtfsStopTable);
 

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/StopImporterDialog.java

@@ -32 +32 @@
     private JList<TrackReference> tracksList = null;
 
-    private JTable stoplistTable = null;
-
-    private JTable waypointTable = null;
+    private final JTable stoplistTable = new JTable();
+
+    private final JTable waypointTable = new JTable();
 
     public StopImporterDialog(StopImporterAction controller) {
@@ -278 +278 @@
                 controller.getFocusStoplistDeleteAction());
 
-        stoplistTable = new JTable();
         JScrollPane tableSP = new JScrollPane(stoplistTable);
 
@@ -411 +410 @@
                 controller.getFocusWaypointDeleteAction());
 
-        waypointTable = new JTable();
         tableSP = new JScrollPane(waypointTable);