Changeset 11452 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

Timestamp:

2017-01-12T01:24:40+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - fb-contrib:SEO_SUBOPTIMAL_EXPRESSION_ORDER - Performance - Method orders expressions in a conditional in a sub optimal way

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -643 +643 @@
         Collection<String> history = Main.pref.getCollection(historyKey, def);
         int age = (int) (System.currentTimeMillis() / 1000 - Main.pref.getInteger(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0));
-        if (age < Main.pref.getLong(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toMillis(4))
-                && history != null && !history.isEmpty()) {
+        if (history != null && age < Main.pref.getLong(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toMillis(4))
+                && !history.isEmpty()) {
             return history.iterator().next();
         } else {