1) Fixed issue #714: PHP Parser bug with $this->oR.

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / ui / text / PHPSourceViewerConfiguration.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/PHPSourceViewerConfiguration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/PHPSourceViewerConfiguration.java
index f2d4ab6..6a47790 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/PHPSourceViewerConfiguration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/PHPSourceViewerConfiguration.java
@@ -14,6 +14,7 @@ package net.sourceforge.phpdt.ui.text;
 import java.util.Vector;
 
 import net.sourceforge.phpdt.core.JavaCore;
+//import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages;
 import net.sourceforge.phpdt.internal.ui.text.AbstractJavaScanner;
 import net.sourceforge.phpdt.internal.ui.text.ContentAssistPreference;
 import net.sourceforge.phpdt.internal.ui.text.HTMLTextPresenter;
@@ -43,7 +44,7 @@ import net.sourceforge.phpeclipse.phpeditor.php.PHPCompletionProcessor;
 import net.sourceforge.phpeclipse.phpeditor.php.PHPDocumentPartitioner;
 import net.sourceforge.phpeclipse.phpeditor.php.PHPDoubleClickSelector;
 import net.sourceforge.phpeclipse.phpeditor.php.PHPPartitionScanner;
-import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
+//import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLConfiguration;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLPartitionScanner;
 import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools;
@@ -223,7 +224,8 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
                fTextEditor = editor;
                fDocumentPartitioning = partitioning;
                // fJavaTextTools = PHPeclipsePlugin.getDefault().getJavaTextTools();
-               fXMLTextTools = XMLPlugin.getDefault().getXMLTextTools();
+               fXMLTextTools = new XMLTextTools(getPreferenceStore());
+               //XMLPlugin.getDefault().getXMLTextTools();
                xmlConfiguration = new XMLConfiguration(fXMLTextTools);
                fColorManager = colorManager;
                fPreferenceStore = preferenceStore;
@@ -1016,7 +1018,10 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
                        ISourceViewer sourceViewer) {
                return new IInformationControlCreator() {
                        public IInformationControl createInformationControl(Shell parent) {
-                               return new DefaultInformationControl(parent, SWT.NONE,
+//incastrix
+                               //                              return new DefaultInformationControl(parent, SWT.NONE,
+//                                             new HTMLTextPresenter(true));
+                               return new DefaultInformationControl(parent,
                                                new HTMLTextPresenter(true));
                                // return new HoverBrowserControl(parent);
                        }