Changeset 1898 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2009-08-03T21:18:50+02:00 (15 years ago)

Author:

jttt

Message:

Way refactoring - rewritten another parts of code to the new nodes api

Location:

trunk/src/org/openstreetmap/josm/gui/conflict

Files:

• nodes/NodeListMergeModel.java (modified) (3 diffs)
• properties/PropertiesMergeModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java

@@ -23 +23 @@
      * Populates the model with the nodes in the two {@see Way}s <code>my</code> and
      * <code>their</code>.
-     * 
+     *
      * @param my  my way (i.e. the way in the local dataset)
      * @param their their way (i.e. the way in the server dataset)
@@ -37 +37 @@
         getMyEntries().clear();
         getTheirEntries().clear();
-        for (Node n : my.nodes) {
+        for (Node n : my.getNodes()) {
             getMyEntries().add(n);
         }
-        for (Node n : their.nodes) {
+        for (Node n : their.getNodes()) {
             getTheirEntries().add(n);
         }
@@ -55 +55 @@
     /**
      * Builds the command to resolve conflicts in the node list of a way
-     * 
+     *
      * @param my  my way. Must not be null.
      * @param their  their way. Must not be null

trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java

@@ -533 +533 @@
 
         HashMap<Long,OsmPrimitive> candidates = new HashMap<Long,OsmPrimitive>();
-        for (Node n : way.nodes) {
+        for (Node n : way.getNodes()) {
             if (n.id > 0 && ! candidates.values().contains(n)) {
                 candidates.put(n.id, n);