Changeset 5674 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
- Timestamp:
- 2013-01-26T21:50:46+01:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
r5360 r5674 100 100 private static final int MAX_EVENTS = 1000; 101 101 102 private static class IdHash implements Hash<PrimitiveId,OsmPrimitive> { 103 104 public int getHashCode(PrimitiveId k) { 105 return (int)k.getUniqueId() ^ k.getType().hashCode(); 106 } 107 108 public boolean equals(PrimitiveId key, OsmPrimitive value) { 109 if (key == null || value == null) return false; 110 return key.getUniqueId() == value.getUniqueId() && key.getType() == value.getType(); 111 } 112 } 113 114 private Storage<OsmPrimitive> allPrimitives = new Storage<OsmPrimitive>(new IdHash(), true); 115 private Map<PrimitiveId, OsmPrimitive> primitivesMap = allPrimitives.foreignKey(new IdHash()); 102 private Storage<OsmPrimitive> allPrimitives = new Storage<OsmPrimitive>(new Storage.PrimitiveIdHash(), true); 103 private Map<PrimitiveId, OsmPrimitive> primitivesMap = allPrimitives.foreignKey(new Storage.PrimitiveIdHash()); 116 104 private CopyOnWriteArrayList<DataSetListener> listeners = new CopyOnWriteArrayList<DataSetListener>(); 117 105 … … 126 114 127 115 private int highlightUpdateCount; 128 116 129 117 private boolean uploadDiscouraged = false; 130 118 … … 486 474 return new SubclassFilteredCollection<OsmPrimitive, OsmPrimitive>(getAllSelected(), OsmPrimitive.nonDeletedPredicate); 487 475 } 488 476 489 477 /** 490 478 * Replies an unmodifiable collection of primitives currently selected … … 1177 1165 */ 1178 1166 public void mergeFrom(DataSet from) { 1179 1180 } 1181 1167 mergeFrom(from, null); 1168 } 1169 1182 1170 /** 1183 1171 * Moves all primitives and datasources from DataSet "from" to this DataSet
Note:
See TracChangeset
for help on using the changeset viewer.