Changeset 12272 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-05-29T15:29:39+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14849 - fix crash at startup when two initialization tasks have been translated with the same text

File:

• trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -158 +158 @@
 
         public void finish() {
-            if (!"".equals(duration)) {
-                throw new IllegalStateException("This tasks has already been finished");
+            if (isFinished()) {
+                throw new IllegalStateException("This task has already been finished: " + name);
             }
             duration = tr(" ({0})", Utils.getDurationString(System.currentTimeMillis() - start));
+        }
+
+        /**
+         * Determines if this task has been finished.
+         * @return {@code true} if this task has been finished
+         */
+        public boolean isFinished() {
+            return !duration.isEmpty();
         }
 
@@ -174 +182 @@
             if (o == null || getClass() != o.getClass()) return false;
             MeasurableTask that = (MeasurableTask) o;
-            return Objects.equals(name, that.name);
+            return Objects.equals(name, that.name)
+                && isFinished() == that.isFinished();
         }