Avoid NPE for "mark occurences"

[phpeclipse.git] / net.sourceforge.phpeclipse.externaltools / src / net / sourceforge / phpdt / externaltools / actions / PHPStartApacheAction.java

diff --git a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java
index da819c2..ebe3de7 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java
+++ b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2000, 2002 IBM Corp. and others. All rights reserved. This program and the accompanying materials are made
  * available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ *
  * Contributors: IBM Corporation - Initial implementation www.phpeclipse.de
  **********************************************************************************************************************************/
 package net.sourceforge.phpdt.externaltools.actions;
@@ -11,7 +11,6 @@ import java.text.MessageFormat;
 
 import net.sourceforge.phpdt.externaltools.launchConfigurations.ExternalToolsUtil;
 import net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin;
-import net.sourceforge.phpeclipse.externaltools.PHPConsole;
 import net.sourceforge.phpeclipse.ui.WebUI;
 
 import org.eclipse.jface.action.IAction;
@@ -24,8 +23,11 @@ public class PHPStartApacheAction implements IWorkbenchWindowActionDelegate {
   protected IWorkbenchWindow activeWindow = null;
 
   public void run(IAction action) {
+       final IPreferenceStore webUIStore = WebUI.getDefault().getPreferenceStore();
+
+       String documentRoot = webUIStore.getString(WebUI.PHP_DOCUMENTROOT_PREF);
     final IPreferenceStore store = ExternalToolsPlugin.getDefault().getPreferenceStore();
-    String documentRoot = store.getString(WebUI.PHP_DOCUMENTROOT_PREF);
+
     // replace backslash with slash in the DocumentRoot under Windows
     documentRoot = documentRoot.replace('\\', '/');
     String[] arguments = { documentRoot };
@@ -36,7 +38,7 @@ public class PHPStartApacheAction implements IWorkbenchWindowActionDelegate {
 
   /**
    * Executes an external progam and saves the LaunchConfiguration under external tools
-   * 
+   *
    * @param command
    *          external tools command name
    * @param executable