Changeset 17550 in osm for applications

Timestamp:

2009-09-09T00:25:42+02:00 (15 years ago)

Author:

guggis

Message:

Updating to JOSM r2082

Location:

applications/editors/josm/plugins/utilsplugin

Files:

• build.xml (modified) (1 diff)
• src/UtilsPlugin/JoinAreasAction.java (modified) (6 diffs)

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

@@ -25 +25 @@
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Several utilities that make your life easier: e.g. simplify way, join areas, jump to position."/>
-                <attribute name="Plugin-Mainversion" value="2039"/>
+                <attribute name="Plugin-Mainversion" value="2082"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java

@@ -444 +444 @@
         for (Relation r : Main.main.getCurrentDataSet().relations) {
             if (r.isDeleted() || r.incomplete) continue;
-            for (RelationMember rm : r.members) {
-                if (rm.member != osm) continue;
+            for (RelationMember rm : r.getMembers()) {
+                if (rm.getMember() != osm) continue;
 
                 Relation newRel = new Relation(r);
-                newRel.members.remove(rm);
+                List<RelationMember> members = newRel.getMembers();
+                members.remove(rm);
+                newRel.setMembers(members);
 
                 cmds.add(new ChangeCommand(r, newRel));
-                RelationRole saverel =  new RelationRole(r, rm.role);
+                RelationRole saverel =  new RelationRole(r, rm.getRole());
                 if(!result.contains(saverel)) result.add(saverel);
                 break;
@@ -782 +784 @@
         newRel.put("type", "multipolygon");
         for(Way w : inner)
-            newRel.members.add(new RelationMember("inner", w));
+            newRel.addMember(new RelationMember("inner", w));
         cmds.add(new AddCommand(newRel));
 
@@ -811 +813 @@
             // Add it back!
             Relation newRel = new Relation(r.rel);
-            newRel.members.add(new RelationMember(r.role, outer));
+            newRel.addMember(new RelationMember(r.role, outer));
             cmds.add(new ChangeCommand(r.rel, newRel));
         }
@@ -822 +824 @@
                 // Found only one to be part of a multipolygon relation, so just add it back as well
                 newRel = new Relation(multiouters.get(0).rel);
-                newRel.members.add(new RelationMember(multiouters.get(0).role, outer));
+                newRel.addMember(new RelationMember(multiouters.get(0).role, outer));
                 cmds.add(new ChangeCommand(multiouters.get(0).rel, newRel));
                 return;
@@ -830 +832 @@
                 for(RelationRole r : multiouters) {
                     // Add members
-                    for(RelationMember rm : r.rel.members)
-                        if(!newRel.members.contains(rm)) newRel.members.add(rm);
+                    for(RelationMember rm : r.rel.getMembers())
+                        if(!newRel.getMembers().contains(rm)) newRel.addMember(rm);
                     // Add tags
                     for (String key : r.rel.keySet()) {
@@ -839 +841 @@
                     cmds.add(new DeleteCommand(r.rel));
                 }
-                newRel.members.add(new RelationMember("outer", outer));
+                newRel.addMember(new RelationMember("outer", outer));
                 cmds.add(new AddCommand(newRel));
         }