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 b9f2df5..e54b1a7 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -11,6 +11,9 @@ 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;
@@ -36,6 +39,7 @@ 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;
@@ -76,6 +80,8 @@ public class PHPeclipsePlugin
 
   //The shared instance.
   private static PHPeclipsePlugin plugin;
+  
+  private static ExternalToolsPlugin externalTools;
   //Resource bundle.
   //private ResourceBundle resourceBundle;
 
@@ -120,6 +126,7 @@ public class PHPeclipsePlugin
     super(descriptor);
     plugin = this;
     setJVM();
+    externalTools = new ExternalToolsPlugin();
     //    try {
     //      resourceBundle = ResourceBundle.getBundle("net.sourceforge.PHPeclipsePluginResources");
     //    } catch (MissingResourceException x) {
@@ -186,6 +193,9 @@ public class PHPeclipsePlugin
     return plugin;
   }
 
+//  public static ExternalToolsPlugin getExternalTools() {
+//    return externalTools;
+//  }
   /**
    * Returns the workspace instance.
    */
@@ -427,15 +437,46 @@ public class PHPeclipsePlugin
 
     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;
   }