Changeset 8836 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
- Timestamp:
- 2015-10-08T00:22:36+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
r8512 r8836 435 435 class CopyStartLeftAction extends CopyAction { 436 436 437 publicCopyStartLeftAction() {437 CopyStartLeftAction() { 438 438 super(/* ICON(dialogs/conflict/)*/ "copystartleft", tr("> top"), 439 439 tr("Copy my selected nodes to the start of the merged node list")); … … 457 457 class CopyEndLeftAction extends CopyAction { 458 458 459 publicCopyEndLeftAction() {459 CopyEndLeftAction() { 460 460 super(/* ICON(dialogs/conflict/)*/ "copyendleft", tr("> bottom"), 461 461 tr("Copy my selected elements to the end of the list of merged elements.")); … … 479 479 class CopyBeforeCurrentLeftAction extends CopyAction { 480 480 481 publicCopyBeforeCurrentLeftAction() {481 CopyBeforeCurrentLeftAction() { 482 482 super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentleft", tr("> before"), 483 483 tr("Copy my selected elements before the first selected element in the list of merged elements.")); … … 509 509 class CopyAfterCurrentLeftAction extends CopyAction { 510 510 511 publicCopyAfterCurrentLeftAction() {511 CopyAfterCurrentLeftAction() { 512 512 super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentleft", tr("> after"), 513 513 tr("Copy my selected elements after the first selected element in the list of merged elements.")); … … 535 535 class CopyStartRightAction extends CopyAction { 536 536 537 publicCopyStartRightAction() {537 CopyStartRightAction() { 538 538 super(/* ICON(dialogs/conflict/)*/ "copystartright", tr("< top"), 539 539 tr("Copy their selected element to the start of the list of merged elements.")); … … 553 553 class CopyEndRightAction extends CopyAction { 554 554 555 publicCopyEndRightAction() {555 CopyEndRightAction() { 556 556 super(/* ICON(dialogs/conflict/)*/ "copyendright", tr("< bottom"), 557 557 tr("Copy their selected elements to the end of the list of merged elements.")); … … 571 571 class CopyBeforeCurrentRightAction extends CopyAction { 572 572 573 publicCopyBeforeCurrentRightAction() {573 CopyBeforeCurrentRightAction() { 574 574 super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentright", tr("< before"), 575 575 tr("Copy their selected elements before the first selected element in the list of merged elements.")); … … 597 597 class CopyAfterCurrentRightAction extends CopyAction { 598 598 599 publicCopyAfterCurrentRightAction() {599 CopyAfterCurrentRightAction() { 600 600 super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentright", tr("< after"), 601 601 tr("Copy their selected element after the first selected element in the list of merged elements")); … … 623 623 class CopyAllLeft extends AbstractAction implements Observer, PropertyChangeListener { 624 624 625 publicCopyAllLeft() {625 CopyAllLeft() { 626 626 ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallleft"); 627 627 putValue(Action.SMALL_ICON, icon); … … 652 652 class CopyAllRight extends AbstractAction implements Observer, PropertyChangeListener { 653 653 654 publicCopyAllRight() {654 CopyAllRight() { 655 655 ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallright"); 656 656 putValue(Action.SMALL_ICON, icon); … … 681 681 class MoveUpMergedAction extends AbstractAction implements ListSelectionListener { 682 682 683 publicMoveUpMergedAction() {683 MoveUpMergedAction() { 684 684 ImageIcon icon = ImageProvider.get("dialogs/conflict", "moveup"); 685 685 putValue(Action.SMALL_ICON, icon); … … 715 715 class MoveDownMergedAction extends AbstractAction implements ListSelectionListener { 716 716 717 publicMoveDownMergedAction() {717 MoveDownMergedAction() { 718 718 ImageIcon icon = ImageProvider.get("dialogs/conflict", "movedown"); 719 719 putValue(Action.SMALL_ICON, icon); … … 749 749 class RemoveMergedAction extends AbstractAction implements ListSelectionListener { 750 750 751 publicRemoveMergedAction() {751 RemoveMergedAction() { 752 752 ImageIcon icon = ImageProvider.get("dialogs/conflict", "remove"); 753 753 putValue(Action.SMALL_ICON, icon);
Note:
See TracChangeset
for help on using the changeset viewer.