Changeset 10655 in josm
- Timestamp:
- 2016-07-27T00:07:20+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/Main.java
r10605 r10655 1408 1408 1409 1409 private static void fireProjectionChanged(Projection oldValue, Projection newValue, Bounds oldBounds) { 1410 if ( newValue == null ^ oldValue == null1410 if ((newValue == null ^ oldValue == null) 1411 1411 || (newValue != null && oldValue != null && !Objects.equals(newValue.toCode(), oldValue.toCode()))) { 1412 1412 if (Main.map != null) { -
trunk/src/org/openstreetmap/josm/data/osm/Storage.java
r9980 r10655 275 275 */ 276 276 private static int rehash(int h) { 277 return 1103515245*h>> 2;277 return (1103515245*h) >> 2; 278 278 } 279 279 -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java
r9099 r10655 151 151 */ 152 152 public Color getSelectedColor(int alpha) { 153 return new Color( selectedColor.getRGB() & 0x00ffffff| (alpha << 24), true);153 return new Color((selectedColor.getRGB() & 0x00ffffff) | (alpha << 24), true); 154 154 } 155 155 … … 176 176 */ 177 177 public Color getRelationSelectedColor(int alpha) { 178 return new Color( relationSelectedColor.getRGB() & 0x00ffffff| (alpha << 24), true);178 return new Color((relationSelectedColor.getRGB() & 0x00ffffff) | (alpha << 24), true); 179 179 } 180 180
Note:
See TracChangeset
for help on using the changeset viewer.