Changeset 8385 in josm


Ignore:
Timestamp:
2015-05-17T16:29:34+02:00 (5 years ago)
Author:
Don-vip
Message:

fix regressions of r8384

Location:
trunk/src/org/openstreetmap/josm
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

    r7946 r8385  
    261261    @Override
    262262    protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
    263         if (update) {
     263        if (getCurrentDataSet() == null) {
     264            setEnabled(false);
     265        } else if (update) {
    264266            setEnabled(getSelectedMultipolygonRelation() != null);
    265267        } else {
  • trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java

    r8384 r8385  
    213213        if (bd.size() != data.size() + 1) throw new AssertionError();
    214214        if (bd.get(0) != 0) throw new AssertionError();
    215         if (!Utils.equalsEpsilon(bd.get(bd.size() - 1), Double.POSITIVE_INFINITY)) throw new AssertionError();
     215        if (bd.get(bd.size() - 1) != Double.POSITIVE_INFINITY) throw new AssertionError();
    216216        for (int i=0; i<data.size() - 1; ++i) {
    217217            if (bd.get(i) >= bd.get(i + 1)) throw new AssertionError();
  • trunk/src/org/openstreetmap/josm/tools/Utils.java

    r8384 r8385  
    973973        // Is it less than 1 minute ?
    974974        if (elapsedTime < MILLIS_OF_MINUTE) {
    975             return String.format("%.1d %s", elapsedTime / (double) MILLIS_OF_SECOND, tr("s"));
     975            return String.format("%.1f %s", elapsedTime / (double) MILLIS_OF_SECOND, tr("s"));
    976976        }
    977977        // Is it less than 1 hour ?
Note: See TracChangeset for help on using the changeset viewer.