Changeset 6367 in josm for trunk/src/org/openstreetmap/josm/actions
- Timestamp:
- 2013-11-05T23:12:52+01:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/actions
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
r6336 r6367 1296 1296 1297 1297 /** 1298 * This method filters the list of relations that form the multipolygons.1299 * @param relations all relations1300 * @param polygons polygons for filtering1301 * @return relations which don't form the polygons1302 */1303 private List<Relation> filterOwnMultipolygonRelations(Collection<Relation> relations, List<Multipolygon> polygons) {1304 1305 List<Relation> relationsToRemove = new ArrayList<Relation>();1306 1307 for (Multipolygon m : polygons) {1308 if (m.relation != null) {1309 relationsToRemove.add(m.relation);1310 }1311 }1312 1313 List<Relation> result = new ArrayList<Relation>();1314 1315 result.addAll(relations);1316 result.removeAll(relationsToRemove);1317 return result;1318 }1319 1320 /**1321 1298 * Will add own multipolygon relation to the "previously existing" relations. Fixup is done by fixRelations 1322 1299 * @param inner List of already closed inner ways -
trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
r6316 r6367 289 289 } 290 290 291 private boolean isValidModifierCombination() {292 // TODO: implement to give feedback on invalid modifier combination293 return true;294 }295 296 291 private boolean sanityCheck() { 297 292 // @formatter:off
Note:
See TracChangeset
for help on using the changeset viewer.