Changeset 10210 in josm for trunk/src/org/openstreetmap/josm/gui/history
- Timestamp:
- 2016-05-14T15:45:35+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/history
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
r10179 r10210 7 7 import java.awt.GridBagLayout; 8 8 import java.awt.Insets; 9 import java.util.Observable;10 import java.util.Observer;11 9 12 10 import javax.swing.BorderFactory; … … 14 12 import javax.swing.JPanel; 15 13 import javax.swing.UIManager; 14 import javax.swing.event.ChangeEvent; 15 import javax.swing.event.ChangeListener; 16 16 17 17 import org.openstreetmap.gui.jmapviewer.JMapViewer; … … 127 127 setModel(model); 128 128 build(); 129 registerAs Observer(model);130 } 131 132 protected void unregisterAs Observer(HistoryBrowserModel model) {129 registerAsChangeListener(model); 130 } 131 132 protected void unregisterAsChangeListener(HistoryBrowserModel model) { 133 133 if (currentInfoPanel != null) { 134 model. deleteObserver(currentInfoPanel);134 model.removeChangeListener(currentInfoPanel); 135 135 } 136 136 if (referenceInfoPanel != null) { 137 model. deleteObserver(referenceInfoPanel);137 model.removeChangeListener(referenceInfoPanel); 138 138 } 139 139 if (currentLatLonViewer != null) { 140 model. deleteObserver(currentLatLonViewer);140 model.removeChangeListener(currentLatLonViewer); 141 141 } 142 142 if (referenceLatLonViewer != null) { 143 model. deleteObserver(referenceLatLonViewer);143 model.removeChangeListener(referenceLatLonViewer); 144 144 } 145 145 if (distanceViewer != null) { 146 model. deleteObserver(distanceViewer);146 model.removeChangeListener(distanceViewer); 147 147 } 148 148 if (mapViewer != null) { 149 model. deleteObserver(mapViewer);150 } 151 } 152 153 protected void registerAs Observer(HistoryBrowserModel model) {149 model.removeChangeListener(mapViewer); 150 } 151 } 152 153 protected void registerAsChangeListener(HistoryBrowserModel model) { 154 154 if (currentInfoPanel != null) { 155 model.add Observer(currentInfoPanel);155 model.addChangeListener(currentInfoPanel); 156 156 } 157 157 if (referenceInfoPanel != null) { 158 model.add Observer(referenceInfoPanel);158 model.addChangeListener(referenceInfoPanel); 159 159 } 160 160 if (currentLatLonViewer != null) { 161 model.add Observer(currentLatLonViewer);161 model.addChangeListener(currentLatLonViewer); 162 162 } 163 163 if (referenceLatLonViewer != null) { 164 model.add Observer(referenceLatLonViewer);164 model.addChangeListener(referenceLatLonViewer); 165 165 } 166 166 if (distanceViewer != null) { 167 model.add Observer(distanceViewer);167 model.addChangeListener(distanceViewer); 168 168 } 169 169 if (mapViewer != null) { 170 model.add Observer(mapViewer);170 model.addChangeListener(mapViewer); 171 171 } 172 172 } … … 179 179 public void setModel(HistoryBrowserModel model) { 180 180 if (this.model != null) { 181 unregisterAs Observer(model);181 unregisterAsChangeListener(model); 182 182 } 183 183 this.model = model; 184 184 if (this.model != null) { 185 registerAs Observer(model);185 registerAsChangeListener(model); 186 186 } 187 187 } … … 241 241 * A UI widgets which displays the Lan/Lon-coordinates of a {@link HistoryNode}. 242 242 */ 243 private static class LatLonViewer extends JPanel implements Observer {243 private static class LatLonViewer extends JPanel implements ChangeListener { 244 244 245 245 private final JosmTextArea lblLat = newTextArea(); … … 324 324 325 325 @Override 326 public void update(Observable o, Object arg) {326 public void stateChanged(ChangeEvent e) { 327 327 refresh(); 328 328 } 329 329 } 330 330 331 private static class MapViewer extends JMapViewer implements Observer {331 private static class MapViewer extends JMapViewer implements ChangeListener { 332 332 333 333 private final Updater updater; … … 339 339 340 340 @Override 341 public void update(Observable o, Object arg) {341 public void stateChanged(ChangeEvent e) { 342 342 final Pair<LatLon, LatLon> coordinates = updater.getCoordinates(); 343 343 if (coordinates == null) { … … 362 362 } 363 363 364 private static class DistanceViewer extends JPanel implements Observer {364 private static class DistanceViewer extends JPanel implements ChangeListener { 365 365 366 366 private final JosmTextArea lblDistance = newTextArea(); … … 417 417 418 418 @Override 419 public void update(Observable o, Object arg) {419 public void stateChanged(ChangeEvent e) { 420 420 refresh(); 421 421 } -
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
r10194 r10210 9 9 import java.util.HashSet; 10 10 import java.util.List; 11 import java.util.Observable;12 11 import java.util.Set; 13 12 … … 46 45 import org.openstreetmap.josm.gui.layer.Layer; 47 46 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 47 import org.openstreetmap.josm.gui.util.ChangeNotifier; 48 48 import org.openstreetmap.josm.tools.CheckParameterUtil; 49 49 import org.openstreetmap.josm.tools.date.DateUtils; … … 74 74 * @see HistoryBrowser 75 75 */ 76 public class HistoryBrowserModel extends Observableimplements LayerChangeListener, DataSetListener {76 public class HistoryBrowserModel extends ChangeNotifier implements LayerChangeListener, DataSetListener { 77 77 /** the history of an OsmPrimitive */ 78 78 private History history; … … 198 198 initNodeListTableModels(); 199 199 initMemberListTableModels(); 200 setChanged(); 201 notifyObservers(); 200 fireStateChanged(); 202 201 versionTableModel.fireTableDataChanged(); 203 202 } … … 317 316 initNodeListTableModels(); 318 317 initMemberListTableModels(); 319 setChanged(); 320 notifyObservers(); 318 fireStateChanged(); 321 319 } 322 320 … … 348 346 initNodeListTableModels(); 349 347 initMemberListTableModels(); 350 setChanged(); 351 notifyObservers(); 348 fireStateChanged(); 352 349 } 353 350 -
trunk/src/org/openstreetmap/josm/gui/history/HistoryViewerPanel.java
r8510 r10210 41 41 public final void setModel(HistoryBrowserModel model) { 42 42 if (this.model != null) { 43 unregisterAs Observer(model);43 unregisterAsChangeListener(model); 44 44 } 45 45 this.model = model; 46 46 if (this.model != null) { 47 registerAs Observer(model);47 registerAsChangeListener(model); 48 48 } 49 49 } 50 50 51 protected final void unregisterAs Observer(HistoryBrowserModel model) {51 protected final void unregisterAsChangeListener(HistoryBrowserModel model) { 52 52 if (currentInfoPanel != null) { 53 model. deleteObserver(currentInfoPanel);53 model.removeChangeListener(currentInfoPanel); 54 54 } 55 55 if (referenceInfoPanel != null) { 56 model. deleteObserver(referenceInfoPanel);56 model.removeChangeListener(referenceInfoPanel); 57 57 } 58 58 } 59 59 60 protected final void registerAs Observer(HistoryBrowserModel model) {60 protected final void registerAsChangeListener(HistoryBrowserModel model) { 61 61 if (currentInfoPanel != null) { 62 model.add Observer(currentInfoPanel);62 model.addChangeListener(currentInfoPanel); 63 63 } 64 64 if (referenceInfoPanel != null) { 65 model.add Observer(referenceInfoPanel);65 model.addChangeListener(referenceInfoPanel); 66 66 } 67 67 } -
trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
r9816 r10210 173 173 } 174 174 175 protected void unregisterAs Observer(HistoryBrowserModel model) {175 protected void unregisterAsChangeListener(HistoryBrowserModel model) { 176 176 if (currentInfoPanel != null) { 177 model. deleteObserver(currentInfoPanel);177 model.removeChangeListener(currentInfoPanel); 178 178 } 179 179 if (referenceInfoPanel != null) { 180 model. deleteObserver(referenceInfoPanel);181 } 182 } 183 184 protected void registerAs Observer(HistoryBrowserModel model) {180 model.removeChangeListener(referenceInfoPanel); 181 } 182 } 183 184 protected void registerAsChangeListener(HistoryBrowserModel model) { 185 185 if (currentInfoPanel != null) { 186 model.add Observer(currentInfoPanel);186 model.addChangeListener(currentInfoPanel); 187 187 } 188 188 if (referenceInfoPanel != null) { 189 model.add Observer(referenceInfoPanel);189 model.addChangeListener(referenceInfoPanel); 190 190 } 191 191 } … … 197 197 public void setModel(HistoryBrowserModel model) { 198 198 if (this.model != null) { 199 unregisterAs Observer(model);199 unregisterAsChangeListener(model); 200 200 } 201 201 this.model = model; 202 202 if (this.model != null) { 203 registerAs Observer(model);203 registerAsChangeListener(model); 204 204 } 205 205 } -
trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
r9680 r10210 15 15 import java.util.Collections; 16 16 import java.util.Date; 17 import java.util.Observable;18 import java.util.Observer;19 17 20 18 import javax.swing.AbstractAction; … … 24 22 import javax.swing.JPanel; 25 23 import javax.swing.JTextArea; 24 import javax.swing.event.ChangeEvent; 25 import javax.swing.event.ChangeListener; 26 26 27 27 import org.openstreetmap.josm.Main; … … 48 48 * @since 1709 49 49 */ 50 public class VersionInfoPanel extends JPanel implements Observer {50 public class VersionInfoPanel extends JPanel implements ChangeListener { 51 51 private final PointInTimeType pointInTimeType; 52 52 private final transient HistoryBrowserModel model; … … 189 189 this.model = model; 190 190 this.pointInTimeType = pointInTimeType; 191 model.add Observer(this);191 model.addChangeListener(this); 192 192 build(); 193 193 } … … 198 198 199 199 @Override 200 public void update(Observable o, Object arg) {200 public void stateChanged(ChangeEvent e) { 201 201 HistoryOsmPrimitive primitive = getPrimitive(); 202 202 if (primitive != null) { -
trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java
r10021 r10210 14 14 import java.awt.event.KeyEvent; 15 15 import java.awt.event.MouseEvent; 16 import java.util.Observable;17 import java.util.Observer;18 16 19 17 import javax.swing.DefaultCellEditor; … … 25 23 import javax.swing.SwingConstants; 26 24 import javax.swing.UIManager; 25 import javax.swing.event.ChangeEvent; 26 import javax.swing.event.ChangeListener; 27 27 import javax.swing.event.TableModelEvent; 28 28 import javax.swing.event.TableModelListener; … … 45 45 * @since 1709 46 46 */ 47 public class VersionTable extends JTable implements Observer {47 public class VersionTable extends JTable implements ChangeListener { 48 48 private VersionTablePopupMenu popupMenu; 49 49 private final transient HistoryBrowserModel model; … … 55 55 public VersionTable(HistoryBrowserModel model) { 56 56 super(model.getVersionTableModel(), new VersionTableColumnModel()); 57 model.add Observer(this);57 model.addChangeListener(this); 58 58 build(); 59 59 this.model = model; … … 117 117 118 118 @Override 119 public void update(Observable o, Object arg) {119 public void stateChanged(ChangeEvent e) { 120 120 repaint(); 121 121 }
Note:
See TracChangeset
for help on using the changeset viewer.