Changeset 1670 in josm for trunk/src/org/openstreetmap/josm/data/osm/Relation.java
- Timestamp:
- 2009-06-15T20:22:46+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/Relation.java
r1598 r1670 78 78 } 79 79 80 @Override 80 81 public String getName() { 81 82 String name; … … 84 85 } else { 85 86 name = get("type"); 86 if (name == null) 87 if (name == null) { 87 88 name = tr("relation"); 89 } 88 90 89 91 name += " ("; 90 if(names == null) 91 names = Main.pref.getCollection("relation.nameOrder", Arrays.asList(defnames)); 92 if(names == null) { 93 names = Main.pref.getCollection("relation.nameOrder", Arrays.asList(defnames)); 94 } 92 95 String nameTag = null; 93 96 for (String n : names) { 94 97 nameTag = get(n); 95 if (nameTag != null) break; 98 if (nameTag != null) { 99 break; 100 } 96 101 } 97 if (nameTag != null) 102 if (nameTag != null) { 98 103 name += "\"" + nameTag + "\", "; 104 } 99 105 100 106 int mbno = members.size(); 101 107 name += trn("{0} member", "{0} members", mbno, mbno) + ")"; 102 if(errors != null) 108 if(errors != null) { 103 109 name = "*"+name; 110 } 104 111 } 105 112 return name; … … 113 120 return false; 114 121 } 115 122 116 123 public RelationMember firstMember() { 117 124 if (incomplete) return null; … … 122 129 return (members.size() == 0) ? null : members.get(members.size() -1); 123 130 } 131 132 /** 133 * removes all members with member.member == primitive 134 * 135 * @param primitive the primitive to check for 136 */ 137 public void removeMembersFor(OsmPrimitive primitive) { 138 if (primitive == null) 139 return; 140 141 ArrayList<RelationMember> todelete = new ArrayList<RelationMember>(); 142 for (RelationMember member: members) { 143 if (member.member == primitive) { 144 todelete.add(member); 145 } 146 } 147 members.removeAll(todelete); 148 } 124 149 }
Note:
See TracChangeset
for help on using the changeset viewer.