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 9384fc1..99c2a80 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java @@ -135,12 +135,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"); @@ -325,7 +325,7 @@ public class PHPeclipsePlugin store.setDefault(PHP_PARSE_ON_SAVE, "true"); // show line numbers: - store.setDefault(LINE_NUMBER_RULER, "false"); + // store.setDefault(LINE_NUMBER_RULER, "false"); store.setDefault(FORMATTER_TAB_SIZE, "4"); // php syntax highlighting @@ -361,42 +361,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);