Changeset 10210 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

Timestamp:

2016-05-14T15:45:35+02:00 (10 years ago)

Author:

Don-vip

Message:

see #11924 - Java 9 - replace calls to deprecated classes java.util.Observable / java.util.Observer by a new class ChangeNotifier + swing's ChangeListener

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (modified) (18 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -10 +10 @@
 import java.text.DecimalFormat;
 import java.util.List;
-import java.util.Observable;
-import java.util.Observer;
 
 import javax.swing.AbstractAction;
@@ -19 +17 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -34 +34 @@
  * @since 1654
  */
-public class PropertiesMerger extends JPanel implements Observer, IConflictResolver {
+public class PropertiesMerger extends JPanel implements ChangeListener, IConflictResolver {
     private static final DecimalFormat COORD_FORMATTER = new DecimalFormat("###0.0000000");
 
@@ -57 +57 @@
     public PropertiesMerger() {
         model = new PropertiesMergeModel();
-        model.addObserver(this);
+        model.addChangeListener(this);
         build();
     }
@@ -137 +137 @@
         gc.weighty = 0.0;
         KeepMyCoordinatesAction actKeepMyCoordinates = new KeepMyCoordinatesAction();
-        model.addObserver(actKeepMyCoordinates);
+        model.addChangeListener(actKeepMyCoordinates);
         JButton btnKeepMyCoordinates = new JButton(actKeepMyCoordinates);
         btnKeepMyCoordinates.setName("button.keepmycoordinates");
@@ -155 +155 @@
         gc.weighty = 0.0;
         KeepTheirCoordinatesAction actKeepTheirCoordinates = new KeepTheirCoordinatesAction();
-        model.addObserver(actKeepTheirCoordinates);
+        model.addChangeListener(actKeepTheirCoordinates);
         JButton btnKeepTheirCoordinates = new JButton(actKeepTheirCoordinates);
         add(btnKeepTheirCoordinates, gc);
@@ -174 +174 @@
         gc.weighty = 0.0;
         UndecideCoordinateConflictAction actUndecideCoordinates = new UndecideCoordinateConflictAction();
-        model.addObserver(actUndecideCoordinates);
+        model.addChangeListener(actUndecideCoordinates);
         JButton btnUndecideCoordinates = new JButton(actUndecideCoordinates);
         add(btnUndecideCoordinates, gc);
@@ -206 +206 @@
         gc.weighty = 0.0;
         KeepMyDeletedStateAction actKeepMyDeletedState = new KeepMyDeletedStateAction();
-        model.addObserver(actKeepMyDeletedState);
+        model.addChangeListener(actKeepMyDeletedState);
         JButton btnKeepMyDeletedState = new JButton(actKeepMyDeletedState);
         btnKeepMyDeletedState.setName("button.keepmydeletedstate");
@@ -224 +224 @@
         gc.weighty = 0.0;
         KeepTheirDeletedStateAction actKeepTheirDeletedState = new KeepTheirDeletedStateAction();
-        model.addObserver(actKeepTheirDeletedState);
+        model.addChangeListener(actKeepTheirDeletedState);
         JButton btnKeepTheirDeletedState = new JButton(actKeepTheirDeletedState);
         btnKeepTheirDeletedState.setName("button.keeptheirdeletedstate");
@@ -244 +244 @@
         gc.weighty = 0.0;
         UndecideDeletedStateConflictAction actUndecideDeletedState = new UndecideDeletedStateConflictAction();
-        model.addObserver(actUndecideDeletedState);
+        model.addChangeListener(actUndecideDeletedState);
         JButton btnUndecideDeletedState = new JButton(actUndecideDeletedState);
         btnUndecideDeletedState.setName("button.undecidedeletedstate");
@@ -384 +384 @@
 
     @Override
-    public void update(Observable o, Object arg) {
+    public void stateChanged(ChangeEvent e) {
         updateCoordinates();
         updateDeletedState();
@@ -398 +398 @@
     }
 
-    class KeepMyCoordinatesAction extends AbstractAction implements Observer {
+    class KeepMyCoordinatesAction extends AbstractAction implements ChangeListener {
         KeepMyCoordinatesAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine"));
@@ -410 +410 @@
 
         @Override
-        public void update(Observable o, Object arg) {
+        public void stateChanged(ChangeEvent e) {
             setEnabled(model.hasCoordConflict() && !model.isDecidedCoord() && model.getMyCoords() != null);
         }
     }
 
-    class KeepTheirCoordinatesAction extends AbstractAction implements Observer {
+    class KeepTheirCoordinatesAction extends AbstractAction implements ChangeListener {
         KeepTheirCoordinatesAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir"));
@@ -427 +427 @@
 
         @Override
-        public void update(Observable o, Object arg) {
+        public void stateChanged(ChangeEvent e) {
             setEnabled(model.hasCoordConflict() && !model.isDecidedCoord() && model.getTheirCoords() != null);
         }
     }
 
-    class UndecideCoordinateConflictAction extends AbstractAction implements Observer {
+    class UndecideCoordinateConflictAction extends AbstractAction implements ChangeListener {
         UndecideCoordinateConflictAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagundecide"));
@@ -444 +444 @@
 
         @Override
-        public void update(Observable o, Object arg) {
+        public void stateChanged(ChangeEvent e) {
             setEnabled(model.hasCoordConflict() && model.isDecidedCoord());
         }
     }
 
-    class KeepMyDeletedStateAction extends AbstractAction implements Observer {
+    class KeepMyDeletedStateAction extends AbstractAction implements ChangeListener {
         KeepMyDeletedStateAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine"));
@@ -461 +461 @@
 
         @Override
-        public void update(Observable o, Object arg) {
+        public void stateChanged(ChangeEvent e) {
             setEnabled(model.hasDeletedStateConflict() && !model.isDecidedDeletedState());
         }
     }
 
-    class KeepTheirDeletedStateAction extends AbstractAction implements Observer {
+    class KeepTheirDeletedStateAction extends AbstractAction implements ChangeListener {
         KeepTheirDeletedStateAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir"));
@@ -478 +478 @@
 
         @Override
-        public void update(Observable o, Object arg) {
+        public void stateChanged(ChangeEvent e) {
             setEnabled(model.hasDeletedStateConflict() && !model.isDecidedDeletedState());
         }
     }
 
-    class UndecideDeletedStateConflictAction extends AbstractAction implements Observer {
+    class UndecideDeletedStateConflictAction extends AbstractAction implements ChangeListener {
         UndecideDeletedStateConflictAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagundecide"));
@@ -495 +495 @@
 
         @Override
-        public void update(Observable o, Object arg) {
+        public void stateChanged(ChangeEvent e) {
             setEnabled(model.hasDeletedStateConflict() && model.isDecidedDeletedState());
         }