Changeset 13535 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2018-03-17T01:26:16+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16097 - NPE + disable arrow button in history dialog with changeset button

File:

• trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -60 +60 @@
     private final OpenChangesetDialogAction changesetDialogAction = new OpenChangesetDialogAction(null);
     private final JButton changesetButton = new JButton(changesetDialogAction);
+    private final BasicArrowButton arrowButton = new BasicArrowButton(BasicArrowButton.SOUTH);
     private JPanel pnlChangesetSource;
     private JPanel pnlChangesetImageryUsed;
@@ -114 +115 @@
         changesetButton.setMargin(new Insets(0, 0, 0, 2));
         changesetPanel.add(changesetButton, BorderLayout.CENTER);
-        final BasicArrowButton arrowButton = new BasicArrowButton(BasicArrowButton.SOUTH);
         arrowButton.addActionListener(action -> {
-            if (changesetDialogAction != null) { // fix #15444
+            if (changesetDialogAction.id != null) { // fix #15444, #16097
                 final OpenChangesetPopupMenu popupMenu = new OpenChangesetPopupMenu(changesetDialogAction.id);
                 popupMenu.insert(changesetDialogAction, 0);
@@ -258 +258 @@
             changesetDialogAction.setId(cs.getId());
             changesetButton.setEnabled(true);
+            arrowButton.setEnabled(true);
 
             String username = "";
@@ -283 +284 @@
             changesetDialogAction.setId(null);
             changesetButton.setEnabled(false);
+            arrowButton.setEnabled(false);
         }