Avoid NPE for "mark occurences"

[phpeclipse.git] / net.sourceforge.phpeclipse.externaltools / src / net / sourceforge / phpdt / externaltools / launchConfigurations / ExternalToolsMainTab.java

diff --git a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/launchConfigurations/ExternalToolsMainTab.java b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/launchConfigurations/ExternalToolsMainTab.java
index 7e823ba..49102df 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/launchConfigurations/ExternalToolsMainTab.java
+++ b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/launchConfigurations/ExternalToolsMainTab.java
@@ -14,7 +14,6 @@ import net.sourceforge.phpdt.externaltools.internal.registry.ExternalToolVariabl
 import net.sourceforge.phpdt.externaltools.model.IExternalToolConstants;
 import net.sourceforge.phpdt.externaltools.model.ToolUtil;
 import net.sourceforge.phpdt.externaltools.variable.ExpandVariableContext;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin;
 
 import org.eclipse.core.resources.IResource;
@@ -122,17 +121,17 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
     label.setText(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.&Location___2")); //$NON-NLS-1$
     label.setFont(font);
 
-    final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
+    final IPreferenceStore store = ExternalToolsPlugin.getDefault().getPreferenceStore();
     locationField = new Combo(composite, SWT.DROP_DOWN | SWT.BORDER);
     GridData data = new GridData(GridData.FILL_HORIZONTAL);
     data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
     locationField.setLayoutData(data);
     locationField.setFont(font);
-    locationField.add(store.getString(PHPeclipsePlugin.PHP_RUN_PREF), 0);
-    locationField.add(store.getString(PHPeclipsePlugin.APACHE_RUN_PREF), 1);
-    locationField.add(store.getString(PHPeclipsePlugin.MYSQL_RUN_PREF), 2);
-    locationField.add(store.getString(PHPeclipsePlugin.XAMPP_START_PREF), 3);
-    locationField.add(store.getString(PHPeclipsePlugin.XAMPP_STOP_PREF), 4);
+    locationField.add(store.getString(ExternalToolsPlugin.PHP_RUN_PREF), 0);
+    locationField.add(store.getString(ExternalToolsPlugin.APACHE_RUN_PREF), 1);
+    locationField.add(store.getString(ExternalToolsPlugin.MYSQL_RUN_PREF), 2);
+    locationField.add(store.getString(ExternalToolsPlugin.XAMPP_START_PREF), 3);
+    locationField.add(store.getString(ExternalToolsPlugin.XAMPP_STOP_PREF), 4);
     Composite buttonComposite = new Composite(parent, SWT.NONE);
     layout = new GridLayout();
     layout.marginWidth = 0;