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 a9cb199..8ba1bbb 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; } @@ -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,