Changeset 6084 in josm for trunk/src/org/openstreetmap/josm/data/osm
- Timestamp:
- 2013-07-26T13:38:17+02:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/osm
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
r5266 r6084 160 160 } 161 161 162 @Override 162 163 public ChangesetModificationType getModificationType() { 163 164 return modificationType; 164 165 } 165 166 167 @Override 166 168 public HistoryOsmPrimitive getPrimitive() { 167 169 return primitive; … … 176 178 } 177 179 180 @Override 178 181 public boolean hasNext() { 179 182 return typeIterator.hasNext(); 180 183 } 181 184 185 @Override 182 186 public ChangesetDataSetEntry next() { 183 187 Entry<PrimitiveId, ChangesetModificationType> next = typeIterator.next(); … … 187 191 } 188 192 193 @Override 189 194 public void remove() { 190 195 throw new UnsupportedOperationException(); -
trunk/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java
r3083 r6084 21 21 } 22 22 23 @Override 23 24 public Collection<Changeset> getAddedChangesets() { 24 25 return Collections.unmodifiableCollection(added); 25 26 } 27 @Override 26 28 public Collection<Changeset> getRemovedChangesets() { 27 29 return Collections.unmodifiableCollection(removed); 28 30 } 31 @Override 29 32 public ChangesetCache getSource() { 30 33 return source; 31 34 } 35 @Override 32 36 public Collection<Changeset> getUpdatedChangesets() { 33 37 return Collections.unmodifiableCollection(modified); -
trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java
r4113 r6084 55 55 } 56 56 57 @Override 57 58 public int compare(OsmPrimitive a, OsmPrimitive b) { 58 59 if (a.getType().equals(b.getType())) -
trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java
r6009 r6084 49 49 boolean firstIteration; 50 50 51 @Override 51 52 public void visit(Node n) { 52 53 if (!visitedNodeIds.add(n.getUniqueId())) … … 54 55 (firstIteration ? directlyAdded : referenced).add(n.save()); 55 56 } 57 @Override 56 58 public void visit(Way w) { 57 59 if (!visitedWayIds.add(w.getUniqueId())) … … 63 65 } 64 66 } 67 @Override 65 68 public void visit(Relation r) { 66 69 if (!visitedRelationIds.add(r.getUniqueId())) -
trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
r4869 r6084 508 508 clear(); 509 509 } 510 @Override 510 511 public void clear() { 511 512 root = new QBLevel(); … … 517 518 }*/ 518 519 } 520 @Override 519 521 public boolean add(T n) { 520 522 root.add(n); … … 523 525 } 524 526 527 @Override 525 528 public boolean retainAll(Collection<?> objects) 526 529 { … … 534 537 return true; 535 538 } 539 @Override 536 540 public boolean removeAll(Collection<?> objects) 537 541 { … … 542 546 return changed; 543 547 } 548 @Override 544 549 public boolean addAll(Collection<? extends T> objects) 545 550 { … … 550 555 return changed; 551 556 } 557 @Override 552 558 public boolean containsAll(Collection<?> objects) 553 559 { … … 558 564 return true; 559 565 } 566 @Override 560 567 public boolean remove(Object o) { 561 568 @SuppressWarnings("unchecked") T t = (T) o; … … 568 575 return false; 569 576 } 577 @Override 570 578 public boolean contains(Object o) { 571 579 @SuppressWarnings("unchecked") T t = (T) o; … … 585 593 return a; 586 594 } 595 @Override 587 596 public Object[] toArray() 588 597 { 589 598 return this.toArrayList().toArray(); 590 599 } 600 @Override 591 601 public <A> A[] toArray(A[] template) 592 602 { … … 626 636 iterated_over = 0; 627 637 } 638 @Override 628 639 public boolean hasNext() 629 640 { … … 660 671 return current_node.content.get(content_index); 661 672 } 673 @Override 662 674 public T next() 663 675 { … … 675 687 return ret; 676 688 } 689 @Override 677 690 public void remove() 678 691 { … … 686 699 } 687 700 } 701 @Override 688 702 public Iterator<T> iterator() 689 703 { 690 704 return new QuadBucketIterator(this); 691 705 } 706 @Override 692 707 public int size() { 693 708 return size; 694 709 } 695 710 711 @Override 696 712 public boolean isEmpty() 697 713 { -
trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java
r5881 r6084 171 171 * PrimitiveId implementation. Returns the same value as getMember().getType() 172 172 */ 173 @Override 173 174 public OsmPrimitiveType getType() { 174 175 return member.getType(); … … 178 179 * PrimitiveId implementation. Returns the same value as getMemberType().getUniqueId() 179 180 */ 181 @Override 180 182 public long getUniqueId() { 181 183 return member.getUniqueId(); 182 184 } 183 185 186 @Override 184 187 public boolean isNew() { 185 188 return member.isNew(); -
trunk/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java
r5170 r6084 15 15 } 16 16 17 @Override 17 18 public OsmPrimitiveType getType() { 18 19 return type; 19 20 } 20 21 22 @Override 21 23 public long getUniqueId() { 22 24 return id; 23 25 } 24 26 27 @Override 25 28 public boolean isNew() { 26 29 return id <= 0; -
trunk/src/org/openstreetmap/josm/data/osm/Storage.java
r5674 r6084 90 90 public static class PrimitiveIdHash implements Hash<PrimitiveId, PrimitiveId> { 91 91 92 @Override 92 93 public int getHashCode(PrimitiveId k) { 93 94 return (int)k.getUniqueId() ^ k.getType().hashCode(); 94 95 } 95 96 97 @Override 96 98 public boolean equals(PrimitiveId key, PrimitiveId value) { 97 99 if (key == null || value == null) return false; … … 361 363 public static <O> Hash<O,O> defaultHash() { 362 364 return new Hash<O,O>() { 365 @Override 363 366 public int getHashCode(O t) { 364 367 return t.hashCode(); 365 368 } 369 @Override 366 370 public boolean equals(O t1, O t2) { 367 371 return t1.equals(t2); … … 389 393 } 390 394 395 @Override 391 396 public int size() { 392 397 return Storage.this.size(); 393 398 } 394 399 400 @Override 395 401 public boolean isEmpty() { 396 402 return Storage.this.isEmpty(); 397 403 } 398 404 405 @Override 399 406 public boolean containsKey(Object o) { 400 407 @SuppressWarnings("unchecked") K key = (K) o; … … 403 410 } 404 411 412 @Override 405 413 public boolean containsValue(Object value) { 406 414 return Storage.this.contains(value); 407 415 } 408 416 417 @Override 409 418 public T get(Object o) { 410 419 @SuppressWarnings("unchecked") K key = (K) o; … … 413 422 } 414 423 424 @Override 415 425 public T put(K key, T value) { 416 426 if (!fHash.equals(key, value)) throw new IllegalArgumentException("inconsistent key"); … … 418 428 } 419 429 430 @Override 420 431 public T remove(Object o) { 421 432 modCount++; … … 426 437 } 427 438 439 @Override 428 440 public void putAll(Map<? extends K, ? extends T> m) { 429 441 if (m instanceof Storage.FMap) { … … 436 448 } 437 449 450 @Override 438 451 public void clear() { 439 452 Storage.this.clear(); 440 453 } 441 454 455 @Override 442 456 public Set<K> keySet() { 443 457 throw new UnsupportedOperationException(); 444 458 } 445 459 460 @Override 446 461 public Collection<T> values() { 447 462 return Storage.this; 448 463 } 449 464 465 @Override 450 466 public Set<Entry<K, T>> entrySet() { 451 467 throw new UnsupportedOperationException(); … … 461 477 } 462 478 479 @Override 463 480 public boolean hasNext() { 464 481 align(); … … 466 483 } 467 484 485 @Override 468 486 public T next() { 469 487 if (!hasNext()) throw new NoSuchElementException(); … … 471 489 } 472 490 491 @Override 473 492 public void remove() { 474 493 throw new UnsupportedOperationException(); … … 492 511 } 493 512 513 @Override 494 514 public boolean hasNext() { 495 515 align(); … … 497 517 } 498 518 519 @Override 499 520 public T next() { 500 521 if (!hasNext()) throw new NoSuchElementException(); … … 503 524 } 504 525 526 @Override 505 527 public void remove() { 506 528 if (removeSlot == -1) throw new IllegalStateException(); -
trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java
r5909 r6084 485 485 * @return the iterator 486 486 */ 487 @Override 487 488 public Iterator<Tag> iterator() { 488 489 return tags.iterator(); -
trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java
r5170 r6084 20 20 } 21 21 22 @Override 22 23 public void dataChanged(DataChangedEvent event) { 23 24 listener.processDatasetEvent(event); 24 25 } 25 26 27 @Override 26 28 public void nodeMoved(NodeMovedEvent event) { 27 29 listener.processDatasetEvent(event); 28 30 } 29 31 32 @Override 30 33 public void primitivesAdded(PrimitivesAddedEvent event) { 31 34 listener.processDatasetEvent(event); 32 35 } 33 36 37 @Override 34 38 public void primitivesRemoved(PrimitivesRemovedEvent event) { 35 39 listener.processDatasetEvent(event); 36 40 } 37 41 42 @Override 38 43 public void relationMembersChanged(RelationMembersChangedEvent event) { 39 44 listener.processDatasetEvent(event); 40 45 } 41 46 47 @Override 42 48 public void tagsChanged(TagsChangedEvent event) { 43 49 listener.processDatasetEvent(event); 44 50 } 45 51 52 @Override 46 53 public void wayNodesChanged(WayNodesChangedEvent event) { 47 54 listener.processDatasetEvent(event); 48 55 } 49 56 57 @Override 50 58 public void otherDatasetChange(AbstractDatasetChangedEvent event) { 51 59 listener.processDatasetEvent(event); -
trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
r5909 r6084 98 98 } 99 99 100 @Override 100 101 public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { 101 102 if (oldLayer != null) { … … 127 128 } 128 129 130 @Override 129 131 public void processDatasetEvent(AbstractDatasetChangedEvent event) { 130 132 fireEvents(normalListeners, event); … … 134 136 135 137 private final Runnable edtRunnable = new Runnable() { 138 @Override 136 139 public void run() { 137 140 while (!eventsInEDT.isEmpty()) { -
trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
r5170 r6084 68 68 } 69 69 70 @Override 70 71 public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) { 71 72 fireEvents(normalListeners, newSelection); … … 81 82 82 83 private final Runnable edtRunnable = new Runnable() { 84 @Override 83 85 public void run() { 84 86 if (selection != null) { -
trunk/src/org/openstreetmap/josm/data/osm/history/History.java
r5339 r6084 67 67 copy, 68 68 new Comparator<HistoryOsmPrimitive>() { 69 @Override 69 70 public int compare(HistoryOsmPrimitive o1, HistoryOsmPrimitive o2) { 70 71 return o1.compareTo(o2); … … 80 81 copy, 81 82 new Comparator<HistoryOsmPrimitive>() { 83 @Override 82 84 public int compare(HistoryOsmPrimitive o1, HistoryOsmPrimitive o2) { 83 85 return o2.compareTo(o1); … … 92 94 this, 93 95 new FilterPredicate() { 96 @Override 94 97 public boolean matches(HistoryOsmPrimitive primitive) { 95 98 return primitive.getTimestamp().compareTo(fromDate) >= 0; … … 103 106 this, 104 107 new FilterPredicate() { 108 @Override 105 109 public boolean matches(HistoryOsmPrimitive primitive) { 106 110 return primitive.getTimestamp().compareTo(untilDate) <= 0; … … 118 122 this, 119 123 new FilterPredicate() { 124 @Override 120 125 public boolean matches(HistoryOsmPrimitive primitive) { 121 126 return primitive.getVersion() >= fromVersion; … … 129 134 this, 130 135 new FilterPredicate() { 136 @Override 131 137 public boolean matches(HistoryOsmPrimitive primitive) { 132 138 return primitive.getVersion() <= untilVersion; … … 144 150 this, 145 151 new FilterPredicate() { 152 @Override 146 153 public boolean matches(HistoryOsmPrimitive primitive) { 147 154 return primitive.getUser() != null && primitive.getUser().getId() == uid; -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
r5266 r6084 164 164 /* interface LayerChangeListener */ 165 165 /* ------------------------------------------------------------------------------ */ 166 @Override 166 167 public void activeLayerChange(Layer oldLayer, Layer newLayer) {/* irrelevant in this context */} 168 @Override 167 169 public void layerAdded(Layer newLayer) {/* irrelevant in this context */} 170 @Override 168 171 public void layerRemoved(Layer oldLayer) { 169 172 if (Main.map == null || Main.map.mapView == null) return; -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
r6069 r6084 149 149 public abstract OsmPrimitiveType getType(); 150 150 151 @Override 151 152 public int compareTo(HistoryOsmPrimitive o) { 152 153 if (this.id != o.id) -
trunk/src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java
r3083 r6084 13 13 public abstract class AbstractVisitor implements Visitor { 14 14 15 @Override 15 16 public void visit(Changeset cs) { 16 17 // do nothing -
trunk/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java
r6069 r6084 26 26 * Nodes have only itself as nodes. 27 27 */ 28 @Override 28 29 public void visit(Node n) { 29 30 nodes.add(n); … … 33 34 * Ways have their way nodes. 34 35 */ 36 @Override 35 37 public void visit(Way w) { 36 38 if (w.isIncomplete()) return; … … 44 46 * if so, use AutomatchVisitor! 45 47 */ 48 @Override 46 49 public void visit(Relation e) { 47 50 for (RelationMember m : e.getMembers()) -
trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java
r6010 r6084 25 25 private ProjectionBounds bounds = null; 26 26 27 @Override 27 28 public void visit(Node n) { 28 29 visit(n.getEastNorth()); 29 30 } 30 31 32 @Override 31 33 public void visit(Way w) { 32 34 if (w.isIncomplete()) return; … … 36 38 } 37 39 40 @Override 38 41 public void visit(Relation e) { 39 42 // only use direct members -
trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
r6010 r6084 126 126 } 127 127 128 @Override 128 129 public void visit(Node n) { 129 130 rememberNode(n); 130 131 } 131 132 133 @Override 132 134 public void visit(Way w) { 133 135 // remember all nodes this way refers to ... … … 140 142 } 141 143 144 @Override 142 145 public void visit(Relation r) { 143 146 // first, remember all primitives members refer to (only if necessary, see -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java
r5426 r6084 103 103 } 104 104 105 @Override 105 106 public void preferenceChanged(PreferenceChangeEvent e) { 106 107 load(); -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java
r5464 r6084 39 39 private static final MapPaintSylesUpdateListener styleOverrideListener = new MapPaintSylesUpdateListener() { 40 40 41 @Override 41 42 public void mapPaintStylesUpdated() { 42 43 backgroundColorCache = null; 43 44 } 44 45 46 @Override 45 47 public void mapPaintStyleEntryUpdated(int idx) { 46 48 mapPaintStylesUpdated(); -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
r6069 r6084 154 154 * @param bounds display boundaries 155 155 */ 156 @Override 156 157 public void render(DataSet data, boolean virtual, Bounds bounds) { 157 158 BBox bbox = new BBox(bounds);
Note:
See TracChangeset
for help on using the changeset viewer.