X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/launchConfigurations/ExternalToolsMainTab.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/launchConfigurations/ExternalToolsMainTab.java
index 79cf430..f3bdfab 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/launchConfigurations/ExternalToolsMainTab.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/launchConfigurations/ExternalToolsMainTab.java
@@ -1,11 +1,9 @@
 package net.sourceforge.phpdt.externaltools.launchConfigurations;
 
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is 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
-**********************************************************************/
+/***********************************************************************************************************************************
+ * Copyright (c) 2000, 2002 IBM Corp. All rights reserved. This file is 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
+ **********************************************************************************************************************************/
 
 import java.io.File;
 
@@ -57,14 +55,21 @@ import org.eclipse.ui.dialogs.SelectionDialog;
 public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
 
   protected Combo locationField;
+
   protected Text workDirectoryField;
+
   protected Button fileLocationButton;
+
   protected Button workspaceLocationButton;
+
   protected Button fileWorkingDirectoryButton;
+
   protected Button workspaceWorkingDirectoryButton;
 
   protected Button runBackgroundButton;
+
   protected Text argumentField;
+
   protected Button variableButton;
 
   protected SelectionAdapter selectionAdapter;
@@ -95,10 +100,10 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
   }
 
   /**
-   * Creates the controls needed to edit the location
-   * attribute of an external tool
+   * Creates the controls needed to edit the location attribute of an external tool
    * 
-   * @param parent the composite to create the controls in
+   * @param parent
+   *          the composite to create the controls in
    */
   protected void createLocationComponent(Composite parent) {
     Font font = parent.getFont();
@@ -122,8 +127,11 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
     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.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);
     Composite buttonComposite = new Composite(parent, SWT.NONE);
     layout = new GridLayout();
     layout.marginWidth = 0;
@@ -136,13 +144,15 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
 
     createVerticalSpacer(buttonComposite, 1);
 
-    workspaceLocationButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.&Browse_Workspace..._3"), null); //$NON-NLS-1$
+    workspaceLocationButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages
+        .getString("ExternalToolsMainTab.&Browse_Workspace..._3"), null); //$NON-NLS-1$
     workspaceLocationButton.addSelectionListener(new SelectionAdapter() {
       public void widgetSelected(SelectionEvent evt) {
         handleWorkspaceLocationButtonSelected();
       }
     });
-    fileLocationButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Brows&e_File_System..._4"), null); //$NON-NLS-1$
+    fileLocationButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages
+        .getString("ExternalToolsMainTab.Brows&e_File_System..._4"), null); //$NON-NLS-1$
     fileLocationButton.addSelectionListener(new SelectionAdapter() {
       public void widgetSelected(SelectionEvent evt) {
         handleLocationButtonSelected();
@@ -151,10 +161,10 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
   }
 
   /**
-   * Creates the controls needed to edit the working directory
-   * attribute of an external tool
+   * Creates the controls needed to edit the working directory attribute of an external tool
    * 
-   * @param parent the composite to create the controls in
+   * @param parent
+   *          the composite to create the controls in
    */
   protected void createWorkDirectoryComponent(Composite parent) {
     Font font = parent.getFont();
@@ -189,13 +199,15 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
     buttonComposite.setFont(font);
 
     createVerticalSpacer(buttonComposite, 1);
-    workspaceWorkingDirectoryButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Browse_Wor&kspace..._6"), null); //$NON-NLS-1$
+    workspaceWorkingDirectoryButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages
+        .getString("ExternalToolsMainTab.Browse_Wor&kspace..._6"), null); //$NON-NLS-1$
     workspaceWorkingDirectoryButton.addSelectionListener(new SelectionAdapter() {
       public void widgetSelected(SelectionEvent evt) {
         handleWorkspaceWorkingDirectoryButtonSelected();
       }
     });
-    fileWorkingDirectoryButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Browse_F&ile_System..._7"), null); //$NON-NLS-1$
+    fileWorkingDirectoryButton = createPushButton(buttonComposite, ExternalToolsLaunchConfigurationMessages
+        .getString("ExternalToolsMainTab.Browse_F&ile_System..._7"), null); //$NON-NLS-1$
     fileWorkingDirectoryButton.addSelectionListener(new SelectionAdapter() {
       public void widgetSelected(SelectionEvent evt) {
         handleFileWorkingDirectoryButtonSelected();
@@ -204,10 +216,10 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
   }
 
   /**
-   * Creates the controls needed to edit the argument and
-   * prompt for argument attributes of an external tool
-   *
-   * @param parent the composite to create the controls in
+   * Creates the controls needed to edit the argument and prompt for argument attributes of an external tool
+   * 
+   * @param parent
+   *          the composite to create the controls in
    */
   protected void createArgumentComponent(Composite parent) {
     Font font = parent.getFont();
@@ -230,7 +242,8 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
       }
     });
 
-    variableButton = createPushButton(parent, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsOptionTab.Varia&bles..._2"), null); //$NON-NLS-1$
+    variableButton = createPushButton(parent, ExternalToolsLaunchConfigurationMessages
+        .getString("ExternalToolsOptionTab.Varia&bles..._2"), null); //$NON-NLS-1$
     variableButton.addSelectionListener(new SelectionAdapter() {
       public void widgetSelected(SelectionEvent e) {
         VariableSelectionDialog dialog = new VariableSelectionDialog(getShell());
@@ -241,7 +254,9 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
     });
 
     Label instruction = new Label(parent, SWT.NONE);
-    instruction.setText(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsOptionTab.Note__Enclose_an_argument_containing_spaces_using_double-quotes_(__)._Not_applicable_for_variables._3")); //$NON-NLS-1$
+    instruction
+        .setText(ExternalToolsLaunchConfigurationMessages
+            .getString("ExternalToolsOptionTab.Note__Enclose_an_argument_containing_spaces_using_double-quotes_(__)._Not_applicable_for_variables._3")); //$NON-NLS-1$
     data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
     data.horizontalSpan = 2;
     instruction.setLayoutData(data);
@@ -249,14 +264,15 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
   }
 
   /**
-   * Creates the controls needed to edit the run in background
-   * attribute of an external tool
-   *
-   * @param parent the composite to create the controls in
+   * Creates the controls needed to edit the run in background attribute of an external tool
+   * 
+   * @param parent
+   *          the composite to create the controls in
    */
   protected void createRunBackgroundComponent(Composite parent) {
     runBackgroundButton = new Button(parent, SWT.CHECK);
-    runBackgroundButton.setText(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsOptionTab.Run_tool_in_bac&kground_4")); //$NON-NLS-1$
+    runBackgroundButton.setText(ExternalToolsLaunchConfigurationMessages
+        .getString("ExternalToolsOptionTab.Run_tool_in_bac&kground_4")); //$NON-NLS-1$
     GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
     runBackgroundButton.setLayoutData(data);
     runBackgroundButton.setFont(parent.getFont());
@@ -285,7 +301,8 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
     try {
       workingDir = configuration.getAttribute(IExternalToolConstants.ATTR_WORKING_DIRECTORY, ""); //$NON-NLS-1$
     } catch (CoreException ce) {
-      ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Error_reading_configuration_10"), ce); //$NON-NLS-1$
+      ExternalToolsPlugin.getDefault().log(
+          ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Error_reading_configuration_10"), ce); //$NON-NLS-1$
     }
     workDirectoryField.setText(workingDir);
     workDirectoryField.addModifyListener(modifyListener);
@@ -297,7 +314,8 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
     try {
       location = configuration.getAttribute(IExternalToolConstants.ATTR_LOCATION, ""); //$NON-NLS-1$
     } catch (CoreException ce) {
-      ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Error_reading_configuration_10"), ce); //$NON-NLS-1$
+      ExternalToolsPlugin.getDefault().log(
+          ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Error_reading_configuration_10"), ce); //$NON-NLS-1$
     }
     locationField.setText(location);
     locationField.addModifyListener(modifyListener);
@@ -308,7 +326,8 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
     try {
       arguments = configuration.getAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, ""); //$NON-NLS-1$
     } catch (CoreException ce) {
-      ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsOptionTab.Error_reading_configuration_7"), ce); //$NON-NLS-1$
+      ExternalToolsPlugin.getDefault().log(
+          ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsOptionTab.Error_reading_configuration_7"), ce); //$NON-NLS-1$
     }
     argumentField.setText(arguments);
   }
@@ -318,7 +337,8 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
     try {
       runInBackgroud = configuration.getAttribute(IExternalToolConstants.ATTR_RUN_IN_BACKGROUND, false);
     } catch (CoreException ce) {
-      ExternalToolsPlugin.getDefault().log(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsOptionTab.Error_reading_configuration_7"), ce); //$NON-NLS-1$
+      ExternalToolsPlugin.getDefault().log(
+          ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsOptionTab.Error_reading_configuration_7"), ce); //$NON-NLS-1$
     }
     runBackgroundButton.setSelection(runInBackgroud);
   }
@@ -373,7 +393,8 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
   protected boolean validateLocation() {
     String value = locationField.getText().trim();
     if (value.length() < 1) {
-      setErrorMessage(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.External_tool_location_cannot_be_empty_18")); //$NON-NLS-1$
+      setErrorMessage(ExternalToolsLaunchConfigurationMessages
+          .getString("ExternalToolsMainTab.External_tool_location_cannot_be_empty_18")); //$NON-NLS-1$
       setMessage(null);
       return false;
     }
@@ -393,11 +414,13 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
 
     File file = new File(value);
     if (!file.exists()) { // The file does not exist.
-      setErrorMessage(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.External_tool_location_does_not_exist_19")); //$NON-NLS-1$
+      setErrorMessage(ExternalToolsLaunchConfigurationMessages
+          .getString("ExternalToolsMainTab.External_tool_location_does_not_exist_19")); //$NON-NLS-1$
       return false;
     }
     if (!file.isFile()) {
-      setErrorMessage(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.External_tool_location_specified_is_not_a_file_20")); //$NON-NLS-1$
+      setErrorMessage(ExternalToolsLaunchConfigurationMessages
+          .getString("ExternalToolsMainTab.External_tool_location_specified_is_not_a_file_20")); //$NON-NLS-1$
       return false;
     }
     return true;
@@ -424,7 +447,8 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
 
       File file = new File(value);
       if (!file.exists()) { // The directory does not exist.
-        setErrorMessage(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.External_tool_working_directory_does_not_exist_or_is_invalid_21")); //$NON-NLS-1$
+        setErrorMessage(ExternalToolsLaunchConfigurationMessages
+            .getString("ExternalToolsMainTab.External_tool_working_directory_does_not_exist_or_is_invalid_21")); //$NON-NLS-1$
         return false;
       }
     }
@@ -441,13 +465,13 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
   }
 
   /**
-   * Prompts the user for a workspace location within the workspace and sets
-   * the location as a String containing the workspace_loc variable or
-   * <code>null</code> if no location was obtained from the user.
+   * Prompts the user for a workspace location within the workspace and sets the location as a String containing the workspace_loc
+   * variable or <code>null</code> if no location was obtained from the user.
    */
   protected void handleWorkspaceLocationButtonSelected() {
     ResourceSelectionDialog dialog;
-    dialog = new ResourceSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Select_a_resource_22")); //$NON-NLS-1$
+    dialog = new ResourceSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(),
+        ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Select_a_resource_22")); //$NON-NLS-1$
     dialog.open();
     Object[] results = dialog.getResult();
     if (results == null || results.length < 1) {
@@ -463,13 +487,13 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
   }
 
   /**
-   * Prompts the user for a working directory location within the workspace
-   * and sets the working directory as a String containing the workspace_loc
-   * variable or <code>null</code> if no location was obtained from the user.
+   * Prompts the user for a working directory location within the workspace and sets the working directory as a String containing
+   * the workspace_loc variable or <code>null</code> if no location was obtained from the user.
    */
   protected void handleWorkspaceWorkingDirectoryButtonSelected() {
     ContainerSelectionDialog containerDialog;
-    containerDialog = new ContainerSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), false, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.&Select_a_directory__23")); //$NON-NLS-1$
+    containerDialog = new ContainerSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
+        ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.&Select_a_directory__23")); //$NON-NLS-1$
     containerDialog.open();
     Object[] resource = containerDialog.getResult();
     String text = null;
@@ -500,6 +524,7 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
 
   /**
    * Method getSelectionAdapter.
+   * 
    * @return SelectionListener
    */
   protected SelectionListener getSelectionAdapter() {
@@ -515,15 +540,18 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
 
   private class VariableSelectionDialog extends SelectionDialog {
     private ExternalToolVariableForm form;
+
     private VariableSelectionDialog(Shell parent) {
       super(parent);
       setTitle(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsOptionTab.Select_variable_10")); //$NON-NLS-1$
     }
+
     protected Control createDialogArea(Composite parent) {
       // Create the dialog area
       Composite composite = (Composite) super.createDialogArea(parent);
       ExternalToolVariable[] variables = ExternalToolsPlugin.getDefault().getArgumentVariableRegistry().getArgumentVariables();
-      form = new ExternalToolVariableForm(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsOptionTab.&Choose_a_variable__11"), variables); //$NON-NLS-1$
+      form = new ExternalToolVariableForm(ExternalToolsLaunchConfigurationMessages
+          .getString("ExternalToolsOptionTab.&Choose_a_variable__11"), variables); //$NON-NLS-1$
       form.createContents(composite, new IGroupDialogPage() {
         public GridData setButtonGridData(Button button) {
           GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
@@ -567,4 +595,4 @@ public class ExternalToolsMainTab extends AbstractLaunchConfigurationTab {
     }
   }
 
-}
+}
\ No newline at end of file