- Timestamp:
- 2015-06-11T00:37:42+02:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
r8460 r8486 600 600 601 601 //create multipolygon relation, if necessary. 602 RelationRole ownMultipolygonRelation = addOwnMultigonRelation(resultPol.innerWays , resultPol.outerWay);602 RelationRole ownMultipolygonRelation = addOwnMultipolygonRelation(resultPol.innerWays); 603 603 604 604 //add back the original relations, merged with our new multipolygon relation … … 1370 1370 * Will add own multipolygon relation to the "previously existing" relations. Fixup is done by fixRelations 1371 1371 * @param inner List of already closed inner ways 1372 * @param outer The outer way1373 1372 * @return The list of relation with roles to add own relation to 1374 1373 */ 1375 private RelationRole addOwnMultigonRelation(Collection<Way> inn er, Way outer) {1374 private RelationRole addOwnMultipolygonRelation(Collection<Way> inner) { 1376 1375 if (inner.isEmpty()) return null; 1377 1376 // Create new multipolygon relation and add all inner ways to it -
trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
r8444 r8486 308 308 } 309 309 310 private void finishDrag( int x, int y) {310 private void finishDrag() { 311 311 if (dragUnderway) { 312 312 clearDragState(); … … 368 368 @Override 369 369 public void mouseReleased(MouseEvent e) { 370 finishDrag( e.getX(), e.getY());370 finishDrag(); 371 371 } 372 372 @Override
Note:
See TracChangeset
for help on using the changeset viewer.