Bug 565954: rename Last Edit Location to Previous Edit Location
Change-Id: I0baeef3d4eae193cf9af2c1c18854eb1839d9b4f
diff --git a/org.eclipse.ui.editors/plugin.properties b/org.eclipse.ui.editors/plugin.properties
index f21d49b..f57a9cd 100644
--- a/org.eclipse.ui.editors/plugin.properties
+++ b/org.eclipse.ui.editors/plugin.properties
@@ -82,8 +82,8 @@
spelling.label= Spelling Errors
revisionInfo.label= Revision Information
-goToLastEditPosition.label= Last Edit Lo&cation
-goToLastEditPosition.tooltip= Last Edit Location
+goToLastEditPosition.label= Previous Edit Lo&cation
+goToLastEditPosition.tooltip= Previous Edit Location
goToNextEditPosition.label= Next Edit Lo&cation
goToNextEditPosition.tooltip= Next Edit Location
diff --git a/org.eclipse.ui.editors/plugin.xml b/org.eclipse.ui.editors/plugin.xml
index 050a3d0..8029be7 100644
--- a/org.eclipse.ui.editors/plugin.xml
+++ b/org.eclipse.ui.editors/plugin.xml
@@ -470,19 +470,6 @@
id="org.eclipse.ui.edit.text.actionSet.navigation">
<action
toolbarPath="org.eclipse.ui.workbench.navigate/history.group"
- id="org.eclipse.ui.edit.text.gotoLastEditPosition"
- class="org.eclipse.ui.texteditor.GotoLastEditPositionAction"
- definitionId="org.eclipse.ui.edit.text.gotoLastEditPosition"
- disabledIcon="$nl$/icons/full/dtool16/last_edit_pos.png"
- icon="$nl$/icons/full/etool16/last_edit_pos.png"
- helpContextId="org.eclipse.ui.goto_last_edit_position_action_context"
- label="%goToLastEditPosition.label"
- menubarPath="navigate/"
- tooltip="%goToLastEditPosition.tooltip"
- initialEnabled="false">
- </action>
- <action
- toolbarPath="org.eclipse.ui.workbench.navigate/history.group"
id="org.eclipse.ui.edit.text.gotoNextEditPosition"
class="org.eclipse.ui.texteditor.GotoNextEditPositionAction"
definitionId="org.eclipse.ui.edit.text.gotoNextEditPosition"
@@ -494,6 +481,19 @@
tooltip="%goToNextEditPosition.tooltip"
initialEnabled="false">
</action>
+ <action
+ toolbarPath="org.eclipse.ui.workbench.navigate/history.group"
+ id="org.eclipse.ui.edit.text.gotoLastEditPosition"
+ class="org.eclipse.ui.texteditor.GotoLastEditPositionAction"
+ definitionId="org.eclipse.ui.edit.text.gotoLastEditPosition"
+ disabledIcon="$nl$/icons/full/dtool16/last_edit_pos.png"
+ icon="$nl$/icons/full/etool16/last_edit_pos.png"
+ helpContextId="org.eclipse.ui.goto_last_edit_position_action_context"
+ label="%goToLastEditPosition.label"
+ menubarPath="navigate/"
+ tooltip="%goToLastEditPosition.tooltip"
+ initialEnabled="false">
+ </action>
</actionSet>
<actionSet
label="%conversionActionSet.label"
diff --git a/org.eclipse.ui.workbench.texteditor/plugin.properties b/org.eclipse.ui.workbench.texteditor/plugin.properties
index fea5ab0..3f41239 100644
--- a/org.eclipse.ui.workbench.texteditor/plugin.properties
+++ b/org.eclipse.ui.workbench.texteditor/plugin.properties
@@ -65,8 +65,8 @@
lowerCase.description= Changes the selection to lower case
lowerCase.label= To Lower Case
-goToLastEditPosition.label= Last Edit Location
-goToLastEditPosition.description= Last edit location
+goToLastEditPosition.label= Previous Edit Location
+goToLastEditPosition.description= Previous edit location
goToNextEditPosition.label= Next Edit Location
goToNextEditPosition.description= Next edit location
@@ -199,4 +199,4 @@
blockSelectionModeFont.label= Text Editor Block Selection Font
blockSelectionModeFont.description= The block selection mode font is used by text editors in block (column) mode. A monospace font should be used.
-MinimapView.name=Minimap
\ No newline at end of file
+MinimapView.name=Minimap
diff --git a/org.eclipse.ui.workbench.texteditor/plugin.xml b/org.eclipse.ui.workbench.texteditor/plugin.xml
index 6f1263c..e67ae0a 100644
--- a/org.eclipse.ui.workbench.texteditor/plugin.xml
+++ b/org.eclipse.ui.workbench.texteditor/plugin.xml
@@ -597,11 +597,6 @@
commandId="org.eclipse.ui.edit.text.gotoLastEditPosition"
contextId="org.eclipse.ui.contexts.window"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="CTRL+Q"/>
- <key
- commandId="org.eclipse.ui.edit.text.gotoLastEditPosition"
- contextId="org.eclipse.ui.contexts.window"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="M3+CTRL+ARROW_LEFT"/>
<key
commandId="org.eclipse.ui.edit.text.gotoNextEditPosition"
@@ -609,6 +604,11 @@
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="M3+CTRL+ARROW_RIGHT"/>
<key
+ commandId="org.eclipse.ui.edit.text.gotoLastEditPosition"
+ contextId="org.eclipse.ui.contexts.window"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="CTRL+Q"/><!-- legacy mapping -->
+ <key
commandId="org.eclipse.ui.edit.text.smartEnter"
contextId="org.eclipse.ui.textEditorScope"
sequence="M2+CR"
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoLastEditPositionAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoLastEditPositionAction.java
index 7fe3cc2..c816dfd 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoLastEditPositionAction.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoLastEditPositionAction.java
@@ -97,7 +97,7 @@
editor = page.openEditor(editPosition.getEditorInput(), editPosition.getEditorId());
} catch (PartInitException ex) {
IStatus status = new Status(IStatus.ERROR, TextEditorPlugin.PLUGIN_ID, IStatus.OK,
- "Go to Last Edit Location failed", ex); //$NON-NLS-1$
+ "Go to Previous Edit Location failed", ex); //$NON-NLS-1$
TextEditorPlugin.getDefault().getLog().log(status);
return;
}
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoNextEditPositionAction.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoNextEditPositionAction.java
index 23ff43f..38981c4 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoNextEditPositionAction.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/GotoNextEditPositionAction.java
@@ -97,7 +97,7 @@
editor = page.openEditor(editPosition.getEditorInput(), editPosition.getEditorId());
} catch (PartInitException ex) {
IStatus status = new Status(IStatus.ERROR, TextEditorPlugin.PLUGIN_ID, IStatus.OK,
- "Go to Last Edit Location failed", ex); //$NON-NLS-1$
+ "Go to Next Edit Location failed", ex); //$NON-NLS-1$
TextEditorPlugin.getDefault().getLog().log(status);
return;
}
