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 1f6f8f3..e4dba1d 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java @@ -13,6 +13,8 @@ package net.sourceforge.phpeclipse; import net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage; import net.sourceforge.phpdt.internal.ui.viewsupport.ImageDescriptorRegistry; +import net.sourceforge.phpdt.ui.PreferenceConstants; +import net.sourceforge.phpdt.ui.text.JavaTextTools; import net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider; import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr; import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider; @@ -38,6 +40,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.update.internal.ui.UpdateUIPlugin; /** * The main plugin class to be used in the desktop. @@ -65,7 +68,7 @@ public class PHPeclipsePlugin public static final String PHP_CODING_ACTION_SET_ID = PLUGIN_ID + ".ui.CodingActionSet"; //$NON-NLS-1$ public static final String PHPPARSER_NEW = "test.PHPParser"; - public static final String PHPPARSER_ORIGINAL = + public static final String PHPPARSER_ORIGINAL = "net.sourceforge.phpdt.internal.compiler.parser.Parser"; /** Change this if you want to switch PHP Parser. */ @@ -78,6 +81,9 @@ public class PHPeclipsePlugin private ImageDescriptorRegistry fImageDescriptorRegistry; private PHPDocumentProvider fCompilationUnitDocumentProvider; + + private JavaTextTools fJavaTextTools; + /** * The Java virtual machine that we are running on. */ @@ -130,12 +136,12 @@ public class PHPeclipsePlugin return fImageDescriptorRegistry; } // @TODO: refactor this into a better method name ! - public PHPDocumentProvider getCompilationUnitDocumentProvider() { + public synchronized PHPDocumentProvider getCompilationUnitDocumentProvider() { if (fCompilationUnitDocumentProvider == null) - fCompilationUnitDocumentProvider = new PHPDocumentProvider(); + fCompilationUnitDocumentProvider= new PHPDocumentProvider(); return fCompilationUnitDocumentProvider; } - + private static void setJVM() { String osName = System.getProperty("os.name"); @@ -187,9 +193,15 @@ public class PHPeclipsePlugin } public static IWorkbenchPage getActivePage() { - return PHPeclipsePlugin.getActivePage(); + return getDefault().internalGetActivePage(); } + private IWorkbenchPage internalGetActivePage() { + IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow(); + if (window!=null) return window.getActivePage(); + return null; + } + public static IWorkbenchWindow getActiveWorkbenchWindow() { return getDefault().getWorkbench().getActiveWorkbenchWindow(); } @@ -239,7 +251,13 @@ public class PHPeclipsePlugin static IPath getInstallLocation() { return new Path(getDefault().getDescriptor().getInstallURL().getFile()); } - + + public synchronized JavaTextTools getJavaTextTools() { + if (fJavaTextTools == null) + fJavaTextTools= new JavaTextTools(getPreferenceStore()); + return fJavaTextTools; + } + /** * Returns the string from the plugin's resource bundle, * or 'key' if not found. @@ -264,6 +282,7 @@ public class PHPeclipsePlugin // windows preferences: store.setDefault(LOCALHOST_PREF, "http://localhost"); + store.setDefault(SHOW_EXTERNAL_PREVIEW_PREF, "true"); store.setDefault(USE_EXTERNAL_BROWSER_PREF, "false"); store.setDefault(SHOW_OUTPUT_IN_CONSOLE, "true"); @@ -288,7 +307,7 @@ public class PHPeclipsePlugin store.setDefault(EXTERNAL_PARSER_PREF, "c:\\apache\\php\\php -l -f {0}"); store.setDefault( MYSQL_PREF, - "c:\\apache\\mysql\\bin\\mysqld.exe --standalone"); + "c:\\apache\\mysql\\bin\\mysqld-nt.exe --standalone"); store.setDefault( APACHE_START_PREF, "c:\\apache\\apache.exe -c \"DocumentRoot \"{0}\"\""); @@ -314,8 +333,8 @@ public class PHPeclipsePlugin store.setDefault(PHP_PARSE_ON_SAVE, "true"); // show line numbers: - store.setDefault(LINE_NUMBER_RULER, "false"); - store.setDefault(FORMATTER_TAB_SIZE, "4"); + // store.setDefault(LINE_NUMBER_RULER, "false"); +// store.setDefault(FORMATTER_TAB_SIZE, "4"); // php syntax highlighting store.setDefault(PHP_USERDEF_XMLFILE, ""); //assume there is none chooA @@ -350,42 +369,42 @@ public class PHPeclipsePlugin store, PHP_DEFAULT, PHPColorProvider.DEFAULT); - PreferenceConverter.setDefault( - store, - PHP_EDITOR_BACKGROUND, - PHPColorProvider.BACKGROUND); - PreferenceConverter.setDefault( - store, - LINKED_POSITION_COLOR, - PHPColorProvider.LINKED_POSITION_COLOR); - PreferenceConverter.setDefault( - store, - LINE_NUMBER_COLOR, - PHPColorProvider.LINE_NUMBER_COLOR); - - // set default PHPDoc colors: - PreferenceConverter.setDefault( - store, - PHPDOC_KEYWORD, - PHPColorProvider.PHPDOC_KEYWORD); - PreferenceConverter.setDefault( - store, - PHPDOC_LINK, - PHPColorProvider.PHPDOC_LINK); - PreferenceConverter.setDefault( - store, - PHPDOC_DEFAULT, - PHPColorProvider.PHPDOC_DEFAULT); - PreferenceConverter.setDefault( - store, - PHPDOC_TAG, - PHPColorProvider.PHPDOC_TAG); +// PreferenceConverter.setDefault( +// store, +// PHP_EDITOR_BACKGROUND, +// PHPColorProvider.BACKGROUND); +// PreferenceConverter.setDefault( +// store, +// LINKED_POSITION_COLOR, +// PHPColorProvider.LINKED_POSITION_COLOR); +// PreferenceConverter.setDefault( +// store, +// LINE_NUMBER_COLOR, +// PHPColorProvider.LINE_NUMBER_COLOR); + +// // set default PHPDoc colors: +// PreferenceConverter.setDefault( +// store, +// PHPDOC_KEYWORD, +// PHPColorProvider.PHPDOC_KEYWORD); +// PreferenceConverter.setDefault( +// store, +// PHPDOC_LINK, +// PHPColorProvider.PHPDOC_LINK); +// PreferenceConverter.setDefault( +// store, +// PHPDOC_DEFAULT, +// PHPColorProvider.PHPDOC_DEFAULT); +// PreferenceConverter.setDefault( +// store, +// PHPDOC_TAG, +// PHPColorProvider.PHPDOC_TAG); - store.setDefault(PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, "true"); - PreferenceConverter.setDefault( - store, - PREFERENCE_COLOR_BACKGROUND, - PHPColorProvider.BACKGROUND_COLOR); +// store.setDefault(PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, "true"); +// PreferenceConverter.setDefault( +// store, +// PREFERENCE_COLOR_BACKGROUND, +// PHPColorProvider.BACKGROUND_COLOR); //language stuff store.setDefault(RESOURCE_BUNDLE, LANGUAGE_DEFAULT); @@ -403,6 +422,7 @@ public class PHPeclipsePlugin new PHPSyntaxRdr(); PHPCore.initializeDefaultPluginPreferences(); + PreferenceConstants.initializeDefaultValues(store); } public void startup() throws CoreException {