Changeset 9452 in josm

Timestamp:

2016-01-14T23:19:57+01:00 (8 years ago)

Author:

simon04

Message:

see #12338 - Typo

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -129 +129 @@
         popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("conflict"));
 
-        final ResolveTpMyVersionAction resolveTpMyVersionAction = new ResolveTpMyVersionAction();
+        final ResolveToMyVersionAction resolveToMyVersionAction = new ResolveToMyVersionAction();
         final ResolveToTheirVersionAction resolveToTheirVersionAction = new ResolveToTheirVersionAction();
-        addListSelectionListener(resolveTpMyVersionAction);
+        addListSelectionListener(resolveToMyVersionAction);
         addListSelectionListener(resolveToTheirVersionAction);
-        final JMenuItem btnResolveMy = popupMenuHandler.addAction(resolveTpMyVersionAction);
+        final JMenuItem btnResolveMy = popupMenuHandler.addAction(resolveToMyVersionAction);
         final JMenuItem btnResolveTheir = popupMenuHandler.addAction(resolveToTheirVersionAction);
 
@@ -539 +539 @@
     }
 
-    class ResolveTpMyVersionAction extends ResolveToAction {
-        ResolveTpMyVersionAction() {
+    class ResolveToMyVersionAction extends ResolveToAction {
+        ResolveToMyVersionAction() {
             super(tr("Resolve to my versions"), tr("Resolves all unresolved conflicts to ''my'' version"),
                     MergeDecisionType.KEEP_MINE);