Changeset 11553 in josm for trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

Timestamp:

2017-02-12T16:32:18+01:00 (7 years ago)

Author:

Don-vip

Message:

refactor handling of null values - use Java 8 Optional where possible

File:

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

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

@@ -309 +309 @@
             throw new IllegalArgumentException(
                     tr("Failed to set reference. Reference ID {0} does not match history ID {1}.", reference.getId(), history.getId()));
-        HistoryOsmPrimitive primitive = history.getByVersion(reference.getVersion());
-        if (primitive == null)
+        if (history.getByVersion(reference.getVersion()) == null)
             throw new IllegalArgumentException(
                     tr("Failed to set reference. Reference version {0} not available in history.", reference.getVersion()));
@@ -340 +339 @@
             throw new IllegalArgumentException(
                     tr("Failed to set reference. Reference ID {0} does not match history ID {1}.", current.getId(), history.getId()));
-        HistoryOsmPrimitive primitive = history.getByVersion(current.getVersion());
-        if (primitive == null)
+        if (history.getByVersion(current.getVersion()) == null)
             throw new IllegalArgumentException(
                     tr("Failed to set current primitive. Current version {0} not available in history.", current.getVersion()));
@@ -389 +387 @@
     /**
      * Returns true if <code>primitive</code> is the latest primitive
-     * representing the version currently edited in the current data
-     * layer.
+     * representing the version currently edited in the current data layer.
      *
      * @param primitive the primitive to check
@@ -396 +393 @@
      */
     public boolean isLatest(HistoryOsmPrimitive primitive) {
-        if (primitive == null)
-            return false;
-        return primitive == latest;
+        return primitive != null && primitive == latest;
     }