[401833] Outline creation fails when StructuredTextEditor is embedded in MultiPageEditorPart

2 files changed, 2 insertions, 14 deletions

diff --git a/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
index 89e99db183..7f6c0c871f 100644
--- a/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.sse.ui; singleton:=true
-Bundle-Version: 1.3.102.qualifier
+Bundle-Version: 1.3.103.qualifier
 Bundle-Activator: org.eclipse.wst.sse.ui.internal.SSEUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
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 74d4a741b9..40ab718c1b 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
@@ -155,7 +155,6 @@ import org.eclipse.ui.texteditor.IUpdate;
 import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
 import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
 import org.eclipse.ui.texteditor.TextOperationAction;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 import org.eclipse.ui.views.properties.IPropertySheetPage;
 import org.eclipse.wst.sse.core.StructuredModelManager;
@@ -2093,7 +2092,7 @@ public class StructuredTextEditor extends TextEditor {
 		}
 		// content outline page
 		else if (IContentOutlinePage.class.equals(required)) {
-			if (fOutlinePage == null && isCalledByOutline()) {
+			if (fOutlinePage == null && !fEditorDisposed) {
 				ContentOutlineConfiguration cfg = createContentOutlineConfiguration();
 				if (cfg != null) {
 					ConfigurableContentOutlinePage outlinePage = new ConfigurableContentOutlinePage();
@@ -3673,17 +3672,6 @@ public class StructuredTextEditor extends TextEditor {
 		}
 	}
 
-	private static boolean isCalledByOutline() {
-		Class[] elements= new AccessChecker().getClassContext();
-		return elements[4].equals(ContentOutline.class) || elements[5].equals(ContentOutline.class);
-	}
-
-	private static final class AccessChecker extends SecurityManager {
-		public Class[] getClassContext() {
-			return super.getClassContext();
-		}
-	}
-
 	private IInformationPresenter configureOutlinePresenter(ISourceViewer sourceViewer, SourceViewerConfiguration config) {
 		InformationPresenter presenter = null;