Changeset 9929 in josm
- Timestamp:
- 2016-03-05T15:29:39+01:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java
r8308 r9929 5 5 import java.util.Comparator; 6 6 import java.util.HashMap; 7 import java.util.Map;8 7 9 8 import org.openstreetmap.josm.gui.DefaultNameFormatter; … … 20 19 private static final long serialVersionUID = 1L; 21 20 22 private final Map<OsmPrimitive, String> cache = new HashMap<>();21 private final HashMap<OsmPrimitive, String> cache = new HashMap<>(); 23 22 private final boolean relationsFirst; 24 23 private final boolean quick; -
trunk/src/org/openstreetmap/josm/data/validation/Severity.java
r9079 r9929 41 41 42 42 public static void getColors() { 43 for (Severity c:values()) { 44 c.getColor(); 43 for (Severity c : values()) { 44 if (Main.isDebugEnabled()) { 45 Main.debug(c.toString()); 46 } 45 47 } 46 48 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
r9859 r9929 1137 1137 }); 1138 1138 final Collection<Float> nonNullList = Utils.filter(floats, Predicates.not(Predicates.isNull())); 1139 return nonNullList.isEmpty() ? Float.NaN : computeMax ? Collections.max(nonNullList) : Collections.min(nonNullList);1139 return nonNullList.isEmpty() ? (Float) Float.NaN : computeMax ? Collections.max(nonNullList) : Collections.min(nonNullList); 1140 1140 } 1141 1141
Note:
See TracChangeset
for help on using the changeset viewer.