RCP migration

4 files changed, 53 insertions, 42 deletions

diff --git a/org.eclipse.ui.console/.classpath b/org.eclipse.ui.console/.classpath
index d2cdb1bc5..cd1463d1b 100644
--- a/org.eclipse.ui.console/.classpath
+++ b/org.eclipse.ui.console/.classpath
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.jface.text"/>
-    <classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="/org.eclipse.core.resources"/>
+	<classpathentry kind="src" path="/org.eclipse.ui"/>
+	<classpathentry kind="src" path="/org.eclipse.jface.text"/>
+	<classpathentry kind="src" path="/org.eclipse.help"/>
+	<classpathentry kind="src" path="/org.eclipse.ui.workbench.texteditor"/>
+	<classpathentry kind="src" path="/org.eclipse.core.boot"/>
+	<classpathentry kind="src" path="/org.eclipse.core.runtime"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.ui.console/.project b/org.eclipse.ui.console/.project
index f33fa8688..1c96d339a 100644
--- a/org.eclipse.ui.console/.project
+++ b/org.eclipse.ui.console/.project
@@ -4,9 +4,12 @@
 	<comment></comment>
 	<projects>
 		<project>org.eclipse.core.boot</project>
+		<project>org.eclipse.core.resources</project>
 		<project>org.eclipse.core.runtime</project>
+		<project>org.eclipse.help</project>
 		<project>org.eclipse.jface.text</project>
 		<project>org.eclipse.ui</project>
+		<project>org.eclipse.ui.workbench.texteditor</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/org.eclipse.ui.console/plugin.xml b/org.eclipse.ui.console/plugin.xml
index a8c8a4e96..9e60d4c45 100644
--- a/org.eclipse.ui.console/plugin.xml
+++ b/org.eclipse.ui.console/plugin.xml
@@ -1,34 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin
-	id="org.eclipse.ui.console"
-	name="%pluginName"
-	version="3.0.0"
-	provider-name="%providerName"
-	class="org.eclipse.ui.console.ConsolePlugin">
+   id="org.eclipse.ui.console"
+   name="%pluginName"
+   version="3.0.0"
+   provider-name="%providerName"
+   class="org.eclipse.ui.console.ConsolePlugin">
 
-	<runtime>
-		<library name="console.jar">
-			<export name="*"/>
-			<packages prefixes="org.eclipse.ui.console, org.eclipse.ui.internal.console"/>
-		</library>
-	</runtime>
-	<requires>
-		<import plugin="org.eclipse.core.resources"/>
-		<import plugin="org.eclipse.ui"/>
-		<import plugin="org.eclipse.jface.text"/>
-		<import plugin="org.eclipse.help"/>
+   <runtime>
+      <library name="console.jar">
+         <export name="*"/>
+         <packages prefixes="org.eclipse.ui.console, org.eclipse.ui.internal.console"/>
+      </library>
+   </runtime>
+   <requires>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.help"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
    </requires>
-	<extension
-		point="org.eclipse.ui.views">
-    	<view
-			name="%ConsoleView.name"
-			icon="icons/full/cview16/console_view.gif"
-			category="org.eclipse.ui"
-			class="org.eclipse.ui.internal.console.ConsoleView"
-			id="org.eclipse.ui.console.ConsoleView">
-		</view>
-	</extension>
-	<extension
+
+
+   <extension
+         point="org.eclipse.ui.views">
+      <view
+            name="%ConsoleView.name"
+            icon="icons/full/cview16/console_view.gif"
+            category="org.eclipse.ui"
+            class="org.eclipse.ui.internal.console.ConsoleView"
+            id="org.eclipse.ui.console.ConsoleView">
+      </view>
+   </extension>
+   <extension
          point="org.eclipse.ui.fontDefinitions">
       <fontDefinition
             label="%ConsoleFontDefinition.label"
@@ -39,4 +42,5 @@
          </description>
       </fontDefinition>
    </extension>
+
 </plugin>
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/MessageConsolePage.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/MessageConsolePage.java
index a8f336068..14d23af8a 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/MessageConsolePage.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/MessageConsolePage.java
@@ -42,6 +42,7 @@ import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.console.ConsolePlugin;
 import org.eclipse.ui.console.IConsoleConstants;
 import org.eclipse.ui.console.IConsoleView;
@@ -178,10 +179,10 @@ public class MessageConsolePage implements IPageBookViewPage, IAdaptable, IPrope
 	 * @param menu menu
 	 */
 	protected void contextMenuAboutToShow(IMenuManager menu) {
-		menu.add((IAction)fGlobalActions.get(IWorkbenchActionConstants.COPY));
-		menu.add((IAction)fGlobalActions.get(IWorkbenchActionConstants.SELECT_ALL));						
+		menu.add((IAction)fGlobalActions.get(ActionFactory.COPY.getId()));
+		menu.add((IAction)fGlobalActions.get(ActionFactory.SELECT_ALL.getId()));						
 		menu.add(new Separator("FIND")); //$NON-NLS-1$
-		menu.add((IAction)fGlobalActions.get(IWorkbenchActionConstants.FIND));
+		menu.add((IAction)fGlobalActions.get(ActionFactory.FIND.getId()));
 		menu.add((IAction)fGlobalActions.get(ITextEditorActionConstants.GOTO_LINE));
 		menu.add(fClearOutputAction);
 		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
@@ -226,14 +227,14 @@ public class MessageConsolePage implements IPageBookViewPage, IAdaptable, IPrope
 		action.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
 		action.setDisabledImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY_DISABLED));
 		action.setHoverImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY_HOVER));		
-		setGlobalAction(actionBars, IWorkbenchActionConstants.COPY, action);
+		setGlobalAction(actionBars, ActionFactory.COPY.getId(), action);
 		action= new TextViewerAction(getViewer(), ITextOperationTarget.SELECT_ALL);
 		action.configureAction(ConsoleMessages.getString("MessageConsolePage.Select_&All@Ctrl+A_12"), ConsoleMessages.getString("MessageConsolePage.Select_All"), ConsoleMessages.getString("MessageConsolePage.Select_All")); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
-		setGlobalAction(actionBars, IWorkbenchActionConstants.SELECT_ALL, action);
+		setGlobalAction(actionBars, ActionFactory.SELECT_ALL.getId(), action);
 		
 		//XXX Still using "old" resource access
 		ResourceBundle bundle= ResourceBundle.getBundle("org.eclipse.ui.internal.console.ConsoleMessages"); //$NON-NLS-1$
-		setGlobalAction(actionBars, IWorkbenchActionConstants.FIND, new FindReplaceAction(bundle, "find_replace_action.", getConsoleView())); //$NON-NLS-1$
+		setGlobalAction(actionBars, ActionFactory.FIND.getId(), new FindReplaceAction(bundle, "find_replace_action.", getConsoleView())); //$NON-NLS-1$
 	
 		action= new TextViewerGotoLineAction(getViewer());
 		setGlobalAction(actionBars, ITextEditorActionConstants.GOTO_LINE, action);
@@ -252,8 +253,8 @@ public class MessageConsolePage implements IPageBookViewPage, IAdaptable, IPrope
 			}
 		});
 		
-		fSelectionActions.add(IWorkbenchActionConstants.COPY);
-		fSelectionActions.add(IWorkbenchActionConstants.FIND);
+		fSelectionActions.add(ActionFactory.COPY.getId());
+		fSelectionActions.add(ActionFactory.FIND.getId());
 	}
 	
 	protected void updateSelectionDependentActions() {