Changeset 2622 in josm for trunk/src/org/openstreetmap/josm/gui/history
- Timestamp:
- 2009-12-12T20:21:36+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
r2621 r2622 5 5 6 6 import java.util.ArrayList; 7 import java.util.Collection;8 7 import java.util.Collections; 9 8 import java.util.HashSet; 10 9 import java.util.Observable; 11 import java.util.logging.Logger;12 10 13 11 import javax.swing.table.DefaultTableModel; 14 12 15 13 import org.openstreetmap.josm.Main; 16 import org.openstreetmap.josm.data.osm.DataSetListener;17 14 import org.openstreetmap.josm.data.osm.Node; 18 15 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 23 20 import org.openstreetmap.josm.data.osm.SimplePrimitiveId; 24 21 import org.openstreetmap.josm.data.osm.Way; 22 import org.openstreetmap.josm.data.osm.event.DataChangedEvent; 23 import org.openstreetmap.josm.data.osm.event.DataSetListener; 24 import org.openstreetmap.josm.data.osm.event.NodeMovedEvent; 25 import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent; 26 import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent; 27 import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent; 28 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent; 29 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent; 25 30 import org.openstreetmap.josm.data.osm.history.History; 26 31 import org.openstreetmap.josm.data.osm.history.HistoryNode; … … 30 35 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor; 31 36 import org.openstreetmap.josm.gui.MapView; 37 import org.openstreetmap.josm.gui.MapView.LayerChangeListener; 32 38 import org.openstreetmap.josm.gui.layer.DataChangeListener; 33 39 import org.openstreetmap.josm.gui.layer.Layer; … … 59 65 * @see HistoryBrowser 60 66 */ 61 public class HistoryBrowserModel extends Observable implements MapView.LayerChangeListener, DataSetListener, DataChangeListener { 62 63 private static Logger logger = Logger.getLogger(HistoryBrowserModel.class.getName()); 67 public class HistoryBrowserModel extends Observable implements LayerChangeListener, DataSetListener, DataChangeListener { 68 //private static Logger logger = Logger.getLogger(HistoryBrowserModel.class.getName()); 64 69 65 70 /** the history of an OsmPrimitive */ … … 777 782 /* DataSetListener */ 778 783 /* ---------------------------------------------------------------------- */ 779 public void nodeMoved(Node node) { 784 public void nodeMoved(NodeMovedEvent event) { 785 Node node = event.getNode(); 780 786 if (!node.isNew() && node.getId() == history.getId()) { 781 787 setLatest(new HistoryPrimitiveBuilder().build(node)); … … 783 789 } 784 790 785 public void primtivesAdded(Collection<? extends OsmPrimitive> added) { 786 if (added == null || added.isEmpty()) return; 787 for (OsmPrimitive p: added) { 791 public void primtivesAdded(PrimitivesAddedEvent event) { 792 for (OsmPrimitive p: event.getPrimitives()) { 788 793 if (canShowAsLatest(p)) { 789 794 setLatest(new HistoryPrimitiveBuilder().build(p)); … … 792 797 } 793 798 794 public void primtivesRemoved(Collection<? extends OsmPrimitive> removed) { 795 if (removed == null || removed.isEmpty()) return; 796 for (OsmPrimitive p: removed) { 799 public void primtivesRemoved(PrimitivesRemovedEvent event) { 800 for (OsmPrimitive p: event.getPrimitives()) { 797 801 if (!p.isNew() && p.getId() == history.getId()) { 798 802 setLatest(null); … … 801 805 } 802 806 803 public void relationMembersChanged(Relation r) { 807 public void relationMembersChanged(RelationMembersChangedEvent event) { 808 Relation r = event.getRelation(); 804 809 if (!r.isNew() && r.getId() == history.getId()) { 805 810 setLatest(new HistoryPrimitiveBuilder().build(r)); … … 807 812 } 808 813 809 public void tagsChanged(OsmPrimitive prim) { 814 public void tagsChanged(TagsChangedEvent event) { 815 OsmPrimitive prim = event.getPrimitive(); 810 816 if (!prim.isNew() && prim.getId() == history.getId()) { 811 817 setLatest(new HistoryPrimitiveBuilder().build(prim)); … … 813 819 } 814 820 815 public void wayNodesChanged(Way way) { 821 public void wayNodesChanged(WayNodesChangedEvent event) { 822 Way way = event.getChangedWay(); 816 823 if (!way.isNew() && way.getId() == history.getId()) { 817 824 setLatest(new HistoryPrimitiveBuilder().build(way)); … … 819 826 } 820 827 821 public void dataChanged( ) {828 public void dataChanged(DataChangedEvent event) { 822 829 dataChanged(getEditLayer()); 823 830 } 824 831 825 832 /* ---------------------------------------------------------------------- */ 826 /* DataChangeListener */833 /* DataChangeListener */ 827 834 /* ---------------------------------------------------------------------- */ 828 835 public void dataChanged(OsmDataLayer l) {
Note:
See TracChangeset
for help on using the changeset viewer.