Changeset 33579 in osm for applications/editors/josm/plugins/terracer

Timestamp:

2017-08-27T22:22:31+02:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 12678

Location:

applications/editors/josm/plugins/terracer

Files:

• build.xml (modified) (1 diff)
• src/terracer/HouseNumberInputDialog.java (modified) (3 diffs)
• src/terracer/HouseNumberInputHandler.java (modified) (2 diffs)
• src/terracer/ReverseTerraceAction.java (modified) (3 diffs)
• src/terracer/TerracerAction.java (modified) (10 diffs)
• src/terracer/TerracerPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/terracer/build.xml

@@ -2 +2 @@
 <project name="terracer" default="dist" basedir=".">
     <property name="commit.message" value="applied #j5760 (patch by robome) - Order of housenumbers not correct"/>
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12678"/>
     <property name="plugin.author" value="Matt Amos"/>
     <property name="plugin.class" value="terracer.TerracerPlugin"/>

applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
+import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.WindowGeometry;
 
 /**
@@ -310 +311 @@
 
         if (buildingComboBox == null) {
-            final List<AutoCompletionListItem> values = Main.getLayerManager().getEditDataSet().getAutoCompletionManager().getValues("building");
+            final List<AutoCompletionListItem> values = MainApplication
+                .getLayerManager().getEditDataSet().getAutoCompletionManager().getValues("building");
 
             buildingComboBox = new AutoCompletingComboBox();
@@ -362 +364 @@
     TreeSet<String> createAutoCompletionInfo() {
         final TreeSet<String> names = new TreeSet<>();
-        for (OsmPrimitive osm : Main.getLayerManager().getEditDataSet()
+        for (OsmPrimitive osm : MainApplication.getLayerManager().getEditDataSet()
                 .allNonDeletedPrimitives()) {
             if (osm.getKeys() != null && osm.keySet().contains("highway")

applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.UserCancelException;
 
@@ -300 +301 @@
                             doKeepOutline(), buildingType());
                     } catch (UserCancelException ex) {
-                        Main.trace(ex);
+                        Logging.trace(ex);
                     }
 

applications/editors/josm/plugins/terracer/src/terracer/ReverseTerraceAction.java

@@ -21 +21 @@
 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;
 
@@ -48 +49 @@
     /**
      * Breadth-first searches based on the selection while the selection is a way
-     * with a building=* tag and then applies the addr:housenumber tag in reverse
-     * order.
+     * with a building=* tag and then applies the addr:housenumber tag in reverse order.
      */
+    @Override
     public void actionPerformed(ActionEvent e) {
-        Collection<Way> selectedWays = Main.getLayerManager().getEditDataSet().getSelectedWays();
+        Collection<Way> selectedWays = MainApplication.getLayerManager().getEditDataSet().getSelectedWays();
 
         // Set to keep track of all the nodes that have been visited - that is: if
@@ -123 +124 @@
         }
 
-        Main.main.undoRedo.add(new SequenceCommand(tr("Reverse Terrace"), commands));
-        Main.getLayerManager().getEditDataSet().setSelected(orderedWays);
+        MainApplication.undoRedo.add(new SequenceCommand(tr("Reverse Terrace"), commands));
+        MainApplication.getLayerManager().getEditDataSet().setSelected(orderedWays);
     }
 

applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java

@@ -38 +38 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -178 +180 @@
 
         } catch (InvalidUserInputException ex) {
-            Main.warn("Terracer: "+ex.getMessage());
+            Logging.warn("Terracer: "+ex.getMessage());
             new ExtendedDialog(Main.parent, tr("Invalid selection"), new String[] {"OK"})
                 .setButtonIcons(new String[] {"ok"}).setIcon(JOptionPane.INFORMATION_MESSAGE)
@@ -191 +193 @@
 
         // Try to find an associatedStreet relation that could be reused from housenumbers, outline and street.
-        Set<OsmPrimitive> candidates = new HashSet<OsmPrimitive>(housenumbers);
+        Set<OsmPrimitive> candidates = new HashSet<>(housenumbers);
         candidates.add(outline);
         if (street != null) {
@@ -203 +205 @@
             if (associatedStreets.size() > 1) {
                 // TODO: Deal with multiple associated Streets
-                Main.warn("Terracer: Found "+associatedStreets.size()+" associatedStreet relations. Considering the first one only.");
+                Logging.warn("Terracer: Found "+associatedStreets.size()+" associatedStreet relations. Considering the first one only.");
             }
         }
@@ -218 +220 @@
                         housenumbers, streetname, associatedStreet != null, false, "yes");
             } catch (UserCancelException ex) {
-                Main.trace(ex);
+                Logging.trace(ex);
             } finally {
                 this.commands.clear();
@@ -245 +247 @@
      *            number nodes
      */
-    class HousenumberNodeComparator implements Comparator<Node> {
+    static class HousenumberNodeComparator implements Comparator<Node> {
         private final Pattern pat = Pattern.compile("^(\\d+)\\s*(.*)");
 
@@ -402 +404 @@
                 }
                 if (!nodesToDelete.isEmpty())
-                    this.commands.add(DeleteCommand.delete(Main.getLayerManager().getEditLayer(), nodesToDelete));
+                    this.commands.add(DeleteCommand.delete(MainApplication.getLayerManager().getEditLayer(), nodesToDelete));
             }
         } else {
@@ -413 +415 @@
         // Or should removing them also be an option?
         if (!housenumbers.isEmpty()) {
-            commands.add(DeleteCommand.delete(Main.getLayerManager().getEditLayer(),
+            commands.add(DeleteCommand.delete(MainApplication.getLayerManager().getEditLayer(),
                     housenumbers, true, true));
         }
@@ -425 +427 @@
         }
 
-        Main.main.undoRedo.add(createTerracingCommand(outline));
+        MainApplication.undoRedo.add(createTerracingCommand(outline));
         if (nb <= 1 && street != null) {
             // Select the way (for quick selection of a new house (with the same way))
-            Main.getLayerManager().getEditDataSet().setSelected(street);
+            MainApplication.getLayerManager().getEditDataSet().setSelected(street);
         } else {
             // Select the new building outlines (for quick reversing)
-            Main.getLayerManager().getEditDataSet().setSelected(ways);
+            MainApplication.getLayerManager().getEditDataSet().setSelected(ways);
         }
     }
@@ -488 +490 @@
                         }
                     } catch (UserCancelException e) {
-                        Main.trace(e);
+                        Logging.trace(e);
                     }
                 }

applications/editors/josm/plugins/terracer/src/terracer/TerracerPlugin.java

@@ -2 +2 @@
 package terracer;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -16 +16 @@
         super(info);
 
-        MainMenu.add(Main.main.menu.moreToolsMenu, new TerracerAction());
-        MainMenu.add(Main.main.menu.moreToolsMenu, new ReverseTerraceAction());
+        MainMenu.add(MainApplication.getMenu().moreToolsMenu, new TerracerAction());
+        MainMenu.add(MainApplication.getMenu().moreToolsMenu, new ReverseTerraceAction());
     }
 }