Changeset 1928 in josm for trunk

Timestamp:

2009-08-08T11:32:27+02:00 (15 years ago)

Author:

jttt

Message:

Make parameterless RelationMember constructor deprecated

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/RelationMember.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmReader.java (modified) (5 diffs)
• test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) (2 diffs)
• test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -319 +319 @@
                         for(Way wayToAdd : newWays)
                         {
-                            RelationMember em = new RelationMember();
-                            em.member = wayToAdd;
-                            em.role = rm.role;
+                            RelationMember em = new RelationMember(rm.role, wayToAdd);
                             if(em.role != null && em.role.length() > 0 && !("multipolygon".equals(type))) {
                                 warnmerole = true;

trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java

@@ -15 +15 @@
     /**
      * Default constructor. Does nothing.
+     * @deprecated Use other constructors because RelationMember class will became immutable
+     * in the future
      */
+    @Deprecated
     public RelationMember() { }
 
@@ -38 +41 @@
     /**
      * Replies true, if this relation member refers to the primitive
-     * 
+     *
      * @param primitive  the primitive to check
      * @return true, if this relation member refers to the primitive

trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java

@@ -100 +100 @@
     @Override
     protected RelationMember cloneEntryForMergedList(RelationMember entry) {
-        RelationMember member = new RelationMember();
-        member.role = entry.role;
-        member.member = entry.member;
-        return member;
+        return new RelationMember(entry.role, entry.member);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -595 +595 @@
                                     if (rm.member == osm)
                                     {
-                                        RelationMember mem = new RelationMember();
-                                        mem.role = rm.role;
-                                        mem.member = rm.member;
+                                        RelationMember mem = new RelationMember(rm.role, rm.member);
                                         rel.members.remove(mem);
                                         break;

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -122 +122 @@
         public String type;
         public long id;
-        public RelationMember relationMember;
+        public String role;
     }
 
@@ -204 +204 @@
                         throw new SAXException(tr("Found <member> element in non-relation."));
                     RelationMemberData emd = new RelationMemberData();
-                    emd.relationMember = new RelationMember();
                     String value = atts.getValue("ref");
                     if (value == null)
@@ -220 +219 @@
                     emd.type= value;
                     value = atts.getValue("role");
-                    emd.relationMember.role = value;
+                    emd.role = value;
 
                     if (emd.id == 0)
@@ -393 +392 @@
      * and populate them later.
      */
-    private void createRelations() {
+    private void createRelations() throws SAXException {
 
         // pass 1 - create all relations
@@ -414 +413 @@
 
             for (RelationMemberData emd : e.getValue()) {
-                RelationMember em = emd.relationMember;
+                OsmPrimitive member;
                 if (emd.type.equals("node")) {
-                    em.member = findNode(emd.id);
-                    if (em.member == null) {
-                        em.member = new Node(emd.id);
-                        ds.addPrimitive(em.member);
+                    member = findNode(emd.id);
+                    if (member == null) {
+                        member = new Node(emd.id);
+                        ds.addPrimitive(member);
                     }
                 } else if (emd.type.equals("way")) {
-                    em.member = hm.get(emd.id);
-                    if (em.member == null) {
-                        em.member = findWay(emd.id);
-                    }
-                    if (em.member == null) {
-                        em.member = new Way(emd.id);
-                        ds.addPrimitive(em.member);
+                    member = hm.get(emd.id);
+                    if (member == null) {
+                        member = findWay(emd.id);
+                    }
+                    if (member == null) {
+                        member = new Way(emd.id);
+                        ds.addPrimitive(member);
                     }
                 } else if (emd.type.equals("relation")) {
-                    em.member = findRelation(emd.id);
-                    if (em.member == null) {
-                        em.member = new Relation(emd.id);
-                        ds.addPrimitive(em.member);
+                    member = findRelation(emd.id);
+                    if (member == null) {
+                        member = new Relation(emd.id);
+                        ds.addPrimitive(member);
                     }
                 } else {
-                    // this is an error.
+                    throw new SAXException(tr("Unknown relation member type {0}", emd.type));
                 }
-                en.members.add(em);
+                en.members.add(new RelationMember(emd.role, member));
             }
         }

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -95 +95 @@
                 int idx = (start + j) % 500;
                 Node n = nodes.get(idx);
-                RelationMember member = new RelationMember();
-                member.member = n;
-                member.role = "role-" + j;
-                r.members.add(member);
+                r.members.add(new RelationMember("role-" + j, n));
             }
             int numWaysInRelation = (int)Math.round(Math.random() * 10);
@@ -105 +102 @@
                 int idx = (start + j) % 500;
                 Way w = ways.get(idx);
-                RelationMember member = new RelationMember();
-                member.member = w;
-                member.role = "role-" + j;
-                r.members.add(member);
+                r.members.add(new RelationMember("role-" + j, w));
             }
             ds.addPrimitive(r);

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -87 +87 @@
             r.put("name", "relation-" +i);
             for (int j =0; j < 10; j++) {
-                RelationMember member = new RelationMember();
-                member.role = "node-" + j;
-                member.member = lookupNode(ds, i + j);
+                RelationMember member = new RelationMember("node-" + j, lookupNode(ds, i + j));
+                r.members.add(member);
             }
             for (int j =0; j < 5; j++) {
-                RelationMember member = new RelationMember();
-                member.role = "way-" + j;
-                member.member = lookupWay(ds, i + j);
+                RelationMember member = new RelationMember("way-" + j, lookupWay(ds, i + j));
                 r.members.add(member);
             }
             if (i > 5) {
                 for (int j =0; j < 3; j++) {
-                    RelationMember member = new RelationMember();
-                    member.role = "relation-" + j;
-                    member.member = lookupRelation(ds, j);
+                    RelationMember member = new RelationMember("relation-" + j, lookupRelation(ds, j));
                     logger.info(MessageFormat.format("adding relation {0} to relation {1}", j, i));
                     r.members.add(member);