improved syntax highlighting scanners and preferences

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / PHPeclipsePlugin.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index b094bc7..8ba1bbb 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -606,12 +606,16 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
     return fProblemMarkerManager;
   }
 
+//  public synchronized JavaTextTools getJavaTextTools() {
+//    if (fJavaTextTools == null)
+//      fJavaTextTools = new JavaTextTools(getPreferenceStore());
+//    return fJavaTextTools;
+//  }
   public synchronized JavaTextTools getJavaTextTools() {
-    if (fJavaTextTools == null)
-      fJavaTextTools = new JavaTextTools(getPreferenceStore());
-    return fJavaTextTools;
-  }
-
+       if (fJavaTextTools == null)
+               fJavaTextTools= new JavaTextTools(getPreferenceStore(), JavaCore.getPlugin().getPluginPreferences());
+       return fJavaTextTools;
+}
   public IFile getLastEditorFile() {
     return fLastEditorFile;
   }
@@ -645,7 +649,8 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
 
     store.setDefault(PHP_AUTO_PREVIEW_DEFAULT, "true");
     store.setDefault(PHP_BRING_TO_TOP_PREVIEW_DEFAULT, "true");
-
+    store.setDefault(PHP_SHOW_HTML_FILES_LOCAL, "true");
+    
     String windowsSystem = Platform.getWS();
     if (jvm == WINDOWS_9x) {
       store.setDefault(EXTERNAL_BROWSER_PREF,
@@ -683,9 +688,9 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
     store.setDefault(APACHE_START_BACKGROUND, "true");
     store.setDefault(APACHE_STOP_BACKGROUND, "true");
     store.setDefault(APACHE_RESTART_BACKGROUND, "true");
-    store.setDefault(PHP_PARSER_DEFAULT, PHP_EXTERNAL_PARSER);
-    store.setDefault(PHP_INTERNAL_PARSER, "false");
-    store.setDefault(PHP_EXTERNAL_PARSER, "true");
+//    store.setDefault(PHP_PARSER_DEFAULT, PHP_EXTERNAL_PARSER);
+//    store.setDefault(PHP_INTERNAL_PARSER, "false");
+//    store.setDefault(PHP_EXTERNAL_PARSER, "true");
     //    store.setDefault(PHP_PARSE_ON_SAVE, "true");
     // show line numbers:
     //   store.setDefault(LINE_NUMBER_RULER, "false");