X-Git-Url: http://secure.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 811948e..314cd05 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
@@ -20,7 +20,6 @@ import net.sourceforge.phpdt.externaltools.internal.registry.ArgumentVariableReg
 import net.sourceforge.phpdt.externaltools.internal.registry.PathLocationVariableRegistry;
 import net.sourceforge.phpdt.externaltools.internal.registry.RefreshScopeVariableRegistry;
 import net.sourceforge.phpdt.externaltools.model.IExternalToolConstants;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
@@ -40,6 +39,34 @@ import org.osgi.framework.Bundle;
  * External tools plug-in class
  */
 public final class ExternalToolsPlugin extends AbstractUIPlugin {
+  public static final String XAMPP_START_PREF = "_xampp_start_pref";
+
+  public static final String XAMPP_STOP_PREF = "_xampp_stop_pref";
+
+  public static final String MYSQL_RUN_PREF = "_mysql_run_pref";
+
+  public static final String MYSQL_START_BACKGROUND = "_mysql_start_background";
+
+  public static final String MYSQL_PREF = "__mysql_start";
+
+  public static final String APACHE_RUN_PREF = "_apache_run_pref";
+
+  public static final String APACHE_START_BACKGROUND = "_apache_start_background";
+
+  public static final String APACHE_START_PREF = "__apache_start";
+
+  public static final String APACHE_STOP_BACKGROUND = "_apache_stop_background";
+
+  public static final String APACHE_STOP_PREF = "__apache_stop";
+
+  public static final String APACHE_RESTART_BACKGROUND = "_apache_restart_background";
+
+  public static final String APACHE_RESTART_PREF = "__apache_restart";
+
+  public static final String SHOW_OUTPUT_IN_CONSOLE = "_show_output_in_console";
+
+  public static final String PHP_RUN_PREF = "_php_run_pref";
+
   /**
    * Status representing no problems encountered during operation.
    */
@@ -129,7 +156,11 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin {
   public void log(String message, Throwable exception) {
     IStatus status = newErrorStatus(message, exception);
     //	getLog().log(status);
-    PHPeclipsePlugin.log(status);
+    ExternalToolsPlugin.log(status);
+  }
+
+  public static void log(IStatus status) {
+    getDefault().getLog().log(status);
   }
 
   /**
@@ -139,7 +170,7 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin {
    */
   public ImageDescriptor getImageDescriptor(String path) {
     try {
-      Bundle bundle = PHPeclipsePlugin.getDefault().getBundle();
+      Bundle bundle = ExternalToolsPlugin.getDefault().getBundle();
       URL installURL = bundle.getEntry("/"); //$NON-NLS-1$
       URL url = new URL(installURL, path);
       return ImageDescriptor.createFromURL(url);
@@ -155,7 +186,7 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin {
     prefs.setDefault(IPreferenceConstants.PROMPT_FOR_MIGRATION, true);
 
     PreferenceConverter.setDefault(prefs, IPreferenceConstants.CONSOLE_ERROR_RGB, new RGB(255, 0, 0)); // red - exactly the same as
-                                                                                                       // debug Consol
+    // debug Consol
     PreferenceConverter.setDefault(prefs, IPreferenceConstants.CONSOLE_WARNING_RGB, new RGB(255, 100, 0)); // orange
     PreferenceConverter.setDefault(prefs, IPreferenceConstants.CONSOLE_INFO_RGB, new RGB(0, 0, 255)); // blue
     PreferenceConverter.setDefault(prefs, IPreferenceConstants.CONSOLE_VERBOSE_RGB, new RGB(0, 200, 125)); // green
@@ -163,7 +194,7 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin {
   }
 
   public static IWorkbenchWindow getActiveWorkbenchWindow() {
-    return PHPeclipsePlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
+    return ExternalToolsPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
   }
 
   /**
@@ -189,7 +220,7 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin {
    * @see org.eclipse.core.runtime.Plugin#startup()
    */
   public void startup() throws CoreException {
-//    super.startup();
+    //    super.startup();
     getStandardDisplay().asyncExec(new Runnable() {
       public void run() {
         //initialize the variable context manager
@@ -202,7 +233,7 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin {
    * @see org.eclipse.core.runtime.Plugin#shutdown()
    */
   public void shutdown() throws CoreException {
-//    	super.shutdown();
+    //    	super.shutdown();
     ColorManager.getDefault().dispose();
   }
 
@@ -211,6 +242,6 @@ public final class ExternalToolsPlugin extends AbstractUIPlugin {
    */
   public static Color getPreferenceColor(String pref) {
     return ColorManager.getDefault().getColor(
-        PreferenceConverter.getColor(PHPeclipsePlugin.getDefault().getPreferenceStore(), pref));
+        PreferenceConverter.getColor(ExternalToolsPlugin.getDefault().getPreferenceStore(), pref));
   }
 }
\ No newline at end of file