Changeset 32453 in osm for applications/editors/josm/plugins/czechaddress/src

Timestamp:

2016-06-30T00:01:38+02:00 (9 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

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

Files:

• CzechAddressPlugin.java (modified) (2 diffs)
• MapUtils.java (modified) (2 diffs)
• actions/FactoryAction.java (modified) (1 diff)
• actions/PointManipulatorAction.java (modified) (1 diff)
• actions/SplitAreaByEmptyWayAction.java (modified) (5 diffs)
• gui/LocationSelector.java (modified) (2 diffs)
• gui/ManagerDialog.java (modified) (1 diff)
• gui/PointManipulatorDialog.java (modified) (1 diff)
• gui/utils/UniversalListRenderer.java (modified) (1 diff)
• proposal/ExtractAddressIntoNodeProposal.java (modified) (2 diffs)

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java

@@ -22 +22 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.IconToggleButton;
@@ -147 +148 @@
                 reasoner.update(street);
 
-            org.openstreetmap.josm.data.osm.DataSet dataSet = Main.main.getCurrentDataSet();
+            DataSet dataSet = Main.getLayerManager().getEditDataSet();
             if (dataSet != null) {
                 for (OsmPrimitive prim : dataSet.allPrimitives()) {

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/MapUtils.java

@@ -22 +22 @@
      */
     public static void zoomToMany(Collection<OsmPrimitive> primitives) {
-        Main.main.getCurrentDataSet().setSelected(primitives);
+        Main.getLayerManager().getEditDataSet().setSelected(primitives);
         (new AutoScaleAction("selection")).actionPerformed(null);
     }
@@ -30 +30 @@
      */
     public static void zoomTo(OsmPrimitive primitive) {
-        Main.main.getCurrentDataSet().setSelected(primitive);
+        Main.getLayerManager().getEditDataSet().setSelected(primitive);
         (new AutoScaleAction("selection")).actionPerformed(null);
     }

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java

@@ -107 +107 @@
         FactoryDialog.getInstance().selectionListenerActivated = false;
         FactoryDialog.getInstance().selectNextUnmatchedHouseByCheckBox();
-        Main.main.getCurrentDataSet().addPrimitive(newNode);
-        Main.main.getCurrentDataSet().setSelected(newNode);
+        Main.getLayerManager().getEditDataSet().addPrimitive(newNode);
+        Main.getLayerManager().getEditDataSet().setSelected(newNode);
         FactoryDialog.getInstance().selectionListenerActivated = true;
     }

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java

@@ -43 +43 @@
      */
     public void actionPerformed(ActionEvent e) {
-        org.openstreetmap.josm.data.osm.DataSet dataSet = Main.main.getCurrentDataSet();
+        org.openstreetmap.josm.data.osm.DataSet dataSet = Main.getLayerManager().getEditDataSet();
         if (dataSet == null) return;
         Collection<OsmPrimitive> data = dataSet.getSelected();

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java

@@ -14 +14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -53 +54 @@
      */
     public void actionPerformed(ActionEvent e) {
-
-        Collection<Way> selectedWays = Main.main.getCurrentDataSet().getSelectedWays();
-        Collection<Way> newSelection = new LinkedList<>(Main.main.getCurrentDataSet().getSelectedWays());
+        DataSet ds = Main.getLayerManager().getEditDataSet();
+        Collection<Way> selectedWays = ds.getSelectedWays();
+        Collection<Way> newSelection = new LinkedList<>(ds.getSelectedWays());
 
         for (Way area : selectedWays) {
             if (! area.isClosed()) continue;
 
-            for (OsmPrimitive prim2 : Main.main.getCurrentDataSet().allNonDeletedPrimitives()) {
+            for (OsmPrimitive prim2 : ds.allNonDeletedPrimitives()) {
                 if (!(prim2 instanceof Way)) continue;
                 if (prim2.equals(area))      continue;
@@ -82 +83 @@
 
                 if (errorCode == 0) {
-                    Main.main.getCurrentDataSet().addPrimitive(newArea1);
-                    Main.main.getCurrentDataSet().addPrimitive(newArea2);
+                    ds.addPrimitive(newArea1);
+                    ds.addPrimitive(newArea2);
 
                     area.setDeleted(true);
@@ -98 +99 @@
         }
 
-        Main.main.getCurrentDataSet().setSelected(newSelection);
+        ds.setSelected(newSelection);
     }
 
@@ -113 +114 @@
     private int splitArea(Way area, Way border, Way newArea1, Way newArea2) {
 
-        for (Relation r : Main.main.getCurrentDataSet().getRelations())
+        for (Relation r : Main.getLayerManager().getEditDataSet().getRelations())
             for (RelationMember rm : r.getMembers())
                 if (rm.refersTo(area) || rm.refersTo(border))

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java

@@ -87 +87 @@
 
         BoundingXYVisitor visitor = new BoundingXYVisitor();
-        org.openstreetmap.josm.data.osm.DataSet dataSet = Main.main.getCurrentDataSet();
+        org.openstreetmap.josm.data.osm.DataSet dataSet = Main.getLayerManager().getEditDataSet();
         if (dataSet == null) return;
 
@@ -110 +110 @@
             System.out.println("AUTO: Center is " + center);
 
-        for (OsmPrimitive op : Main.main.getCurrentDataSet().allPrimitives()) {
+        for (OsmPrimitive op : Main.getLayerManager().getEditDataSet().allPrimitives()) {
 
             if (!(op instanceof Node)) {

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java

@@ -47 +47 @@
         dbEditButton.setIcon(ImageProvider.get("actions", "edit.png"));
 
-        org.openstreetmap.josm.data.osm.DataSet dataSet = Main.main.getCurrentDataSet();
+        org.openstreetmap.josm.data.osm.DataSet dataSet = Main.getLayerManager().getEditDataSet();
         if (dataSet != null) {
             Capitalizator cap = new Capitalizator(dataSet.allPrimitives(),

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java

@@ -104 +104 @@
             proposalContainer.applyAll();
 
-            Main.main.getCurrentDataSet().setSelected((Node) null); // TODO: This is an ugly hack.
-            Main.main.getCurrentDataSet().setSelected(proposalContainer.getTarget());
+            Main.getLayerManager().getEditDataSet().setSelected((Node) null); // TODO: This is an ugly hack.
+            Main.getLayerManager().getEditDataSet().setSelected(proposalContainer.getTarget());
 
             AddressElement elem = (AddressElement) matchesComboBox.getSelectedItem();

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/utils/UniversalListRenderer.java

@@ -13 +13 @@
 
     @Override
-    public Component getListCellRendererComponent(JList list, Object value,
+    public Component getListCellRendererComponent(JList<?> list, Object value,
                           int index, boolean isSelected, boolean cellHasFocus) {
 

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java

@@ -66 +66 @@
            way.remove(key);
 
-        Main.main.getCurrentDataSet().addPrimitive(addrNode);
+        Main.getLayerManager().getEditDataSet().addPrimitive(addrNode);
     }
 
@@ -78 +78 @@
         return "Vytvořit z budovy samostatný adresní uzel.";
     }
-
-
-
 }