Fixed bug 268950: [Commands] New APIs in IWorkbenchCommandConstants are missing '_' separators

5 files changed, 11 insertions, 11 deletions

diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java
index 8f7d2941136..9480b18bd0e 100644
--- a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java
+++ b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java
@@ -1102,7 +1102,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch
 		fRemoveSelectedMatches.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_DELETE);
 		fShowNextAction.setActionDefinitionId(IWorkbenchCommandConstants.NAVIGATE_NEXT);
 		fShowPreviousAction.setActionDefinitionId(IWorkbenchCommandConstants.NAVIGATE_PREVIOUS);
-		fSelectAllAction.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_SELECTALL);
+		fSelectAllAction.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_SELECT_ALL);
 	}
 
 	/**
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java
index 30dcd3885fd..0715c3fdc85 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java
@@ -647,7 +647,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I
 
 		IBindingService bindingService= (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class);
 		if (bindingService != null)
-			keyBinding= bindingService.getBestActiveBindingFormattedFor(IWorkbenchCommandConstants.NAVIGATE_SHOWINQUICKMENU);
+			keyBinding= bindingService.getBestActiveBindingFormattedFor(IWorkbenchCommandConstants.NAVIGATE_SHOW_IN_QUICK_MENU);
 
 		if (keyBinding == null)
 			keyBinding= ""; //$NON-NLS-1$
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
index 76c229871de..8db4cf68e0b 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/AbstractDecoratedTextEditor.java
@@ -1096,12 +1096,12 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor {
 
 		ResourceAction action= new AddMarkerAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.AddBookmark.", this, IMarker.BOOKMARK, true); //$NON-NLS-1$
 		action.setHelpContextId(ITextEditorHelpContextIds.BOOKMARK_ACTION);
-		action.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_ADDBOOKMARK);
+		action.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_ADD_BOOKMARK);
 		setAction(IDEActionFactory.BOOKMARK.getId(), action);
 
 		action= new AddTaskAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.AddTask.", this); //$NON-NLS-1$
 		action.setHelpContextId(ITextEditorHelpContextIds.ADD_TASK_ACTION);
-		action.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_ADDTASK);
+		action.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_ADD_TASK);
 		setAction(IDEActionFactory.ADD_TASK.getId(), action);
 
 		action= new ChangeEncodingAction(TextEditorMessages.getBundleForConstructedKeys(), "Editor.ChangeEncodingAction.", this); //$NON-NLS-1$
@@ -1731,7 +1731,7 @@ public abstract class AbstractDecoratedTextEditor extends StatusTextEditor {
 
 		IBindingService bindingService= (IBindingService)PlatformUI.getWorkbench().getAdapter(IBindingService.class);
 		if (bindingService != null)
-			keyBinding= bindingService.getBestActiveBindingFormattedFor(IWorkbenchCommandConstants.NAVIGATE_SHOWINQUICKMENU);
+			keyBinding= bindingService.getBestActiveBindingFormattedFor(IWorkbenchCommandConstants.NAVIGATE_SHOW_IN_QUICK_MENU);
 
 		if (keyBinding == null)
 			keyBinding= ""; //$NON-NLS-1$
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
index 73701d26b06..5ce8fc29865 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
@@ -5623,7 +5623,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
 
 		action= new TextOperationAction(EditorMessages.getBundleForConstructedKeys(), "Editor.SelectAll.", this, ITextOperationTarget.SELECT_ALL, true); //$NON-NLS-1$
 		action.setHelpContextId(IAbstractTextEditorHelpContextIds.SELECT_ALL_ACTION);
-		action.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_SELECTALL);
+		action.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_SELECT_ALL);
 		setAction(ITextEditorActionConstants.SELECT_ALL, action);
 
 		action= new ShiftAction(EditorMessages.getBundleForConstructedKeys(), "Editor.ShiftRight.", this, ITextOperationTarget.SHIFT_RIGHT); //$NON-NLS-1$
@@ -5650,7 +5650,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
 
 		action= new FindReplaceAction(EditorMessages.getBundleForConstructedKeys(), "Editor.FindReplace.", this); //$NON-NLS-1$
 		action.setHelpContextId(IAbstractTextEditorHelpContextIds.FIND_ACTION);
-		action.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_FINDANDREPLACE);
+		action.setActionDefinitionId(IWorkbenchCommandConstants.EDIT_FIND_AND_REPLACE);
 		setAction(ITextEditorActionConstants.FIND, action);
 
 		action= new FindNextAction(EditorMessages.getBundleForConstructedKeys(), "Editor.FindNext.", this, true); //$NON-NLS-1$
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IWorkbenchActionDefinitionIds.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IWorkbenchActionDefinitionIds.java
index 83359e03ded..986124b7ec3 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IWorkbenchActionDefinitionIds.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IWorkbenchActionDefinitionIds.java
@@ -127,7 +127,7 @@ public interface IWorkbenchActionDefinitionIds {
 	 * 
 	 * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_SELECTALL}
 	 */
-	public static final String SELECT_ALL= IWorkbenchCommandConstants.EDIT_SELECTALL;
+	public static final String SELECT_ALL= IWorkbenchCommandConstants.EDIT_SELECT_ALL;
 
 	/**
 	 * Action definition id of the edit find/replace action.
@@ -135,7 +135,7 @@ public interface IWorkbenchActionDefinitionIds {
 	 * 
 	 * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_FINDANDREPLACE}
 	 */
-	public static final String FIND_REPLACE= IWorkbenchCommandConstants.EDIT_FINDANDREPLACE;
+	public static final String FIND_REPLACE= IWorkbenchCommandConstants.EDIT_FIND_AND_REPLACE;
 
 	/**
 	 * Action definition id of the edit add bookmark action.
@@ -143,7 +143,7 @@ public interface IWorkbenchActionDefinitionIds {
 	 * 
 	 * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_ADDBOOKMARK}
 	 */
-	public static final String ADD_BOOKMARK= IWorkbenchCommandConstants.EDIT_ADDBOOKMARK;
+	public static final String ADD_BOOKMARK= IWorkbenchCommandConstants.EDIT_ADD_BOOKMARK;
 
 	/**
 	 * Action definition id of the edit add task action.
@@ -151,7 +151,7 @@ public interface IWorkbenchActionDefinitionIds {
 	 * 
 	 * @deprecated As of 3.5, replaced by {@link IWorkbenchCommandConstants#EDIT_ADDTASK}
 	 */
-	public static final String ADD_TASK= IWorkbenchCommandConstants.EDIT_ADDTASK;
+	public static final String ADD_TASK= IWorkbenchCommandConstants.EDIT_ADD_TASK;
 
 	/**
 	 * The command identifier for the "move" action that typically appears in the file menu.