Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2011-03-16 16:26:32 +0000
committerDani Megert2011-03-16 16:26:32 +0000
commit8cda758641dad3aba5f1d51c9fa965d9e7f809db (patch)
tree29378efea17e58313c20a6cf6038463697271b2b
parenta0bf47a2e100c8cb7ab9b633d447a0a2e8a2e354 (diff)
downloadeclipse.platform.text-8cda758641dad3aba5f1d51c9fa965d9e7f809db.tar.gz
eclipse.platform.text-8cda758641dad3aba5f1d51c9fa965d9e7f809db.tar.xz
eclipse.platform.text-8cda758641dad3aba5f1d51c9fa965d9e7f809db.zip
Backported fix for bug 337719: [implementation] AbstractTextEditor does not prompt when out of sync in MultiPageEditorPartr362_v20110316
-rw-r--r--org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF b/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
index 031b16b3a..a1f381c95 100644
--- a/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ui.workbench.texteditor; singleton:=true
-Bundle-Version: 3.6.1.qualifier
+Bundle-Version: 3.6.2.qualifier
Bundle-Activator: org.eclipse.ui.internal.texteditor.TextEditorPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
index 459384fa3..4a55e674e 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -976,7 +976,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
if (fIsHandlingActivation)
return;
- if (fActivePart == AbstractTextEditor.this) {
+ if (fActivePart == AbstractTextEditor.this || fActivePart != null && fActivePart.getAdapter(AbstractTextEditor.class) == AbstractTextEditor.this) {
fIsHandlingActivation= true;
try {
safelySanityCheckState(getEditorInput());

Back to the top