Changeset 8385 in josm for trunk

Timestamp:

2015-05-17T16:29:34+02:00 (10 years ago)

Author:

Don-vip

Message:

fix regressions of r8384

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CreateMultipolygonAction.java (modified) (1 diff)
• gui/mappaint/StyleCache.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -261 +261 @@
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-        if (update) {
+        if (getCurrentDataSet() == null) {
+            setEnabled(false);
+        } else if (update) {
             setEnabled(getSelectedMultipolygonRelation() != null);
         } else {

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java

@@ -213 +213 @@
         if (bd.size() != data.size() + 1) throw new AssertionError();
         if (bd.get(0) != 0) throw new AssertionError();
-        if (!Utils.equalsEpsilon(bd.get(bd.size() - 1), Double.POSITIVE_INFINITY)) throw new AssertionError();
+        if (bd.get(bd.size() - 1) != Double.POSITIVE_INFINITY) throw new AssertionError();
         for (int i=0; i<data.size() - 1; ++i) {
             if (bd.get(i) >= bd.get(i + 1)) throw new AssertionError();

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

@@ -973 +973 @@
         // Is it less than 1 minute ?
         if (elapsedTime < MILLIS_OF_MINUTE) {
-            return String.format("%.1d %s", elapsedTime / (double) MILLIS_OF_SECOND, tr("s"));
+            return String.format("%.1f %s", elapsedTime / (double) MILLIS_OF_SECOND, tr("s"));
         }
         // Is it less than 1 hour ?