Changeset 16750 in osm

Timestamp:

2009-07-31T17:24:51+02:00 (15 years ago)

Author:

stoecker

Message:

fixed broken compilation again

Location:

applications/editors/josm/plugins/czechaddress

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/czechaddress/MapUtils.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/czechaddress/gui/LocationSelector.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/czechaddress/proposal/ExtractAddressIntoNodeProposal.java (modified) (1 diff)

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

@@ -52 +52 @@
             <attribute name="Plugin-Description" value="Creating and handling address nodes and buildings within Czech Republic."/>
             <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/Cz:JOSM/Plugins/CzechAddress"/>
-            <attribute name="Plugin-Mainversion" value="1788"/>
+            <attribute name="Plugin-Mainversion" value="1815"/>
             <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
         </manifest>

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

@@ -147 +147 @@
                 reasoner.update(street);
 
-            for (OsmPrimitive prim : Main.ds.allPrimitives()) {
+            for (OsmPrimitive prim : Main.main.getCurrentDataSet().allPrimitives()) {
                 if (House.isMatchable(prim) || Street.isMatchable(prim))
                     reasoner.update(prim);

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

@@ -22 +22 @@
      */
     public static void zoomToMany(Collection<OsmPrimitive> primitives) {
-        Main.ds.setSelected(primitives);
+        Main.main.getCurrentDataSet().setSelected(primitives);
         (new AutoScaleAction("selection")).actionPerformed(null);
     }
@@ -30 +30 @@
      */
     public static void zoomTo(OsmPrimitive primitive) {
-        Main.ds.setSelected(primitive);
+        Main.main.getCurrentDataSet().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.ds.addPrimitive(newNode);
-        Main.ds.setSelected(newNode);
+        Main.main.getCurrentDataSet().addPrimitive(newNode);
+        Main.main.getCurrentDataSet().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) {
-        Collection<OsmPrimitive> data = Main.ds.getSelected();
+        Collection<OsmPrimitive> data = Main.main.getCurrentDataSet().getSelected();
 
         if (data.size() != 1) return;

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

@@ -51 +51 @@
     public void actionPerformed(ActionEvent e) {
 
-        Collection<OsmPrimitive> selectedWays = Main.ds.getSelectedWays();
-        Collection<OsmPrimitive> newSelection = Main.ds.getSelected();
+        Collection<OsmPrimitive> selectedWays = Main.main.getCurrentDataSet().getSelectedWays();
+        Collection<OsmPrimitive> newSelection = Main.main.getCurrentDataSet().getSelected();
 
         for (OsmPrimitive prim : selectedWays) {
@@ -58 +58 @@
                 Way area = (Way) prim;
 
-            for (OsmPrimitive prim2 : Main.ds.allNonDeletedPrimitives()) {
+            for (OsmPrimitive prim2 : Main.main.getCurrentDataSet().allNonDeletedPrimitives()) {
                 if (!(prim2 instanceof Way)) continue;
                 if (prim2.equals(prim))      continue;
@@ -80 +80 @@
 
                 if (errorCode == 0) {
-                    Main.ds.addPrimitive(newArea1);
-                    Main.ds.addPrimitive(newArea2);
+                    Main.main.getCurrentDataSet().addPrimitive(newArea1);
+                    Main.main.getCurrentDataSet().addPrimitive(newArea2);
 
                     area.delete(true);
@@ -96 +96 @@
         }
 
-        Main.ds.setSelected(newSelection);
+        Main.main.getCurrentDataSet().setSelected(newSelection);
     }
 
@@ -124 +124 @@
         }
 
-        for (Relation relation : Main.ds.relations)
+        for (Relation relation : Main.main.getCurrentDataSet().relations)
             for (RelationMember areaMember : relation.members)
                 if (area.equals(areaMember.member))

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

@@ -83 +83 @@
 
         BoundingXYVisitor visitor = new BoundingXYVisitor();
-        for (OsmPrimitive op : Main.ds.allPrimitives()) {
+        for (OsmPrimitive op : Main.main.getCurrentDataSet().allPrimitives()) {
             if (op instanceof Node) {
                 ((Node) op).visit(visitor);
@@ -103 +103 @@
             System.out.println("AUTO: Center is " + center);
 
-        for (OsmPrimitive op : Main.ds.allPrimitives()) {
+        for (OsmPrimitive op : Main.main.getCurrentDataSet().allPrimitives()) {
 
             if (!(op instanceof Node)) {

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

@@ -47 +47 @@
 
         Capitalizator cap = new Capitalizator(
-                                Main.ds.allPrimitives(),
+                                Main.main.getCurrentDataSet().allPrimitives(),
                                 CzechAddressPlugin.getLocation().getStreets());
 

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

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

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

@@ -66 +66 @@
            way.remove(key);
 
-        Main.ds.addPrimitive(addrNode);
+        Main.main.getCurrentDataSet().addPrimitive(addrNode);
     }