Changeset 2985 in josm for trunk/src/org/openstreetmap/josm/gui/history
- Timestamp:
- 2010-02-14T16:47:44+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
r2850 r2985 37 37 import org.openstreetmap.josm.gui.MapView; 38 38 import org.openstreetmap.josm.gui.MapView.LayerChangeListener; 39 import org.openstreetmap.josm.gui.layer.DataChangeListener;40 39 import org.openstreetmap.josm.gui.layer.Layer; 41 40 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 67 66 * @see HistoryBrowser 68 67 */ 69 public class HistoryBrowserModel extends Observable implements LayerChangeListener, DataSetListener , DataChangeListener{68 public class HistoryBrowserModel extends Observable implements LayerChangeListener, DataSetListener { 70 69 //private static Logger logger = Logger.getLogger(HistoryBrowserModel.class.getName()); 71 70 … … 102 101 if (getEditLayer() != null) { 103 102 getEditLayer().data.addDataSetListener(this); 104 getEditLayer().listenerDataChanged.add(this);105 103 } 106 104 MapView.addLayerChangeListener(this); … … 822 820 823 821 public void dataChanged(DataChangedEvent event) { 824 dataChanged(getEditLayer()); 825 } 826 827 public void otherDatasetChange(AbstractDatasetChangedEvent event) { 828 // Irrelevant 829 } 830 831 /* ---------------------------------------------------------------------- */ 832 /* DataChangeListener */ 833 /* ---------------------------------------------------------------------- */ 834 public void dataChanged(OsmDataLayer l) { 835 if (l != getEditLayer()) return; 836 OsmPrimitive primitive = l.data.getPrimitiveById(history.getId(), history.getType()); 822 OsmPrimitive primitive = event.getDataset().getPrimitiveById(history.getId(), history.getType()); 837 823 HistoryOsmPrimitive latest; 838 824 if (canShowAsLatest(primitive)) { … … 843 829 setLatest(latest); 844 830 fireModelChange(); 831 } 832 833 public void otherDatasetChange(AbstractDatasetChangedEvent event) { 834 // Irrelevant 845 835 } 846 836 … … 861 851 OsmDataLayer l = (OsmDataLayer)newLayer; 862 852 l.data.addDataSetListener(this); 863 l.listenerDataChanged.add(this);864 853 OsmPrimitive primitive = l.data.getPrimitiveById(history.getId(), history.getType()); 865 854 HistoryOsmPrimitive latest;
Note:
See TracChangeset
for help on using the changeset viewer.