Changeset 18413 in osm

Timestamp:

2009-11-02T08:46:24+01:00 (15 years ago)

Author:

jttt

Message:

Replace Dataset.nodes with getNodes(), etc

Location:

applications/editors/josm/plugins

Files:

• addrinterpolation/.classpath (added)
• addrinterpolation/.project (added)
• addrinterpolation/build.xml (modified) (1 diff)
• addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java (modified) (2 diffs)
• cadastre-fr/build.xml (modified) (1 diff)
• cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java (modified) (3 diffs)
• colorscheme/.classpath (added)
• colorscheme/.project (added)
• czechaddress/build.xml (modified) (1 diff)
• czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java (modified) (1 diff)

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

@@ -91 +91 @@
                 <attribute name="Plugin-Description" value="Group common Address Interpolation inputs in a single dialog,"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/AddrInterpolation"/>
-                <attribute name="Plugin-Mainversion" value="2350"/>
+                <attribute name="Plugin-Mainversion" value="2381"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

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

@@ -57 +57 @@
 
 /**
- * 
+ *
  */
 
@@ -516 +516 @@
                 DataSet currentDataSet = Main.main.getCurrentDataSet();
                 if (currentDataSet != null) {
-                        for (Relation relation : currentDataSet.relations) {
+                        for (Relation relation : currentDataSet.getRelations()) {
 
                                 String relationType = relation.get("type");

applications/editors/josm/plugins/cadastre-fr/build.xml

@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="A special handler for the French land registry WMS server."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/Cadastre"/>
-                <attribute name="Plugin-Mainversion" value="2327"/>
+                <attribute name="Plugin-Mainversion" value="2381"/>
                 <attribute name="Plugin-Stage" value="60"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java

@@ -110 +110 @@
                 Node nodeToAdd = new Node(Main.proj.eastNorth2latlon(eastNorth));
                 // check if new node is not already created by another new path
-                Node nearestNewNode = checkNearestNode(nodeToAdd, svgDataSet.nodes);
+                Node nearestNewNode = checkNearestNode(nodeToAdd, svgDataSet.getNodes());
                 if (nearestNewNode == nodeToAdd)
                     svgDataSet.addPrimitive(nearestNewNode);
@@ -128 +128 @@
 
         // simplify ways and check if we can reuse existing OSM nodes
-        for (Way wayToAdd : svgDataSet.ways)
+        for (Way wayToAdd : svgDataSet.getWays())
             new SimplifyWay().simplifyWay(wayToAdd, svgDataSet, 0.5);
         // check if the new way or its nodes is already in OSM layer
-        for (Node n : svgDataSet.nodes) {
-            Node nearestNewNode = checkNearestNode(n, Main.main.getCurrentDataSet().nodes);
+        for (Node n : svgDataSet.getNodes()) {
+            Node nearestNewNode = checkNearestNode(n, Main.main.getCurrentDataSet().getNodes());
             if (nearestNewNode != n) {
                 // replace the SVG node by the OSM node
-                for (Way w : svgDataSet.ways) {
+                for (Way w : svgDataSet.getWays()) {
                     int replaced = 0;
                     for (Node node : w.getNodes())
@@ -151 +151 @@
 
         Collection<Command> cmds = new LinkedList<Command>();
-        for (Node node : svgDataSet.nodes)
+        for (Node node : svgDataSet.getNodes())
             if (!node.isDeleted())
                 cmds.add(new AddCommand(node));
-        for (Way way : svgDataSet.ways)
+        for (Way way : svgDataSet.getWays())
             if (!way.isDeleted())
                 cmds.add(new AddCommand(way));

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="2323"/>
+            <attribute name="Plugin-Mainversion" value="2381"/>
             <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
         </manifest>

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

@@ -124 +124 @@
         }
 
-        for (Relation relation : Main.main.getCurrentDataSet().relations)
+        for (Relation relation : Main.main.getCurrentDataSet().getRelations())
             for (RelationMember areaMember : relation.getMembers())
                 if (area.equals(areaMember.getMember()))