Changeset 33394 in osm for applications/editors/josm/plugins

Timestamp:

2017-06-13T22:43:27+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm7057 - NPE

Location:

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat

Files:

• GlobalsatConfigDialog.java (modified) (2 diffs)
• GlobalsatImportDialog.java (modified) (2 diffs)

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java

@@ -11 +11 @@
 import java.awt.Insets;
 import java.awt.event.KeyEvent;
+import java.util.Objects;
 
 import javax.swing.AbstractButton;
@@ -77 +78 @@
 
     public GlobalsatConfigDialog(Dg100Config config) {
-        conf = config;
+        conf = Objects.requireNonNull(config);
         GridBagConstraints c = new GridBagConstraints();
 

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java

@@ -20 +20 @@
 import javax.swing.ListCellRenderer;
 
+import org.kaintoch.gps.globalsat.dg100.Dg100Config;
 import org.openstreetmap.josm.Main;
 
@@ -98 +99 @@
                 @Override
                 public void actionPerformed(java.awt.event.ActionEvent e) {
-                    System.out.println("configureing the device");
+                    System.out.println("configuring the device");
                     try {
-
-                        GlobalsatConfigDialog dialog = new GlobalsatConfigDialog(GlobalsatPlugin.dg100().getConfig());
-                        JOptionPane pane = new JOptionPane(dialog, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
-                        JDialog dlg = pane.createDialog(Main.parent, tr("Configure Device"));
-                        dlg.setVisible(true);
-                        if (((Integer) pane.getValue()) == JOptionPane.OK_OPTION) {
-                            GlobalsatPlugin.dg100().setConfig(dialog.getConfig());
+                        Dg100Config conf = GlobalsatPlugin.dg100().getConfig();
+                        if (conf != null) {
+                            GlobalsatConfigDialog dialog = new GlobalsatConfigDialog(conf);
+                            JOptionPane pane = new JOptionPane(dialog, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
+                            JDialog dlg = pane.createDialog(Main.parent, tr("Configure Device"));
+                            dlg.setVisible(true);
+                            if (((Integer) pane.getValue()) == JOptionPane.OK_OPTION) {
+                                GlobalsatPlugin.dg100().setConfig(dialog.getConfig());
+                            }
+                            dlg.dispose();
+                        } else {
+                            JOptionPane.showMessageDialog(Main.parent, tr("Connection Error."), tr("Connection Error."), JOptionPane.ERROR);
                         }
-                        dlg.dispose();
-
                     } catch (GlobalsatDg100.ConnectionException ex) {
                         JOptionPane.showMessageDialog(Main.parent, tr("Connection Error.") + " " + ex.toString());
                     }
-                    System.out.println("configureing the device finised");
+                    System.out.println("configuring the device finished");
                 }
             });