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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index ebc134d..aa056a3 100644
--- 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;
   }
@@ -636,7 +640,11 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
   //  }
   protected void initializeDefaultPreferences(IPreferenceStore store) {
     // windows preferences:
-    store.setDefault(LOCALHOST_PREF, "http://localhost");
+//    store.setDefault(LOCALHOST_PREF, "http://localhost");
+//    store.setDefault(DOCUMENTROOT_PREF, getWorkspace().getRoot().getLocation().toString());
+    store.setDefault(PHP_LOCALHOST_PREF, "http://localhost");
+    store.setDefault(PHP_DOCUMENTROOT_PREF, getWorkspace().getRoot().getLocation().toString());
+    
     //    store.setDefault(SHOW_EXTERNAL_PREVIEW_PREF, "true");
     store.setDefault(USE_EXTERNAL_BROWSER_PREF, "false");
     store.setDefault(SHOW_OUTPUT_IN_CONSOLE, "true");
@@ -661,8 +669,6 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
       store.setDefault(PHP_OBFUSCATOR_DEFAULT, "/tmp");
       store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}");
     }
-    store.setDefault(DOCUMENTROOT_PREF, getWorkspace().getRoot().getLocation()
-        .toString());
     //  if ((jvm == WINDOWS_9x) || (jvm == WINDOWS_NT)) {
     //	
     if (windowsSystem.equals(Platform.WS_WIN32)) {