- Timestamp:
- 2008-09-04T13:37:45+02:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java
r846 r926 240 240 newSelection.add(selectedWay); 241 241 242 Collection<Way> newWays = new ArrayList<Way>(); 242 243 // Second, create new ways 243 244 while (chunkIt.hasNext()) { … … 248 249 wayToAdd.checkDirectionTagged(); 249 250 } 251 newWays.add(wayToAdd); 250 252 wayToAdd.nodes.addAll(chunkIt.next()); 251 253 commandList.add(new AddCommand(wayToAdd)); … … 253 255 newSelection.add(wayToAdd); 254 256 255 Boolean warnme=false; 256 // now copy all relations to new way also 257 for (Relation r : Main.ds.relations) { 258 if (r.deleted || r.incomplete) continue; 259 for (RelationMember rm : r.members) { 260 if (rm.member instanceof Way) { 261 if (rm.member == selectedWay) 257 } 258 Boolean warnme=false; 259 // now copy all relations to new way also 260 for (Relation r : Main.ds.relations) { 261 if (r.deleted || r.incomplete) continue; 262 for (RelationMember rm : r.members) { 263 if (rm.member instanceof Way) { 264 if (rm.member == selectedWay) 265 { 266 Relation c = new Relation(r); 267 for(Way wayToAdd : newWays) 262 268 { 263 Relation c = new Relation(r);264 269 RelationMember em = new RelationMember(); 265 270 em.member = wayToAdd; … … 268 273 warnme = true; 269 274 c.members.add(em); 270 commandList.add(new ChangeCommand(r, c));271 break;272 275 } 276 commandList.add(new ChangeCommand(r, c)); 277 break; 273 278 } 274 279 } 275 280 } 276 if(warnme)277 JOptionPane.showMessageDialog(Main.parent, tr("A role based relation membership was copied to both new ways.\nYou should verify this and correct it when necessary."));278 }281 } 282 if(warnme) 283 JOptionPane.showMessageDialog(Main.parent, tr("A role based relation membership was copied to all new ways.\nYou should verify this and correct it when necessary.")); 279 284 280 285 NameVisitor v = new NameVisitor();
Note:
See TracChangeset
for help on using the changeset viewer.