Changeset 8855 in josm for trunk/src/org/openstreetmap/josm/data/osm
- Timestamp:
- 2015-10-10T21:01:42+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/osm
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
r8840 r8855 1224 1224 } 1225 1225 1226 void fireHighlightingChanged( OsmPrimitive primitive) {1226 void fireHighlightingChanged() { 1227 1227 highlightUpdateCount++; 1228 1228 } -
trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
r8840 r8855 640 640 updateFlags(FLAG_HIGHLIGHTED, highlighted); 641 641 if (dataSet != null) { 642 dataSet.fireHighlightingChanged( this);642 dataSet.fireHighlightingChanged(); 643 643 } 644 644 } -
trunk/src/org/openstreetmap/josm/data/osm/Storage.java
r8840 r8855 267 267 */ 268 268 private int rehash(int h) { 269 //return 54435761*h;270 269 return 1103515245*h >> 2; 271 270 } … … 361 360 }; 362 361 } 363 /*364 public static <O> Hash<O,O> identityHash() {365 return new Hash<O,O>() {366 public int getHashCode(O t) {367 return System.identityHashCode(t);368 }369 public boolean equals(O t1, O t2) {370 return t1 == t2;371 }372 };373 }374 */375 362 376 363 private final class FMap<K> implements Map<K, T> { -
trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java
r8390 r8855 45 45 } 46 46 47 public static String combineTags(S tring name, Set<String> values) {47 public static String combineTags(Set<String> values) { 48 48 Set<Object> resultSet = new TreeSet<>(); 49 49 for (String value: values) { … … 66 66 return combined.toString(); 67 67 } 68 69 public static String combineTags(String name, String t1, String t2) {70 Set<String> set = new TreeSet<>();71 set.add(t1);72 set.add(t2);73 return TigerUtils.combineTags(name, set);74 }75 68 } -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
r8840 r8855 6 6 import java.awt.Graphics2D; 7 7 import java.awt.Point; 8 import java.awt.Polygon;9 8 import java.awt.Rectangle; 10 9 import java.awt.RenderingHints; … … 455 454 456 455 /** 457 * Checks if a polygon is visible in display.458 *459 * @param polygon The polygon to check.460 * @return <code>true</code> if polygon is visible.461 */462 protected boolean isPolygonVisible(Polygon polygon) {463 Rectangle bounds = polygon.getBounds();464 if (bounds.width == 0 && bounds.height == 0) return false;465 if (bounds.x > nc.getWidth()) return false;466 if (bounds.y > nc.getHeight()) return false;467 if (bounds.x + bounds.width < 0) return false;468 if (bounds.y + bounds.height < 0) return false;469 return true;470 }471 472 /**473 456 * Finally display all segments in currect path. 474 457 */
Note:
See TracChangeset
for help on using the changeset viewer.