Changeset 13202 in josm for trunk/src

Timestamp:

2017-12-16T21:06:42+01:00 (7 years ago)

Author:

Don-vip

Message:

update to PMD 6.0.0

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/history/HistoryBrowserModel.java (modified) (1 diff)
• tools/HiDPISupport.java (modified) (1 diff)

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

@@ -152 +152 @@
         // if latest version from history is higher than a non existing primitive version,
         // that means this version has been redacted and the primitive cannot be used.
-        if (history.getLatest().getVersion() > primitive.getVersion())
-            return false;
+        return history.getLatest().getVersion() <= primitive.getVersion();
 
         // latest has a higher version than one of the primitives
         // in the history (probably because the history got out of sync
         // with uploaded data) -> show the primitive as latest
-        return true;
     }
 

trunk/src/org/openstreetmap/josm/tools/HiDPISupport.java

@@ -187 +187 @@
      */
     public static Image processMRImages(List<Image> imgs, Function<List<Image>, Image> processor) {
-        CheckParameterUtil.ensureThat(imgs.size() >= 1, "at least on element expected");
+        CheckParameterUtil.ensureThat(!imgs.isEmpty(), "at least one element expected");
         if (!getBaseMultiResolutionImageClass().isPresent()) {
             return processor.apply(imgs);