Changeset 11416 in josm for trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

Timestamp:

2016-12-23T15:19:47+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14151 - see #14042 - fix NPE properly (regression from r11306) + add robustness

File:

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

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

@@ -202 +202 @@
         if (primitive != null) {
             Changeset cs = primitive.getChangeset();
-            if (cs != null) {
-                update(cs, model.isLatest(primitive), primitive.getTimestamp(), primitive.getVersion());
-            }
+            update(cs, model.isLatest(primitive), primitive.getTimestamp(), primitive.getVersion());
         }
     }
@@ -219 +217 @@
     /**
      * Updates the content of this panel based on the changeset information given by {@code cs}.
-     * @param cs the changeset information - must not be null
+     * @param cs the changeset information
      * @param isLatest whether this relates to a not yet commited changeset
      * @param timestamp the timestamp
@@ -227 +225 @@
         lblInfo.setText(getInfoText(timestamp, version, isLatest));
 
-        if (!isLatest) {
+        if (!isLatest && cs != null) {
             User user = cs.getUser();
             String url = Main.getBaseBrowseUrl() + "/changeset/" + cs.getId();
@@ -299 +297 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            ChangesetDialog.LaunchChangesetManager.displayChangesets(Collections.singleton(id));
+            if (id != null) {
+                ChangesetDialog.LaunchChangesetManager.displayChangesets(Collections.singleton(id));
+            }
             if (componentToSelect != null) {
                 ChangesetCacheManager.getInstance().setSelectedComponentInDetailPanel(componentToSelect);