From 44008336e461fc8da0ac52a1892fe5cd430f114f Mon Sep 17 00:00:00 2001 From: Warren Paul Date: Mon, 31 Mar 2008 16:51:55 +0000 Subject: [PATCH] fixed bug #215285. --- core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF | 3 ++- .../src/org/eclipse/cdt/internal/ui/CPerspectiveFactory.java | 5 ++--- .../src/org/eclipse/cdt/internal/ui/editor/CEditor.java | 3 ++- .../eclipse/cdt/internal/ui/includebrowser/IBViewPart.java | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF index 370cdd905fd..bfc38b4679c 100644 --- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF @@ -92,7 +92,8 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)", org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)", org.eclipse.ltk.core.refactoring;bundle-version="3.4.0", - org.eclipse.ltk.ui.refactoring;bundle-version="3.4.0" + org.eclipse.ltk.ui.refactoring;bundle-version="3.4.0", + org.eclipse.ui.navigator.resources;bundle-version="3.3.100" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.ibm.icu.text 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 5a4354be135..a781609c10b 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 @@ -19,11 +19,10 @@ import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; import org.eclipse.ui.console.IConsoleConstants; +import org.eclipse.ui.navigator.resources.ProjectExplorer; public class CPerspectiveFactory implements IPerspectiveFactory { - private static final String ID_PROJECT_EXPLORER = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$ - /** * Constructs a new Default layout engine. */ @@ -38,7 +37,7 @@ 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(ID_PROJECT_EXPLORER); + folder1.addView(ProjectExplorer.VIEW_ID); folder1.addPlaceholder(CUIPlugin.CVIEW_ID); folder1.addPlaceholder(IPageLayout.ID_RES_NAV); folder1.addPlaceholder(IPageLayout.ID_BOOKMARKS); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java index fd0c767fc1d..7fcf3479008 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java @@ -133,6 +133,7 @@ import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.editors.text.TextEditor; import org.eclipse.ui.ide.IGotoMarker; import org.eclipse.ui.navigator.ICommonMenuConstants; +import org.eclipse.ui.navigator.resources.ProjectExplorer; import org.eclipse.ui.part.EditorActionBarContributor; import org.eclipse.ui.part.IShowInSource; import org.eclipse.ui.part.IShowInTargetList; @@ -1396,7 +1397,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC else if (required == IShowInTargetList.class) { return new IShowInTargetList() { public String[] getShowInTargetIds() { - return new String[] { CUIPlugin.CVIEW_ID, IPageLayout.ID_OUTLINE, IPageLayout.ID_RES_NAV }; + return new String[] { ProjectExplorer.VIEW_ID, IPageLayout.ID_OUTLINE, IPageLayout.ID_RES_NAV }; } }; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java index 5c1e7e80c6b..cde9983f815 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java @@ -67,6 +67,7 @@ import org.eclipse.ui.actions.ContributionItemFactory; import org.eclipse.ui.actions.OpenFileAction; import org.eclipse.ui.contexts.IContextActivation; import org.eclipse.ui.contexts.IContextService; +import org.eclipse.ui.navigator.resources.ProjectExplorer; import org.eclipse.ui.part.IShowInSource; import org.eclipse.ui.part.IShowInTarget; import org.eclipse.ui.part.IShowInTargetList; @@ -805,7 +806,7 @@ public class IBViewPart extends ViewPart public String[] getShowInTargetIds() { return new String[] { - CUIPlugin.CVIEW_ID, + ProjectExplorer.VIEW_ID, IPageLayout.ID_RES_NAV }; }