misc changes in the internal builder

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / PHPSourceViewerConfiguration.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
index c870909..b8ab839 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
@@ -11,6 +11,8 @@
  **********************************************************************/
 package net.sourceforge.phpeclipse.phpeditor;
 import java.util.Vector;
+
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.ui.text.ContentAssistPreference;
 import net.sourceforge.phpdt.internal.ui.text.HTMLTextPresenter;
 import net.sourceforge.phpdt.internal.ui.text.JavaAnnotationHover;
@@ -24,7 +26,6 @@ import net.sourceforge.phpdt.internal.ui.text.java.hover.JavaEditorTextHoverProx
 import net.sourceforge.phpdt.internal.ui.text.phpdoc.PHPDocCompletionProcessor;
 import net.sourceforge.phpdt.ui.PreferenceConstants;
 import net.sourceforge.phpdt.ui.text.JavaTextTools;
-import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.html.HTMLFormattingStrategy;
 import net.sourceforge.phpeclipse.phpeditor.php.HTMLCompletionProcessor;
@@ -289,19 +290,20 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
                                return new JavaEditorTextHoverProxy(hoverDescs[i], getEditor());
                        i++;
                }
-               if (fEditor != null) {
-                       IEditorInput editorInput = fEditor.getEditorInput();
-                       if (editorInput instanceof IFileEditorInput) {
-                               try {
-                                       IFile f = ((IFileEditorInput) editorInput).getFile();
-                                       return new PHPTextHover(f.getProject());
-                               } catch (NullPointerException e) {
-                                       // this exception occurs, if getTextHover is called by
-                                       // preference pages !
-                               }
-                       }
-               }
-               return new PHPTextHover(null);
+               return null;
+//             if (fEditor != null) {
+//                     IEditorInput editorInput = fEditor.getEditorInput();
+//                     if (editorInput instanceof IFileEditorInput) {
+//                             try {
+//                                     IFile f = ((IFileEditorInput) editorInput).getFile();
+//                                     return new PHPTextHover(f.getProject());
+//                             } catch (NullPointerException e) {
+//                                     // this exception occurs, if getTextHover is called by
+//                                     // preference pages !
+//                             }
+//                     }
+//             }
+//             return new PHPTextHover(null);
        }
        /*
         * @see SourceViewerConfiguration#getTextHover(ISourceViewer, String)
@@ -422,7 +424,7 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
                // prefix[0] is either '\t' or ' ' x tabWidth, depending on useSpaces
                final IPreferenceStore preferences = PHPeclipsePlugin.getDefault()
                                .getPreferenceStore();
-               int tabWidth = preferences.getInt(PHPCore.FORMATTER_TAB_SIZE);
+               int tabWidth = preferences.getInt(JavaCore.FORMATTER_TAB_SIZE);
                boolean useSpaces = getPreferenceStore().getBoolean(SPACES_FOR_TABS);
                for (int i = 0; i <= tabWidth; i++) {
                        StringBuffer prefix = new StringBuffer();