Changeset 1928 in josm for trunk/test/functional


Ignore:
Timestamp:
2009-08-08T11:32:27+02:00 (15 years ago)
Author:
jttt
Message:

Make parameterless RelationMember constructor deprecated

Location:
trunk/test/functional/org/openstreetmap/josm/io
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

    r1910 r1928  
    9595                int idx = (start + j) % 500;
    9696                Node n = nodes.get(idx);
    97                 RelationMember member = new RelationMember();
    98                 member.member = n;
    99                 member.role = "role-" + j;
    100                 r.members.add(member);
     97                r.members.add(new RelationMember("role-" + j, n));
    10198            }
    10299            int numWaysInRelation = (int)Math.round(Math.random() * 10);
     
    105102                int idx = (start + j) % 500;
    106103                Way w = ways.get(idx);
    107                 RelationMember member = new RelationMember();
    108                 member.member = w;
    109                 member.role = "role-" + j;
    110                 r.members.add(member);
     104                r.members.add(new RelationMember("role-" + j, w));
    111105            }
    112106            ds.addPrimitive(r);
  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

    r1925 r1928  
    8787            r.put("name", "relation-" +i);
    8888            for (int j =0; j < 10; j++) {
    89                 RelationMember member = new RelationMember();
    90                 member.role = "node-" + j;
    91                 member.member = lookupNode(ds, i + j);
     89                RelationMember member = new RelationMember("node-" + j, lookupNode(ds, i + j));
     90                r.members.add(member);
    9291            }
    9392            for (int j =0; j < 5; j++) {
    94                 RelationMember member = new RelationMember();
    95                 member.role = "way-" + j;
    96                 member.member = lookupWay(ds, i + j);
     93                RelationMember member = new RelationMember("way-" + j, lookupWay(ds, i + j));
    9794                r.members.add(member);
    9895            }
    9996            if (i > 5) {
    10097                for (int j =0; j < 3; j++) {
    101                     RelationMember member = new RelationMember();
    102                     member.role = "relation-" + j;
    103                     member.member = lookupRelation(ds, j);
     98                    RelationMember member = new RelationMember("relation-" + j, lookupRelation(ds, j));
    10499                    logger.info(MessageFormat.format("adding relation {0} to relation {1}", j, i));
    105100                    r.members.add(member);
Note: See TracChangeset for help on using the changeset viewer.