[310952] StructuredTextEditor doesn't return all ITextEditorExtension* interfaces as adapters
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextEditor.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextEditor.java
index 69e2877..1e8b207 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextEditor.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextEditor.java
@@ -143,6 +143,7 @@
import org.eclipse.ui.texteditor.ITextEditorExtension2;
import org.eclipse.ui.texteditor.ITextEditorExtension3;
import org.eclipse.ui.texteditor.ITextEditorExtension4;
+import org.eclipse.ui.texteditor.ITextEditorExtension5;
import org.eclipse.ui.texteditor.IUpdate;
import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
@@ -1029,7 +1030,7 @@
/** The ruler context menu manager to be disposed. */
private MenuManager fRulerContextMenuManager;
- String[] fShowInTargetIds = new String[]{IPageLayout.ID_RES_NAV};
+ String[] fShowInTargetIds = new String[]{IPageLayout.ID_RES_NAV, IPageLayout.ID_PROJECT_EXPLORER, IPageLayout.ID_OUTLINE};
private IAction fShowPropertiesAction = null;
private IStructuredModel fStructuredModel;
@@ -1531,14 +1532,12 @@
if (!allIds.contains(IPageLayout.ID_RES_NAV)) {
allIds.add(IPageLayout.ID_RES_NAV);
}
+ if (!allIds.contains(IPageLayout.ID_PROJECT_EXPLORER)) {
+ allIds.add(IPageLayout.ID_PROJECT_EXPLORER);
+ }
if (!allIds.contains(IPageLayout.ID_OUTLINE)) {
allIds.add(IPageLayout.ID_OUTLINE);
}
- // Copied from org.eclipse.ui.navigator.resources.ProjectExplorer.VIEW_ID
-// String PE_VIEW_ID = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
-// if (!allIds.contains(PE_VIEW_ID)) {
-// allIds.add(PE_VIEW_ID);
-// }
return (String[]) allIds.toArray(new String[0]);
}
@@ -1999,7 +1998,7 @@
Object result = null;
// text editor
IStructuredModel internalModel = getInternalModel();
- if (ITextEditor.class.equals(required) || ITextEditorExtension4.class.equals(required) || ITextEditorExtension3.class.equals(required) || ITextEditorExtension2.class.equals(required) || ITextEditorExtension.class.equals(required)) {
+ if (ITextEditor.class.equals(required) || ITextEditorExtension5.class.equals(required) || ITextEditorExtension4.class.equals(required) || ITextEditorExtension3.class.equals(required) || ITextEditorExtension2.class.equals(required) || ITextEditorExtension.class.equals(required)) {
result = this;
}
else if (IWorkbenchSiteProgressService.class.equals(required)) {
