X-Git-Url: http://git.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java
index b805a73..df3f577 100644
--- a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java
+++ b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java
@@ -15,7 +15,6 @@ import java.net.URL;
import java.util.Enumeration;
import java.util.PropertyResourceBundle;
-import net.sourceforge.phpdt.externaltools.internal.model.ColorManager;
import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsImages;
import net.sourceforge.phpdt.externaltools.internal.model.IPreferenceConstants;
import net.sourceforge.phpdt.externaltools.internal.model.VariableContextManager;
@@ -33,7 +32,6 @@ import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbenchWindow;
@@ -98,65 +96,65 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin {
* This version is recommended for eclipse3.0 and above
*/
public ExternalToolsPlugin() {
- super();
- plugin = this;
+ super();
+ plugin = this;
}
/**
* Returns the default instance of the receiver. This represents the runtime plugin.
*/
public static ExternalToolsPlugin getDefault() {
- return plugin;
+ return plugin;
}
/**
* Returns a new IStatus
for this plug-in
*/
public static IStatus newErrorStatus(String message, Throwable exception) {
- return new Status(Status.ERROR, IExternalToolConstants.PLUGIN_ID, 0, message, exception);
+ return new Status(Status.ERROR, IExternalToolConstants.PLUGIN_ID, 0, message, exception);
}
/**
* Returns a new CoreException
for this plug-in
*/
public static CoreException newError(String message, Throwable exception) {
- return new CoreException(new Status(Status.ERROR, IExternalToolConstants.PLUGIN_ID, 0, message, exception));
+ return new CoreException(new Status(Status.ERROR, IExternalToolConstants.PLUGIN_ID, 0, message, exception));
}
/**
* Returns the registry of refresh scope variables.
*/
public ArgumentVariableRegistry getArgumentVariableRegistry() {
- if (argumentVarRegistry == null)
- argumentVarRegistry = new ArgumentVariableRegistry();
- return argumentVarRegistry;
+ if (argumentVarRegistry == null)
+ argumentVarRegistry = new ArgumentVariableRegistry();
+ return argumentVarRegistry;
}
/**
* Returns the registry of directory location variables.
*/
public PathLocationVariableRegistry getDirectoryLocationVariableRegistry() {
- if (dirLocVarRegistry == null)
- dirLocVarRegistry = new PathLocationVariableRegistry(IExternalToolConstants.EXTENSION_POINT_DIRECTORY_VARIABLES);
- return dirLocVarRegistry;
+ if (dirLocVarRegistry == null)
+ dirLocVarRegistry = new PathLocationVariableRegistry(IExternalToolConstants.EXTENSION_POINT_DIRECTORY_VARIABLES);
+ return dirLocVarRegistry;
}
/**
* Returns the registry of file location variables.
*/
public PathLocationVariableRegistry getFileLocationVariableRegistry() {
- if (fileLocVarRegistry == null)
- fileLocVarRegistry = new PathLocationVariableRegistry(IExternalToolConstants.EXTENSION_POINT_FILE_VARIABLES);
- return fileLocVarRegistry;
+ if (fileLocVarRegistry == null)
+ fileLocVarRegistry = new PathLocationVariableRegistry(IExternalToolConstants.EXTENSION_POINT_FILE_VARIABLES);
+ return fileLocVarRegistry;
}
/**
* Returns the registry of refresh scope variables.
*/
public RefreshScopeVariableRegistry getRefreshVariableRegistry() {
- if (refreshVarRegistry == null)
- refreshVarRegistry = new RefreshScopeVariableRegistry();
- return refreshVarRegistry;
+ if (refreshVarRegistry == null)
+ refreshVarRegistry = new RefreshScopeVariableRegistry();
+ return refreshVarRegistry;
}
/**
@@ -166,13 +164,13 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin {
* the text to write to the log
*/
public void log(String message, Throwable exception) {
- IStatus status = newErrorStatus(message, exception);
- // getLog().log(status);
- ExternalToolsPlugin.log(status);
+ IStatus status = newErrorStatus(message, exception);
+ // getLog().log(status);
+ ExternalToolsPlugin.log(status);
}
public static void log(IStatus status) {
- getDefault().getLog().log(status);
+ getDefault().getLog().log(status);
}
/**
@@ -181,14 +179,14 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin {
* @return the ImageDescriptor object
*/
public ImageDescriptor getImageDescriptor(String path) {
- try {
- Bundle bundle = ExternalToolsPlugin.getDefault().getBundle();
- URL installURL = bundle.getEntry("/"); //$NON-NLS-1$
- URL url = new URL(installURL, path);
- return ImageDescriptor.createFromURL(url);
- } catch (MalformedURLException e) {
- return null;
- }
+ try {
+ Bundle bundle = ExternalToolsPlugin.getDefault().getBundle();
+ URL installURL = bundle.getEntry("/"); //$NON-NLS-1$
+ URL url = new URL(installURL, path);
+ return ImageDescriptor.createFromURL(url);
+ } catch (MalformedURLException e) {
+ return null;
+ }
}
/*
@@ -196,59 +194,59 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin {
*/
protected void initializeDefaultPreferences(IPreferenceStore store) {
- String operatingSystem = Platform.getOS();
- // maxosx, linux, solaris, win32,...
- try {
- InputStream is = getDefault().openStream(new Path("prefs/default_" + operatingSystem + ".properties"));
- PropertyResourceBundle resourceBundle = new PropertyResourceBundle(is);
- Enumeration e = resourceBundle.getKeys();
- String key;
- while (e.hasMoreElements()) {
- key = (String) e.nextElement();
- store.setDefault(key, resourceBundle.getString(key));
- }
- } catch (Exception e) {
- // no default properties found
- if (operatingSystem.equals(Platform.OS_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_RUN_PREF, "c:\\apache\\mysql\\bin\\mysqld-nt.exe");
- store.setDefault(APACHE_RUN_PREF, "c:\\apache\\apache.exe");
- store.setDefault(XAMPP_START_PREF, "c:\\xampp\\xampp_start.exe");
- store.setDefault(XAMPP_STOP_PREF, "c:\\xampp\\xampp_stop.exe");
- store.setDefault(ETC_HOSTS_PATH_PREF, "c:\\windows\\system32\\drivers\\etc\\hosts");
- } else {
- store.setDefault(PHP_RUN_PREF, "/apache/php/php");
- store.setDefault(EXTERNAL_PARSER_PREF, "/apache/php/php -l -f {0}");
- store.setDefault(MYSQL_RUN_PREF, "/apache/mysql/bin/mysqld");
- store.setDefault(APACHE_RUN_PREF, "/apache/apache");
- store.setDefault(XAMPP_START_PREF, "xamp/xampp_start");
- store.setDefault(XAMPP_STOP_PREF, "xampp/xampp_stop");
- }
- store.setDefault(MYSQL_PREF, "--standalone");
- store.setDefault(APACHE_START_PREF, "-c \"DocumentRoot \"{0}\"\"");
- store.setDefault(APACHE_STOP_PREF, "-k shutdown");
- store.setDefault(APACHE_RESTART_PREF, "-k restart");
- store.setDefault(MYSQL_START_BACKGROUND, "true");
- store.setDefault(APACHE_START_BACKGROUND, "true");
- store.setDefault(APACHE_STOP_BACKGROUND, "true");
- store.setDefault(APACHE_RESTART_BACKGROUND, "true");
- }
-
- // store.setDefault(SHOW_OUTPUT_IN_CONSOLE, "true");
-
- store.setDefault(IPreferenceConstants.PROMPT_FOR_MIGRATION, true);
-
- PreferenceConverter.setDefault(store, IPreferenceConstants.CONSOLE_ERROR_RGB, new RGB(255, 0, 0)); // red - exactly the same as
- // debug Console
- PreferenceConverter.setDefault(store, IPreferenceConstants.CONSOLE_WARNING_RGB, new RGB(255, 100, 0)); // orange
- PreferenceConverter.setDefault(store, IPreferenceConstants.CONSOLE_INFO_RGB, new RGB(0, 0, 255)); // blue
- PreferenceConverter.setDefault(store, IPreferenceConstants.CONSOLE_VERBOSE_RGB, new RGB(0, 200, 125)); // green
- PreferenceConverter.setDefault(store, IPreferenceConstants.CONSOLE_DEBUG_RGB, new RGB(0, 0, 0)); // black
+ String operatingSystem = Platform.getOS();
+ // maxosx, linux, solaris, win32,...
+ try {
+ InputStream is = getDefault().openStream(new Path("prefs/default_" + operatingSystem + ".properties"));
+ PropertyResourceBundle resourceBundle = new PropertyResourceBundle(is);
+ Enumeration e = resourceBundle.getKeys();
+ String key;
+ while (e.hasMoreElements()) {
+ key = (String) e.nextElement();
+ store.setDefault(key, resourceBundle.getString(key));
+ }
+ } catch (Exception e) {
+ // no default properties found
+ if (operatingSystem.equals(Platform.OS_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_RUN_PREF, "c:\\apache\\mysql\\bin\\mysqld-nt.exe");
+ store.setDefault(APACHE_RUN_PREF, "c:\\apache\\apache.exe");
+ store.setDefault(XAMPP_START_PREF, "c:\\xampp\\xampp_start.exe");
+ store.setDefault(XAMPP_STOP_PREF, "c:\\xampp\\xampp_stop.exe");
+ store.setDefault(ETC_HOSTS_PATH_PREF, "c:\\windows\\system32\\drivers\\etc\\hosts");
+ } else {
+ store.setDefault(PHP_RUN_PREF, "/apache/php/php");
+ store.setDefault(EXTERNAL_PARSER_PREF, "/apache/php/php -l -f {0}");
+ store.setDefault(MYSQL_RUN_PREF, "/apache/mysql/bin/mysqld");
+ store.setDefault(APACHE_RUN_PREF, "/apache/apache");
+ store.setDefault(XAMPP_START_PREF, "xamp/xampp_start");
+ store.setDefault(XAMPP_STOP_PREF, "xampp/xampp_stop");
+ }
+ store.setDefault(MYSQL_PREF, "--standalone");
+ store.setDefault(APACHE_START_PREF, "-c \"DocumentRoot \"{0}\"\"");
+ store.setDefault(APACHE_STOP_PREF, "-k shutdown");
+ store.setDefault(APACHE_RESTART_PREF, "-k restart");
+ store.setDefault(MYSQL_START_BACKGROUND, "true");
+ store.setDefault(APACHE_START_BACKGROUND, "true");
+ store.setDefault(APACHE_STOP_BACKGROUND, "true");
+ store.setDefault(APACHE_RESTART_BACKGROUND, "true");
+ }
+
+ // store.setDefault(SHOW_OUTPUT_IN_CONSOLE, "true");
+
+ store.setDefault(IPreferenceConstants.PROMPT_FOR_MIGRATION, true);
+
+ PreferenceConverter.setDefault(store, IPreferenceConstants.CONSOLE_ERROR_RGB, new RGB(255, 0, 0)); // red - exactly the same as
+ // debug Console
+ PreferenceConverter.setDefault(store, IPreferenceConstants.CONSOLE_WARNING_RGB, new RGB(255, 100, 0)); // orange
+ PreferenceConverter.setDefault(store, IPreferenceConstants.CONSOLE_INFO_RGB, new RGB(0, 0, 255)); // blue
+ PreferenceConverter.setDefault(store, IPreferenceConstants.CONSOLE_VERBOSE_RGB, new RGB(0, 200, 125)); // green
+ PreferenceConverter.setDefault(store, IPreferenceConstants.CONSOLE_DEBUG_RGB, new RGB(0, 0, 0)); // black
}
public static IWorkbenchWindow getActiveWorkbenchWindow() {
- return ExternalToolsPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
+ return ExternalToolsPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
}
/**
@@ -256,18 +254,18 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin {
* 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;
+ Display display = Display.getCurrent();
+ if (display == null) {
+ display = Display.getDefault();
+ }
+ return display;
}
/**
* @see org.eclipse.ui.plugin.AbstractUIPlugin#createImageRegistry()
*/
protected ImageRegistry createImageRegistry() {
- return ExternalToolsImages.initializeImageRegistry();
+ return ExternalToolsImages.initializeImageRegistry();
}
/**
@@ -275,29 +273,12 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin {
* @see org.eclipse.core.runtime.Plugin#start(BundleContext context)
*/
public void start(BundleContext context) throws Exception {
- super.start(context);
- getStandardDisplay().asyncExec(new Runnable() {
- public void run() {
- //initialize the variable context manager
- VariableContextManager.getDefault();
- }
- });
- }
-
- /**
- * @throws Exception
- * @see org.eclipse.core.runtime.Plugin#stop(BundleContext context)
- */
- public void stop(BundleContext context) throws Exception {
- ColorManager.getDefault().dispose();
- super.stop(context);
- }
-
- /**
- * Returns the preference color, identified by the given preference.
- */
- public static Color getPreferenceColor(String pref) {
- return ColorManager.getDefault().getColor(
- PreferenceConverter.getColor(ExternalToolsPlugin.getDefault().getPreferenceStore(), pref));
+ super.start(context);
+ getStandardDisplay().asyncExec(new Runnable() {
+ public void run() {
+ //initialize the variable context manager
+ VariableContextManager.getDefault();
+ }
+ });
}
}
\ No newline at end of file