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..01a0a96 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java @@ -6,6 +6,7 @@ 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; @@ -30,6 +31,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 +268,7 @@ public class PHPUnitEditor extends PHPEditor { } } - private void ensureOverviewHoverManagerInstalled() { + protected void ensureOverviewHoverManagerInstalled() { if (fOverviewRulerHoveringController == null && fAnnotationHover != null && fHoverControlCreator != null) { @@ -834,6 +836,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) { @@ -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 {