Changeset 34487 in osm for applications/editors/josm/plugins/addrinterpolation/src

Timestamp:

2018-08-18T02:25:36+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation

Files:

• AddrInterpolationAction.java (modified) (3 diffs)
• AddrInterpolationDialog.java (modified) (11 diffs)
• AddrInterpolationPlugin.java (modified) (1 diff)
• EscapeDialog.java (modified) (4 diffs)

applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.util.Collection;
 
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.tools.Shortcut;
 
-@SuppressWarnings("serial")
-public class AddrInterpolationAction extends JosmAction implements
-SelectionChangedListener {
+/**
+ * Handy Address Interpolation Functions
+ */
+public class AddrInterpolationAction extends JosmAction implements DataSelectionListener {
 
     public AddrInterpolationAction() {
@@ -24 +24 @@
                         KeyEvent.VK_Z, Shortcut.ALT_CTRL), false);
         setEnabled(false);
-        DataSet.addSelectionListener(this);
+        SelectionEventManager.getInstance().addSelectionListener(this);
     }
 
@@ -33 +33 @@
 
     @Override
-    public void selectionChanged(
-            Collection<? extends OsmPrimitive> newSelection) {
+    public void selectionChanged(SelectionChangeEvent event) {
 
-        for (OsmPrimitive osm : newSelection) {
+        for (OsmPrimitive osm : event.getSelection()) {
             if (osm instanceof Way) {
                 setEnabled(true);

applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java

@@ -9 +9 @@
 import java.awt.Container;
 import java.awt.Dimension;
-import java.awt.Frame;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -43 +42 @@
 import javax.swing.border.TitledBorder;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -50 +48 @@
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -61 +60 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
+/**
+ * Address Interpolation dialog
+ */
 public class AddrInterpolationDialog extends JDialog implements ActionListener {
 
@@ -123 +125 @@
 
     private void ShowDialog(JPanel editControlsPane, String name) {
-        dialog = new EscapeDialog((Frame) Main.parent, name, true);
+        dialog = new EscapeDialog(MainApplication.getMainFrame(), name, true);
 
         dialog.add(editControlsPane);
@@ -619 +621 @@
         if (namedWayCount != 1) {
             JOptionPane.showMessageDialog(
-                    Main.parent,
+                    MainApplication.getMainFrame(),
                     tr("Please select a street to associate with address interpolation way"),
                     tr("Error"),
@@ -632 +634 @@
                 } else {
                     JOptionPane.showMessageDialog(
-                            Main.parent,
+                            MainApplication.getMainFrame(),
                             tr("Please select address interpolation way for this street"),
                             tr("Error"),
@@ -1002 +1004 @@
             }
             if (!errorMessage.equals("")) {
-                JOptionPane.showMessageDialog(Main.parent, errorMessage, tr("Error"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(), errorMessage, tr("Error"), JOptionPane.ERROR_MESSAGE);
                 return false;
             }
@@ -1009 +1011 @@
         if (country != null) {
             if (country.length() != 2) {
-                JOptionPane.showMessageDialog(Main.parent,
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                         tr("Country code must be 2 letters"), tr("Error"), JOptionPane.ERROR_MESSAGE);
                 return false;
@@ -1096 +1098 @@
 
         if (!commandGroup.isEmpty()) {
-            Main.main.undoRedo.add(new SequenceCommand(tr("Address Interpolation"), commandGroup));
+            UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Address Interpolation"), commandGroup));
             MainApplication.getLayerManager().getEditLayer().invalidate();
         }
@@ -1240 +1242 @@
 
         } else {
-            JOptionPane.showMessageDialog(Main.parent, errorMessage, tr("Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), errorMessage, tr("Error"), JOptionPane.ERROR_MESSAGE);
             return false;
         }

applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationPlugin.java

@@ -7 +7 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 
+/**
+ * Address Interpolation plugin
+ */
 public class AddrInterpolationPlugin extends Plugin {
 

applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/EscapeDialog.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.AddrInterpolation;
 
-import java.awt.Dialog;
 import java.awt.Frame;
-import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -14 +12 @@
 
 public class EscapeDialog extends JDialog {
-    public EscapeDialog() {
-        this((Frame) null, false);
-    }
-    
-    public EscapeDialog(Frame owner) {
-        this(owner, false);
-    }
-    
-    public EscapeDialog(Frame owner, boolean modal) {
-        this(owner, null, modal);
-    }
-    
-    public EscapeDialog(Frame owner, String title) {
-        this(owner, title, false);
-    }
     
     public EscapeDialog(Frame owner, String title, boolean modal) {
@@ -34 +17 @@
     }
     
-    public EscapeDialog(Dialog owner) {
-        this(owner, false);
-    }
-    
-    public EscapeDialog(Dialog owner, boolean modal) {
-        this(owner, null, modal);
-    }
-    
-    public EscapeDialog(Dialog owner, String title) {
-        this(owner, title, false);
-    }
-    
-    public EscapeDialog(Dialog owner, String title, boolean modal) {
-        super(owner, title, modal);
-    }
-
     @Override
     protected JRootPane createRootPane() {
-        ActionListener escapeActionListener = new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                dispose();
-            }
-        };
+        ActionListener escapeActionListener = actionEvent -> dispose();
         JRootPane rootPane = new JRootPane();
         KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
@@ -65 +27 @@
     }
 }
-