X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java
index 8eca420..efd93dd 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java
@@ -6,11 +6,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import net.sourceforge.phpdt.internal.ui.text.ContentAssistPreference;
 import net.sourceforge.phpdt.internal.ui.text.PHPPairMatcher;
 import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionManager;
 import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionUI;
 import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionUI.ExitFlags;
 import net.sourceforge.phpdt.ui.PreferenceConstants;
+import net.sourceforge.phpdt.ui.text.JavaTextTools;
 import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
@@ -30,6 +32,7 @@ import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.text.ITextViewerExtension;
 import org.eclipse.jface.text.ITypedRegion;
 import org.eclipse.jface.text.IWidgetTokenKeeper;
+import org.eclipse.jface.text.contentassist.ContentAssistant;
 import org.eclipse.jface.text.contentassist.IContentAssistant;
 import org.eclipse.jface.text.source.IAnnotationModel;
 import org.eclipse.jface.text.source.ISourceViewer;
@@ -266,7 +269,7 @@ public class PHPUnitEditor extends PHPEditor {
       }
     }
 
-    private void ensureOverviewHoverManagerInstalled() {
+    protected void ensureOverviewHoverManagerInstalled() {
       if (fOverviewRulerHoveringController == null
         && fAnnotationHover != null
         && fHoverControlCreator != null) {
@@ -834,6 +837,10 @@ public class PHPUnitEditor extends PHPEditor {
    */
   public PHPUnitEditor() {
     super();
+    setDocumentProvider(PHPeclipsePlugin.getDefault().getCompilationUnitDocumentProvider());
+    setEditorContextMenuId("#PHPEditorContext"); //$NON-NLS-1$
+    setRulerContextMenuId("#PHPRulerContext"); //$NON-NLS-1$
+    
   }
   
   public void createPartControl(Composite parent) {
@@ -1132,9 +1139,8 @@ public class PHPUnitEditor extends PHPEditor {
   }
 
   private Color getColor(RGB rgb) {
-    //    JavaTextTools textTools = JavaPlugin.getDefault().getJavaTextTools();
-    //    return textTools.getColorManager().getColor(rgb);
-    return PHPEditorEnvironment.getPHPColorProvider().getColor(rgb);
+    JavaTextTools textTools = PHPeclipsePlugin.getDefault().getJavaTextTools();
+    return textTools.getColorManager().getColor(rgb);
   }
 
   private Color getColor(AnnotationType annotationType) {
@@ -1307,9 +1313,9 @@ public class PHPUnitEditor extends PHPEditor {
           }
         }
 
-//        IContentAssistant c= asv.getContentAssistant();
-//        if (c instanceof ContentAssistant)
-//          ContentAssistPreference.changeConfiguration((ContentAssistant) c, getPreferenceStore(), event);
+        IContentAssistant c= asv.getContentAssistant();
+        if (c instanceof ContentAssistant)
+          ContentAssistPreference.changeConfiguration((ContentAssistant) c, getPreferenceStore(), event);
       }
 				
     } finally {