Changeset 34454 in osm for applications/editors/josm/plugins/utilsplugin2/src/org

Timestamp:

2018-08-13T22:15:59+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2

Files:

• UtilsPlugin2.java (modified) (1 diff)
• actions/AddIntersectionsAction.java (modified) (2 diffs)
• actions/AlignWayNodesAction.java (modified) (2 diffs)
• actions/CopyTagsAction.java (modified) (2 diffs)
• actions/ExtractPointAction.java (modified) (2 diffs)
• actions/PasteRelationsAction.java (modified) (2 diffs)
• actions/SplitObjectAction.java (modified) (2 diffs)
• actions/SplitOnIntersectionsAction.java (modified) (2 diffs)
• actions/SymmetryAction.java (modified) (2 diffs)
• actions/TagBufferAction.java (modified) (2 diffs)
• actions/TagSourceAction.java (modified) (4 diffs)
• actions/UnGlueRelationAction.java (modified) (2 diffs)
• curves/CircleArcMaker.java (modified) (1 diff)
• curves/CurveAction.java (modified) (3 diffs)
• customurl/ChooseURLAction.java (modified) (4 diffs)
• customurl/OpenPageAction.java (modified) (3 diffs)
• customurl/URLList.java (modified) (4 diffs)
• customurl/UtilsPluginPreferences.java (modified) (1 diff)
• latlon/LatLonAction.java (modified) (3 diffs)
• latlon/LatLonDialog.java (modified) (3 diffs)
• multitagger/MultiTagAction.java (modified) (1 diff)
• multitagger/MultiTagDialog.java (modified) (7 diffs)
• multitagger/MultiTaggerTableModel.java (modified) (4 diffs)
• replacegeometry/ReplaceGeometryAction.java (modified) (2 diffs)
• replacegeometry/ReplaceGeometryException.java (modified) (1 diff)
• replacegeometry/ReplaceGeometryUtils.java (modified) (6 diffs)
• replacegeometry/ReplaceMembershipAction.java (modified) (3 diffs)
• search/ChildrenMatch.java (modified) (1 diff)
• search/ConnectedMatch.java (modified) (1 diff)
• search/InsideMatch.java (modified) (1 diff)
• search/IntersectingMatch.java (modified) (1 diff)
• search/ParentsMatch.java (modified) (1 diff)
• search/RangeMatch.java (modified) (1 diff)
• search/UtilsSimpleMatchFactory.java (modified) (1 diff)
• search/UtilsUnaryMatchFactory.java (modified) (1 diff)
• selection/NodeWayUtils.java (modified) (3 diffs)
• selection/SelectModNodesAction.java (modified) (3 diffs)
• selection/SelectModWaysAction.java (modified) (3 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java

@@ -48 +48 @@
 import org.openstreetmap.josm.plugins.utilsplugin2.selection.UnselectNodesAction;
 
+/**
+ * Collection of utilities
+ */
 public class UtilsPlugin2 extends Plugin {
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/AddIntersectionsAction.java

@@ -19 +19 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Shortcut;
 
+/**
+ * Add missing nodes at intersections of selected ways.
+ */
 public class AddIntersectionsAction extends JosmAction {
 
@@ -56 +59 @@
         Geometry.addIntersections(ways, false, cmds);
         if (!cmds.isEmpty()) {
-            MainApplication.undoRedo.add(new SequenceCommand(tr("Add nodes at intersections"), cmds));
+            UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Add nodes at intersections"), cmds));
             Set<Node> nodes = new HashSet<>(10);
             // find and select newly added nodes

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/AlignWayNodesAction.java

@@ -19 +19 @@
 import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -128 +128 @@
 
         if (!commands.isEmpty())
-            MainApplication.undoRedo.add(new SequenceCommand(TITLE, commands));
+            UndoRedoHandler.getInstance().add(new SequenceCommand(TITLE, commands));
     }
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/CopyTagsAction.java

@@ -14 +14 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -81 +81 @@
         if (sel.isEmpty()) {
             JOptionPane.showMessageDialog(
-                    Main.parent,
+                    MainApplication.getMainFrame(),
                     tr("Please select something to copy."),
                     tr("Information"),

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/ExtractPointAction.java

@@ -20 +20 @@
 import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -73 +74 @@
             }
         }
-        if (cmds.size() > 1) MainApplication.undoRedo.add(new SequenceCommand(tr("Extract node from line"), cmds));
+        if (cmds.size() > 1) UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Extract node from line"), cmds));
     }
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java

@@ -15 +15 @@
 import java.util.Map;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
@@ -101 +100 @@
 
         if (!commands.isEmpty())
-            MainApplication.undoRedo.add(new SequenceCommand(TITLE, commands));
+            UndoRedoHandler.getInstance().add(new SequenceCommand(TITLE, commands));
     }
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java

@@ -21 +21 @@
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.SplitWayCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -210 +210 @@
             SplitWayCommand result = SplitWayCommand.splitWay(
                     selectedWay, wayChunks, Collections.<OsmPrimitive>emptyList());
-            MainApplication.undoRedo.add(result);
+            UndoRedoHandler.getInstance().add(result);
             if (splitWay != null)
-                MainApplication.undoRedo.add(new DeleteCommand(splitWay));
+                UndoRedoHandler.getInstance().add(new DeleteCommand(splitWay));
             getLayerManager().getEditDataSet().setSelected(result.getNewSelection());
         }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java

@@ -19 +19 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.command.SplitWayCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -92 +92 @@
 
         if (!list.isEmpty()) {
-            MainApplication.undoRedo.add(list.size() == 1 ? list.get(0) : new SequenceCommand(TITLE, list));
+            UndoRedoHandler.getInstance().add(list.size() == 1 ? list.get(0) : new SequenceCommand(TITLE, list));
             getLayerManager().getEditDataSet().clearSelection();
         }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SymmetryAction.java

@@ -13 +13 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
@@ -88 +88 @@
         }
 
-        MainApplication.undoRedo.add(new SequenceCommand(tr("Symmetry"), cmds));
+        UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Symmetry"), cmds));
         MainApplication.getMap().repaint();
     }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java

@@ -19 +19 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
@@ -69 +69 @@
 
         if (!commands.isEmpty())
-            MainApplication.undoRedo.add(new SequenceCommand(TITLE, commands));
+            UndoRedoHandler.getInstance().add(new SequenceCommand(TITLE, commands));
     }
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java

@@ -10 +10 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -32 +32 @@
                 Shortcut.registerShortcut("tools:sourcetag", tr("Tool: {0}", tr("Add Source Tag")), KeyEvent.VK_S, Shortcut.ALT_CTRL),
                 true, false);
-        source = Main.pref.get("sourcetag.value");
+        source = Config.getPref().get("sourcetag.value");
         // The fields are not initialized while the super constructor is running, so we have to call this afterwards:
         installAdapters();
@@ -43 +43 @@
             return;
 
-        MainApplication.undoRedo.add(new ChangePropertyCommand(selection, "source", source));
+        UndoRedoHandler.getInstance().add(new ChangePropertyCommand(selection, "source", source));
     }
 
@@ -82 +82 @@
                 if (newSource != null && newSource.length() > 0 && !newSource.equals(source)) {
                     source = newSource;
-                    Main.pref.put("sourcetag.value", source);
+                    Config.getPref().put("sourcetag.value", source);
                 }
             }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/UnGlueRelationAction.java

@@ -15 +15 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -81 +82 @@
             // error message nothing to do
         } else {
-            MainApplication.undoRedo.add(new SequenceCommand(tr("Unglued Relations"), cmds));
+            UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Unglued Relations"), cmds));
             //Set selection all primiteves (new and old)
             newPrimitives.addAll(selection);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CircleArcMaker.java

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.MainApplication;
 
+/**
+ * Create a circle arc
+ */
 public final class CircleArcMaker {
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CurveAction.java

@@ -11 +11 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Shortcut;
 
 // TODO: investigate splines
 
+/**
+ * Create a circle arc
+ */
 public class CurveAction extends JosmAction {
 
@@ -39 +42 @@
     private void updatePreferences() {
         // @formatter:off
-        angleSeparation = Main.pref.getInt(prefKey("circlearc.angle-separation"), 20);
+        angleSeparation = Config.getPref().getInt(prefKey("circlearc.angle-separation"), 20);
         // @formatter:on
     }
@@ -59 +62 @@
         Collection<Command> cmds = CircleArcMaker.doCircleArc(selectedNodes, selectedWays, angleSeparation);
         if (cmds != null)
-            MainApplication.undoRedo.add(new SequenceCommand("Create a curve", cmds));
+            UndoRedoHandler.getInstance().add(new SequenceCommand("Create a curve", cmds));
     }
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/ChooseURLAction.java

@@ -17 +17 @@
 import javax.swing.event.ListSelectionListener;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 
+/**
+ * Select custom URL
+ */
 public class ChooseURLAction extends JosmAction {
 
@@ -56 +60 @@
         final JCheckBox check1 = new JCheckBox(tr("Ask every time"));
 
-        final ExtendedDialog dialog = new ExtendedDialog(Main.parent,
+        final ExtendedDialog dialog = new ExtendedDialog(MainApplication.getMainFrame(),
                 tr("Configure custom URL"),
                 new String[] {tr("OK"), tr("Cancel")}
@@ -69 +73 @@
         });
         list1.setSelectedIndex(idxToSelect);
-        check1.setSelected(Main.pref.getBoolean("utilsplugin2.askurl", false));
+        check1.setSelected(Config.getPref().getBoolean("utilsplugin2.askurl", false));
 
         editField.setEditable(false);
@@ -87 +91 @@
         if (ret == 1 && idx >= 0) {
             URLList.select(vals[idx]);
-            Main.pref.putBoolean("utilsplugin2.askurl", check1.isSelected());
+            Config.getPref().putBoolean("utilsplugin2.askurl", check1.isSelected());
         }
         return ret;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/OpenPageAction.java

@@ -13 +13 @@
 import java.util.regex.Pattern;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -20 +19 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OpenBrowser;
@@ -50 +50 @@
         }
 
-        if (Main.pref.getBoolean("utilsplugin2.askurl", false) && 1 != ChooseURLAction.showConfigDialog(true)) {
+        if (Config.getPref().getBoolean("utilsplugin2.askurl", false) && 1 != ChooseURLAction.showConfigDialog(true)) {
             return;
         }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/URLList.java

@@ -13 +13 @@
 import java.util.logging.Logger;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.plugins.utilsplugin2.UtilsPlugin2;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 
+/**
+ * List of custom URLs
+ */
 public final class URLList {
     public static final String defaultURL = "http://osm.mapki.com/history/{#type}.php?id={#id}";
@@ -26 +30 @@
     public static String getSelectedURL() {
         getURLList();
-        return Main.pref.get("utilsplugin2.customurl", defaultURL);
+        return Config.getPref().get("utilsplugin2.customurl", defaultURL);
     }
 
     public static void select(String url) {
-        Main.pref.put("utilsplugin2.customurl", url);
+        Config.getPref().put("utilsplugin2.customurl", url);
     }
 
@@ -47 +51 @@
         items.add("Browse element [demo, =Ctrl-Shift-I]");
         items.add("https://www.openstreetmap.org/{#type}/{#id}");
-        Main.pref.putList("utilsplugin2.urlHistory", items);
-        Main.pref.put("utilsplugin2.customurl", items.get(9));
+        Config.getPref().putList("utilsplugin2.urlHistory", items);
+        Config.getPref().put("utilsplugin2.customurl", items.get(9));
         return items;
     }
 
     public static List<String> getURLList() {
-        List<String> items = Main.pref.getList("utilsplugin2.urlHistory");
+        List<String> items = Config.getPref().getList("utilsplugin2.urlHistory");
         if (items == null || items.isEmpty()) {
             resetURLList();
-            items = Main.pref.getList("utilsplugin2.urlHistory");
+            items = Config.getPref().getList("utilsplugin2.urlHistory");
         }
         return items;
@@ -62 +66 @@
 
     public static void updateURLList(List<String> lst) {
-        Main.pref.putList("utilsplugin2.urlHistory", lst);
+        Config.getPref().putList("utilsplugin2.urlHistory", lst);
         try {
-            Main.pref.save();
+            Preferences.main().save();
         } catch (IOException ex) {
             Logger.getLogger(UtilsPluginPreferences.class.getName()).log(Level.SEVERE, null, ex);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/UtilsPluginPreferences.java

@@ -26 +26 @@
 import org.openstreetmap.josm.tools.GBC;
 
+/**
+ * Preferences of Utilsplugin2 functions
+ */
 public class UtilsPluginPreferences extends DefaultTabPreferenceSetting {
     HistoryComboBox combo1 = new HistoryComboBox();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonAction.java

@@ -10 +10 @@
 import java.util.LinkedList;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.Command;
 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;
@@ -41 +41 @@
             return;
 
-        LatLonDialog dialog = new LatLonDialog(Main.parent, tr("Add Node..."), ht("/Action/AddNode"));
+        LatLonDialog dialog = new LatLonDialog(MainApplication.getMainFrame(), tr("Add Node..."), ht("/Action/AddNode"));
 
         if (textLatLon != null) {
@@ -83 +83 @@
             cmds.add(new AddCommand(ds, wnew));
         }
-        MainApplication.undoRedo.add(new SequenceCommand(tr("Lat Lon tool"), cmds));
+        UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Lat Lon tool"), cmds));
         MainApplication.getMap().mapView.repaint();
     }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonDialog.java

@@ -32 +32 @@
 import javax.swing.event.DocumentListener;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
@@ -38 +37 @@
 import org.openstreetmap.josm.data.coor.conversion.LatLonParser;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.tools.GBC;
 
+/**
+ * Dialog for entering lat/lon coordinates.
+ */
 public class LatLonDialog extends ExtendedDialog {
     private static final Color BG_COLOR_ERROR = new Color(255, 224, 224);
@@ -167 +170 @@
 
     public LatLonDialog(Component parent, String title, String help) {
-        super(Main.parent, tr("Add Node..."), new String[] {tr("Ok"), tr("Cancel")});
+        super(MainApplication.getMainFrame(), tr("Add Node..."), new String[] {tr("Ok"), tr("Cancel")});
         setButtonIcons(new String[] {"ok", "cancel"});
         configureContextsensitiveHelp("/Action/AddNode", true);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagAction.java

@@ -13 +13 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
+/**
+ * Edit tags of object list in table
+ */
 public final class MultiTagAction extends JosmAction {
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java

@@ -40 +40 @@
 import javax.swing.table.DefaultTableCellRenderer;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.search.SearchAction;
@@ -59 +58 @@
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -81 +81 @@
 
     public MultiTagDialog() {
-        super(Main.parent, tr("Edit tags"), new String[]{tr("Ok"), tr("Cancel")}, false);
+        super(MainApplication.getMainFrame(), tr("Edit tags"), new String[]{tr("Ok"), tr("Cancel")}, false);
         JPanel pnl = new JPanel(new GridBagLayout());
         tbl = createTable();
@@ -112 +112 @@
         loadHistory();
 
-        WindowGeometry defaultGeometry = WindowGeometry.centerInWindow(Main.parent, new Dimension(500, 500));
+        WindowGeometry defaultGeometry = WindowGeometry.centerInWindow(MainApplication.getMainFrame(), new Dimension(500, 500));
         setRememberWindowGeometry(getClass().getName() + ".geometry", defaultGeometry);
     }
@@ -151 +151 @@
     private void loadHistory() {
         List<String> cmtHistory = new LinkedList<>(
-                Main.pref.getList(HISTORY_KEY, Arrays.asList(defaultHistory)));
+                Config.getPref().getList(HISTORY_KEY, Arrays.asList(defaultHistory)));
         Collections.reverse(cmtHistory);
         cbTagSet.setPossibleItems(cmtHistory);
@@ -303 +303 @@
                 history = Arrays.asList(defaultHistory);
             }
-            Main.pref.putList(HISTORY_KEY, history);
+            Config.getPref().putList(HISTORY_KEY, history);
             loadHistory();
         }
@@ -336 +336 @@
             oldTags = s;
             cbTagSet.addCurrentItemToHistory();
-            Main.pref.putList(HISTORY_KEY, cbTagSet.getHistory());
+            Config.getPref().putList(HISTORY_KEY, cbTagSet.getHistory());
             specifyTagSet(s);
         }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTaggerTableModel.java

@@ -16 +16 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -22 +23 @@
 import org.openstreetmap.josm.tools.Geometry;
 
+/**
+ * Model of the multi tag table.
+ */
 public class MultiTaggerTableModel extends AbstractTableModel implements SelectionChangedListener {
 
@@ -115 +119 @@
             Command cmd = new ChangePropertyCommand(sel, key, (String) value);
             if (autoCommit) {
-                MainApplication.undoRedo.add(cmd);
+                UndoRedoHandler.getInstance().add(cmd);
             } else {
                 cmds.add(cmd);
@@ -185 +189 @@
 
     void commit(String commandTitle) {
-        MainApplication.undoRedo.add(new SequenceCommand(commandTitle, cmds));
+        UndoRedoHandler.getInstance().add(new SequenceCommand(commandTitle, cmds));
         cmds.clear();
     }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryAction.java

@@ -13 +13 @@
 
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -58 +58 @@
                 return;
 
-            MainApplication.undoRedo.add(replaceCommand);
+            UndoRedoHandler.getInstance().add(replaceCommand);
         } catch (IllegalArgumentException ex) {
             new Notification(

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryException.java

@@ -3 +3 @@
 
 /**
- *
+ * Exception thrown when replace geometry fails.
  * @author joshdoe
  */

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java

@@ -18 +18 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.MergeNodesAction;
 import org.openstreetmap.josm.command.ChangeNodesCommand;
@@ -36 +35 @@
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.UserCancelException;
@@ -42 +42 @@
 
 /**
- *
+ * Utilities for Replace Geometry
  * @author joshdoe
  */
@@ -276 +276 @@
         int nLen = nodePool.size();
         int N = Math.max(gLen, nLen);
-        boolean useRobust = Main.pref.getBoolean("utilsplugin2.replace-geometry.robustAssignment", true)
-                && N <= Main.pref.getInt("utilsplugin2.replace-geometry.robustAssignment.max-size", 300);
+        boolean useRobust = Config.getPref().getBoolean("utilsplugin2.replace-geometry.robustAssignment", true)
+                && N <= Config.getPref().getInt("utilsplugin2.replace-geometry.robustAssignment.max-size", 300);
 
         // Find new nodes that are closest to the old ones, remove matching old ones from the pool
@@ -291 +291 @@
                 }
 
-                double maxDistance = Double.parseDouble(Main.pref.get("utilsplugin2.replace-geometry.max-distance", "1"));
+                double maxDistance = Double.parseDouble(Config.getPref().get("utilsplugin2.replace-geometry.max-distance", "1"));
                 for (int i = 0; i < nLen; i++) {
                     for (int j = 0; j < gLen; j++) {
@@ -468 +468 @@
         Node nearest = null;
         // TODO: use meters instead of degrees, but do it fast
-        double distance = Double.parseDouble(Main.pref.get("utilsplugin2.replace-geometry.max-distance", "1"));
+        double distance = Double.parseDouble(Config.getPref().get("utilsplugin2.replace-geometry.max-distance", "1"));
         LatLon coor = node.getCoor();
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceMembershipAction.java

@@ -18 +18 @@
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -23 +24 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.RelationToChildReference;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.MultiMap;
 
+/**
+ * In relations where the selected object is member of, replace it with a new one
+ */
 public class ReplaceMembershipAction extends JosmAction {
 
@@ -45 +48 @@
         final int affectedRelations = command != null ? command.getChildren().size() : 0;
         if (affectedRelations > 0) {
-            MainApplication.undoRedo.add(command);
+            UndoRedoHandler.getInstance().add(command);
             new Notification(trn("Replaced ''{0}'' by ''{1}'' in {2} relation", "Replaced ''{0}'' by ''{1}'' in {2} relations",
                     affectedRelations,

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ChildrenMatch.java

@@ -7 +7 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
-import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
 
 /**

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ConnectedMatch.java

@@ -67 +67 @@
     }
 
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + (all ? 1231 : 1237);
+        result = prime * result + ((connected == null) ? 0 : connected.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!super.equals(obj) || getClass() != obj.getClass())
+            return false;
+        ConnectedMatch other = (ConnectedMatch) obj;
+        if (all != other.all)
+            return false;
+        if (connected == null) {
+            if (other.connected != null)
+                return false;
+        } else if (!connected.equals(other.connected))
+            return false;
+        return true;
+    }
+
 }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/InsideMatch.java

@@ -51 +51 @@
         return inside.contains(osm);
     }
+
+    @Override
+    public int hashCode() {
+        return 31 * super.hashCode() + ((inside == null) ? 0 : inside.hashCode());
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!super.equals(obj) || getClass() != obj.getClass())
+            return false;
+        InsideMatch other = (InsideMatch) obj;
+        if (inside == null) {
+            if (other.inside != null)
+                return false;
+        } else if (!inside.equals(other.inside))
+            return false;
+        return true;
+    }
 }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/IntersectingMatch.java

@@ -57 +57 @@
     }
 
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + (all ? 1231 : 1237);
+        result = prime * result + ((intersecting == null) ? 0 : intersecting.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!super.equals(obj) || getClass() != obj.getClass())
+            return false;
+        IntersectingMatch other = (IntersectingMatch) obj;
+        if (all != other.all)
+            return false;
+        if (intersecting == null) {
+            if (other.intersecting != null)
+                return false;
+        } else if (!intersecting.equals(other.intersecting))
+            return false;
+        return true;
+    }
+
 }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ParentsMatch.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
-import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
 
 /**

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/RangeMatch.java

@@ -40 +40 @@
         return getString() + "=" + min + "-" + max;
     }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + (int) (max ^ (max >>> 32));
+        result = prime * result + (int) (min ^ (min >>> 32));
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null || getClass() != obj.getClass())
+            return false;
+        RangeMatch other = (RangeMatch) obj;
+        if (max != other.max)
+            return false;
+        if (min != other.min)
+            return false;
+        return true;
+    }
 }
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UtilsSimpleMatchFactory.java

@@ -7 +7 @@
 import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
+import org.openstreetmap.josm.data.osm.search.SearchCompiler.CoreSimpleMatchFactory;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler.SimpleMatchFactory;
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
 
+/**
+ * Extension of the {@link CoreSimpleMatchFactory}
+ */
 public class UtilsSimpleMatchFactory implements SimpleMatchFactory {
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/UtilsUnaryMatchFactory.java

@@ -5 +5 @@
 import java.util.Collection;
 
-import org.openstreetmap.josm.data.osm.search.SearchParseError;
 import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
+import org.openstreetmap.josm.data.osm.search.SearchCompiler.CoreUnaryMatchFactory;
+import org.openstreetmap.josm.data.osm.search.SearchParseError;
 
+/**
+ * Extension of the {@link CoreUnaryMatchFactory}.
+ */
 public class UtilsUnaryMatchFactory implements SearchCompiler.UnaryMatchFactory {
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java

@@ -14 +14 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.BBox;
@@ -23 +22 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.Notification;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Pair;
@@ -32 +32 @@
 public final class NodeWayUtils {
 
-    static final int maxLevel = Main.pref.getInt("selection.maxrecursion", 15);
-    static final int maxWays = Main.pref.getInt("selection.maxfoundways", 2000);
-    static final int maxWays1 = Main.pref.getInt("selection.maxfoundways.intersection", 500);
+    static final int maxLevel = Config.getPref().getInt("selection.maxrecursion", 15);
+    static final int maxWays = Config.getPref().getInt("selection.maxfoundways", 2000);
+    static final int maxWays1 = Config.getPref().getInt("selection.maxfoundways.intersection", 500);
 
     private NodeWayUtils() {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java

@@ -13 +13 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -42 +42 @@
             Command cmd = null;
 
-            if (MainApplication.undoRedo.commands == null) return;
-            int num = MainApplication.undoRedo.commands.size();
+            if (UndoRedoHandler.getInstance().commands == null) return;
+            int num = UndoRedoHandler.getInstance().commands.size();
             if (num == 0) return;
             int k = 0, idx;
             if (selection != null && !selection.isEmpty() && selection.hashCode() == lastHash) {
                 // we are selecting next command in history if nothing is selected
-                idx = MainApplication.undoRedo.commands.indexOf(lastCmd);
+                idx = UndoRedoHandler.getInstance().commands.indexOf(lastCmd);
             } else {
                 idx = num;
@@ -56 +56 @@
             do {  //  select next history element
                 if (idx > 0) idx--; else idx = num-1;
-                cmd = MainApplication.undoRedo.commands.get(idx);
+                cmd = UndoRedoHandler.getInstance().commands.get(idx);
                 Collection<? extends OsmPrimitive> pp = cmd.getParticipatingPrimitives();
                 nodes.clear();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java

@@ -13 +13 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -43 +43 @@
             Command cmd;
 
-            if (MainApplication.undoRedo.commands == null) return;
-            int num = MainApplication.undoRedo.commands.size();
+            if (UndoRedoHandler.getInstance().commands == null) return;
+            int num = UndoRedoHandler.getInstance().commands.size();
             if (num == 0) return;
             int k = 0, idx;
             if (selection != null && !selection.isEmpty() && selection.hashCode() == lastHash) {
                 // we are selecting next command in history if nothing is selected
-                idx = MainApplication.undoRedo.commands.indexOf(lastCmd);
+                idx = UndoRedoHandler.getInstance().commands.indexOf(lastCmd);
             } else {
                 idx = num;
@@ -57 +57 @@
             do {  //  select next history element
                 if (idx > 0) idx--; else idx = num-1;
-                cmd = MainApplication.undoRedo.commands.get(idx);
+                cmd = UndoRedoHandler.getInstance().commands.get(idx);
                 Collection<? extends OsmPrimitive> pp = cmd.getParticipatingPrimitives();
                 ways.clear();