Changeset 4191 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
- Timestamp:
- 2011-07-01T09:32:56+02:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
r4152 r4191 61 61 */ 62 62 public class SelectAction extends MapMode implements SelectionEnded { 63 //static private final Logger logger = Logger.getLogger(SelectAction.class.getName());64 65 63 enum Mode { move, rotate, scale, select } 66 64 … … 401 399 @Override 402 400 public void mousePressed(MouseEvent e) { 403 debug("mousePressed: e.getPoint()=" + e.getPoint());404 405 401 // return early 406 402 if (!mv.isActiveLayerVisible() || !(Boolean) this.getValue("active") || e.getButton() != MouseEvent.BUTTON1) { … … 470 466 @Override 471 467 public void mouseReleased(MouseEvent e) { 472 debug("mouseReleased: e.getPoint()=" + e.getPoint());473 474 468 if (!mv.isActiveLayerVisible()) { 475 469 return; … … 567 561 OsmPrimitive nxt = null; 568 562 569 debug("cyclePrims(): entry.....");570 for (OsmPrimitive osm : prims) {571 debug("cyclePrims(): prims id=" + osm.getId());572 }573 574 563 if (prims.size() > 1) { 575 564 boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; … … 583 572 if (cyclePrims && shift) { 584 573 if (!(nxt = i.next()).isSelected()) { 585 debug("cyclePrims(): taking " + nxt.getId());586 574 break; // take first primitive in prims list not in sel 587 575 } … … 593 581 nxt = i.hasNext() ? i.next() : first; 594 582 } 595 debug("selectPrims(): taking " + nxt.getId());596 583 break; // take next primitive in prims list 597 584 } … … 606 593 ds.clearSelection(prims); 607 594 cycleStart = foundInDS; 608 debug("selectPrims(): cycleStart set to foundInDS=" + cycleStart.getId());609 595 } else if (cycleStart.equals(nxt)) { 610 596 // loop detected, insert deselect step 611 597 ds.addSelected(nxt); 612 debug("selectPrims(): cycleStart hit");613 598 } 614 599 } else { … … 616 601 nxt = (prims.contains(cycleStart)) ? cycleStart : first; 617 602 cycleStart = nxt; 618 debug("selectPrims(): cycleStart set to nxt=" + cycleStart.getId());619 603 } 620 604 } else { 621 605 cycleStart = null; 622 606 } 623 624 debug("cyclePrims(): truncated prims list to id=" + nxt.getId());625 607 } 626 608 … … 701 683 return l instanceof OsmDataLayer; 702 684 } 703 704 private static void debug(String s) {705 //System.err.println("SelectAction:" + s);706 }707 685 }
Note:
See TracChangeset
for help on using the changeset viewer.