Bug 354687 - [ui][impl] reconsider activation strategy for
OutlineAdaptor
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.xml b/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.xml
index 939c12e..68eadb8 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.xml
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.xml
@@ -86,9 +86,8 @@
activation="ALL_THREADS"
class="org.eclipse.objectteams.otdt.internal.corext.CodeManipulationAdaptor"
icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"/>
- <!-- no activation due to https://bugs.eclipse.org/bugs/show_bug.cgi?id=142299 -->
<team
- activation="NONE"
+ activation="ALL_THREADS"
class="org.eclipse.objectteams.otdt.internal.ui.text.OutlineAdaptor"
icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"/>
<team
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/javaeditor/HighlightingAdaptor.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/javaeditor/HighlightingAdaptor.java
index a6bd6e6..a64a706 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/javaeditor/HighlightingAdaptor.java
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/javaeditor/HighlightingAdaptor.java
@@ -57,7 +57,6 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
import org.eclipse.objectteams.otdt.core.compiler.IOTConstants;
-import org.eclipse.objectteams.otdt.internal.ui.text.OutlineAdaptor;
import org.eclipse.swt.graphics.RGB;
import base org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightingManager;
@@ -78,15 +77,7 @@
protected class SemanticHighlightingManager playedBy SemanticHighlightingManager
{
- void myInstall()
- {
- updateKWColor();
-
- //{Hack as workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=142299
- OutlineAdaptor.doActivate();
- // SH}
- }
- void myInstall()
+ void updateKWColor()
<- after void install(JavaEditor je, JavaSourceViewer sv, IColorManager cm, IPreferenceStore ps);
private void updateKWColor() {
