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 48b2835..e54b1a7 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java @@ -11,8 +11,13 @@ Contributors: **********************************************************************/ package net.sourceforge.phpeclipse; +import net.sourceforge.phpdt.externaltools.internal.model.ColorManager; +import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsPlugin; +import net.sourceforge.phpdt.externaltools.internal.model.VariableContextManager; 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; @@ -34,10 +39,12 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; +import org.eclipse.swt.widgets.Display; 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.ui.texteditor.ITextEditor; /** * The main plugin class to be used in the desktop. @@ -65,7 +72,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. */ @@ -73,11 +80,17 @@ public class PHPeclipsePlugin //The shared instance. private static PHPeclipsePlugin plugin; + + private static ExternalToolsPlugin externalTools; //Resource bundle. //private ResourceBundle resourceBundle; private ImageDescriptorRegistry fImageDescriptorRegistry; private PHPDocumentProvider fCompilationUnitDocumentProvider; + private ITextEditor fTextEditor = null; + + private JavaTextTools fJavaTextTools; + /** * The Java virtual machine that we are running on. */ @@ -103,7 +116,7 @@ public class PHPeclipsePlugin /** JVM constant for any other platform */ private static final int OTHER = -1; - + /** General debug flag*/ public static final boolean DEBUG = false; /** @@ -113,6 +126,7 @@ public class PHPeclipsePlugin super(descriptor); plugin = this; setJVM(); + externalTools = new ExternalToolsPlugin(); // try { // resourceBundle = ResourceBundle.getBundle("net.sourceforge.PHPeclipsePluginResources"); // } catch (MissingResourceException x) { @@ -130,12 +144,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"); @@ -179,6 +193,9 @@ public class PHPeclipsePlugin return plugin; } +// public static ExternalToolsPlugin getExternalTools() { +// return externalTools; +// } /** * Returns the workspace instance. */ @@ -187,9 +204,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(); } @@ -231,7 +254,7 @@ public class PHPeclipsePlugin public static void log(Throwable e) { log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, "PHPeclipsePlugin.internalErrorOccurred", e)); //$NON-NLS-1$ } - + public static boolean isDebug() { return getDefault().isDebugging(); } @@ -239,7 +262,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 +293,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"); @@ -283,12 +313,14 @@ public class PHPeclipsePlugin store.setDefault( DOCUMENTROOT_PREF, getWorkspace().getRoot().getLocation().toString()); + // if ((jvm == WINDOWS_9x) || (jvm == WINDOWS_NT)) { if (windowsSystem.equals(BootLoader.WS_WIN32)) { + store.setDefault(PHP_RUN_PREF, "c:\\apache\\php\\php.exe"); 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}\"\""); @@ -297,6 +329,7 @@ public class PHPeclipsePlugin APACHE_RESTART_PREF, "c:\\apache\\apache.exe -k restart"); } else { + store.setDefault(PHP_RUN_PREF, "/apache/php/php"); store.setDefault(EXTERNAL_PARSER_PREF, "/apache/php/php -l -f {0}"); store.setDefault(MYSQL_PREF, "/apache/mysql/bin/mysqld --standalone"); store.setDefault( @@ -314,8 +347,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 @@ -339,7 +372,7 @@ public class PHPeclipsePlugin PreferenceConverter.setDefault( store, PHP_FUNCTIONNAME, - PHPColorProvider.FUNCTION_NAME); + PHPColorProvider.FUNCTION_NAME); PreferenceConverter.setDefault( store, PHP_CONSTANT, @@ -350,24 +383,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); - - store.setDefault(PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, "true"); - PreferenceConverter.setDefault( - store, - PREFERENCE_COLOR_BACKGROUND, - PHPColorProvider.BACKGROUND_COLOR); +// 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); //language stuff store.setDefault(RESOURCE_BUNDLE, LANGUAGE_DEFAULT); @@ -385,12 +436,52 @@ public class PHPeclipsePlugin new PHPSyntaxRdr(); PHPCore.initializeDefaultPluginPreferences(); + PreferenceConstants.initializeDefaultValues(store); + + externalTools.initializeDefaultPreferences(store); } + /** + * Returns the standard display to be used. The method first checks, if + * the thread calling this method has an associated display. If so, this + * display is returned. Otherwise the method returns the default display. + */ + public static Display getStandardDisplay() { + Display display = Display.getCurrent(); + if (display == null) { + display = Display.getDefault(); + } + return display; + } + public void startup() throws CoreException { super.startup(); IAdapterManager manager = Platform.getAdapterManager(); manager.registerAdapters(new PHPElementAdapterFactory(), PHPElement.class); manager.registerAdapters(new ResourceAdapterFactory(), IResource.class); + // externalTools.startUp(); + getStandardDisplay().asyncExec( + new Runnable() { + public void run() { + //initialize the variable context manager + VariableContextManager.getDefault(); + } + }); + } + + /** + * @see org.eclipse.core.runtime.Plugin#shutdown() + */ + public void shutdown() throws CoreException { + // externalTools.shutDown(); + ColorManager.getDefault().dispose(); + } + + public void setTextEditor(ITextEditor textEditor) { + this.fTextEditor = textEditor; + } + + public ITextEditor getTextEditor() { + return fTextEditor; } } \ No newline at end of file