From 7b78e2923e3ac25737449c543ca6be3f7e376a2c Mon Sep 17 00:00:00 2001 From: David Inglis Date: Fri, 12 Mar 2004 16:24:08 +0000 Subject: [PATCH] new C-Build console supporting mutiple streams. --- .../eclipse/cdt/internal/ui/CPerspectiveFactory.java | 7 ++++--- .../internal/ui/buildconsole/BuildConsoleManager.java | 1 - .../internal/ui/{ => buildconsole}/ConsoleEvent.java | 10 ++++------ .../src/org/eclipse/cdt/ui/CUIPlugin.java | 1 - 4 files changed, 8 insertions(+), 11 deletions(-) rename core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/{ => buildconsole}/ConsoleEvent.java (79%) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java index d2d37db56c8..c4daf7ba31d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java @@ -10,6 +10,7 @@ import org.eclipse.search.ui.SearchUI; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; +import org.eclipse.ui.console.IConsoleConstants; public class CPerspectiveFactory implements IPerspectiveFactory { @@ -27,13 +28,13 @@ public class CPerspectiveFactory implements IPerspectiveFactory { String editorArea = layout.getEditorArea(); IFolderLayout folder1= layout.createFolder("topLeft", IPageLayout.LEFT, (float)0.25, editorArea); //$NON-NLS-1$ + folder1.addView(CUIPlugin.CVIEW_ID); folder1.addView(IPageLayout.ID_RES_NAV); folder1.addPlaceholder(IPageLayout.ID_BOOKMARKS); - folder1.addView(CUIPlugin.CVIEW_ID); IFolderLayout folder2= layout.createFolder("bottom", IPageLayout.BOTTOM, (float)0.75, editorArea); //$NON-NLS-1$ folder2.addView(IPageLayout.ID_TASK_LIST); - folder2.addView(CUIPlugin.CONSOLE_ID); + folder2.addView(IConsoleConstants.ID_CONSOLE_VIEW); folder2.addView(IPageLayout.ID_PROP_SHEET); IFolderLayout folder3= layout.createFolder("topRight", IPageLayout.RIGHT,(float)0.75, editorArea); //$NON-NLS-1$ @@ -43,7 +44,7 @@ public class CPerspectiveFactory implements IPerspectiveFactory { layout.addActionSet(CUIPlugin.FOLDER_ACTION_SET_ID); // views - build console - layout.addShowViewShortcut(CUIPlugin.CONSOLE_ID); + layout.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW); // views - searching layout.addShowViewShortcut(SearchUI.SEARCH_RESULT_VIEW_ID); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java index 449c2e07f98..0ae739d0cac 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java @@ -13,7 +13,6 @@ package org.eclipse.cdt.internal.ui.buildconsole; import java.util.HashMap; import java.util.Map; -import org.eclipse.cdt.internal.ui.ConsoleEvent; import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.IBuildConsole; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ConsoleEvent.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleEvent.java similarity index 79% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ConsoleEvent.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleEvent.java index 14ab2d7b580..6e719875b0f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ConsoleEvent.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleEvent.java @@ -1,7 +1,4 @@ -/* - * (c) Copyright QNX Software System Ltd. 2002. - * All Rights Reserved. - */package org.eclipse.cdt.internal.ui; +package org.eclipse.cdt.internal.ui.buildconsole; import java.util.EventObject; @@ -9,9 +6,10 @@ import org.eclipse.cdt.ui.IBuildConsoleEvent; import org.eclipse.core.resources.IProject; public class ConsoleEvent extends EventObject implements IBuildConsoleEvent { + private IProject fProject; private int fType; - + public ConsoleEvent(Object source, IProject project, int type) { super(source); fProject = project; @@ -26,4 +24,4 @@ public class ConsoleEvent extends EventObject implements IBuildConsoleEvent { return fType; } -} +} \ No newline at end of file diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java index b9e7f45aed6..00738699111 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java @@ -72,7 +72,6 @@ public class CUIPlugin extends AbstractUIPlugin { public static final String PLUGIN_ID = "org.eclipse.cdt.ui"; //$NON-NLS-1$ public static final String PLUGIN_CORE_ID = "org.eclipse.cdt.core"; //$NON-NLS-1$ public static final String EDITOR_ID = PLUGIN_ID + ".editor.CEditor"; //$NON-NLS-1$ - public static final String CONSOLE_ID = PLUGIN_ID + ".BuildConsoleView"; //$NON-NLS-1$ public static final String CVIEW_ID = PLUGIN_ID + ".CView"; //$NON-NLS-1$ public static final String C_PROBLEMMARKER = PLUGIN_CORE_ID + ".problem"; //$NON-NLS-1$