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

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java
index e45fdb1..2368be5 100644
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java
@@ -1,5 +1,12 @@
 package net.sourceforge.phpdt.internal.debug.ui.launcher;
 
+import net.sourceforge.phpdt.debug.ui.PHPDebugUiConstants;
+import net.sourceforge.phpdt.debug.ui.PHPDebugUiImages;
+import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages;
+import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin;
+import net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationAttribute;
+import net.sourceforge.phpdt.internal.ui.util.DirectorySelector;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
@@ -16,16 +23,12 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import net.sourceforge.phpdt.debug.ui.PHPDebugUiConstants;
-import net.sourceforge.phpdt.debug.ui.PHPDebugUiImages;
-import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages;
-import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin;
-import net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationAttribute;
-import net.sourceforge.phpdt.internal.ui.util.DirectorySelector;
 
 public class PHPArgumentsTab extends AbstractLaunchConfigurationTab {
 	protected Text interpreterArgsText, programArgsText;
+
 	protected DirectorySelector workingDirectorySelector;
+
 	protected Button useDefaultWorkingDirectoryButton;
 
 	public PHPArgumentsTab() {
@@ -35,37 +38,51 @@ public class PHPArgumentsTab extends AbstractLaunchConfigurationTab {
 	public void createControl(Composite parent) {
 		Composite composite = createPageRoot(parent);
 
-		new Label(composite, SWT.NONE).setText(PHPDebugUiMessages.getString("LaunchConfigurationTab.PHPArguments.working_dir"));
+		new Label(composite, SWT.NONE).setText(PHPDebugUiMessages
+				.getString("LaunchConfigurationTab.PHPArguments.working_dir"));
 		workingDirectorySelector = new DirectorySelector(composite);
-		workingDirectorySelector.setBrowseDialogMessage(PHPDebugUiMessages.getString("LaunchConfigurationTab.PHPArguments.working_dir_browser_message"));
-		workingDirectorySelector.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		workingDirectorySelector
+				.setBrowseDialogMessage(PHPDebugUiMessages
+						.getString("LaunchConfigurationTab.PHPArguments.working_dir_browser_message"));
+		workingDirectorySelector.setLayoutData(new GridData(
+				GridData.FILL_HORIZONTAL));
 		workingDirectorySelector.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				updateLaunchConfigurationDialog();
 			}
 		});
 
-		Composite defaultWorkingDirectoryComposite = new Composite(composite, SWT.NONE);
+		Composite defaultWorkingDirectoryComposite = new Composite(composite,
+				SWT.NONE);
 		GridLayout layout = new GridLayout();
 		layout.numColumns = 2;
 		defaultWorkingDirectoryComposite.setLayout(layout);
-		useDefaultWorkingDirectoryButton = new Button(defaultWorkingDirectoryComposite, SWT.CHECK);
-		useDefaultWorkingDirectoryButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				setUseDefaultWorkingDirectory(((Button) e.getSource()).getSelection());
-			}
-		});
-		new Label(defaultWorkingDirectoryComposite, SWT.NONE).setText(PHPDebugUiMessages.getString("LaunchConfigurationTab.PHPArguments.working_dir_use_default_message"));
+		useDefaultWorkingDirectoryButton = new Button(
+				defaultWorkingDirectoryComposite, SWT.CHECK);
+		useDefaultWorkingDirectoryButton
+				.addSelectionListener(new SelectionAdapter() {
+					public void widgetSelected(SelectionEvent e) {
+						setUseDefaultWorkingDirectory(((Button) e.getSource())
+								.getSelection());
+					}
+				});
+		new Label(defaultWorkingDirectoryComposite, SWT.NONE)
+				.setText(PHPDebugUiMessages
+						.getString("LaunchConfigurationTab.PHPArguments.working_dir_use_default_message"));
 		defaultWorkingDirectoryComposite.pack();
 
-		Label verticalSpacer = new Label(composite, SWT.NONE);
-
-		new Label(composite, SWT.NONE).setText(PHPDebugUiMessages.getString("LaunchConfigurationTab.PHPArguments.interpreter_args_box_title"));
-		interpreterArgsText = new Text(composite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
+		new Label(composite, SWT.NONE)
+				.setText(PHPDebugUiMessages
+						.getString("LaunchConfigurationTab.PHPArguments.interpreter_args_box_title"));
+		interpreterArgsText = new Text(composite, SWT.MULTI | SWT.V_SCROLL
+				| SWT.BORDER);
 		interpreterArgsText.setLayoutData(new GridData(GridData.FILL_BOTH));
 
-		new Label(composite, SWT.NONE).setText(PHPDebugUiMessages.getString("LaunchConfigurationTab.PHPArguments.program_args_box_title"));
-		programArgsText = new Text(composite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
+		new Label(composite, SWT.NONE)
+				.setText(PHPDebugUiMessages
+						.getString("LaunchConfigurationTab.PHPArguments.program_args_box_title"));
+		programArgsText = new Text(composite, SWT.MULTI | SWT.V_SCROLL
+				| SWT.BORDER);
 		programArgsText.setLayoutData(new GridData(GridData.FILL_BOTH));
 	}
 
@@ -73,25 +90,34 @@ public class PHPArgumentsTab extends AbstractLaunchConfigurationTab {
 		if (!useDefaultWorkingDirectoryButton.getSelection() == useDefault)
 			useDefaultWorkingDirectoryButton.setSelection(useDefault);
 		if (useDefault)
-			workingDirectorySelector.setSelectionText(PHPDebugUiConstants.DEFAULT_WORKING_DIRECTORY);
+			workingDirectorySelector
+					.setSelectionText(PHPDebugUiConstants.DEFAULT_WORKING_DIRECTORY);
 		workingDirectorySelector.setEnabled(!useDefault);
 	}
 
 	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		setUseDefaultWorkingDirectory(true);
-		configuration.setAttribute(PHPLaunchConfigurationAttribute.WORKING_DIRECTORY, PHPDebugUiConstants.DEFAULT_WORKING_DIRECTORY);
+		configuration.setAttribute(
+				PHPLaunchConfigurationAttribute.WORKING_DIRECTORY,
+				PHPDebugUiConstants.DEFAULT_WORKING_DIRECTORY);
 		// set hidden attribute
-		//configuration.setAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, "net.sourceforge.phpdt.internal.debug.ui.PHPSourceLocator") ;
+		configuration.setAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID,
+				"net.sourceforge.phpdt.debug.ui.PHPSourceLocator");
 	}
 
 	public void initializeFrom(ILaunchConfiguration configuration) {
 		String workingDirectory = "", interpreterArgs = "", programArgs = "";
 		boolean useDefaultWorkDir = true;
 		try {
-			workingDirectory = configuration.getAttribute(PHPLaunchConfigurationAttribute.WORKING_DIRECTORY, "");
-			interpreterArgs = configuration.getAttribute(PHPLaunchConfigurationAttribute.INTERPRETER_ARGUMENTS, "");
-			programArgs = configuration.getAttribute(PHPLaunchConfigurationAttribute.PROGRAM_ARGUMENTS, "");
-			useDefaultWorkDir = configuration.getAttribute(PHPLaunchConfigurationAttribute.USE_DEFAULT_WORKING_DIRECTORY, true);
+			workingDirectory = configuration.getAttribute(
+					PHPLaunchConfigurationAttribute.WORKING_DIRECTORY, "");
+			interpreterArgs = configuration.getAttribute(
+					PHPLaunchConfigurationAttribute.INTERPRETER_ARGUMENTS, "");
+			programArgs = configuration.getAttribute(
+					PHPLaunchConfigurationAttribute.PROGRAM_ARGUMENTS, "");
+			useDefaultWorkDir = configuration
+					.getAttribute(
+							PHPLaunchConfigurationAttribute.USE_DEFAULT_WORKING_DIRECTORY,
+							true);
 		} catch (CoreException e) {
 			log(e);
 		}
@@ -103,10 +129,18 @@ public class PHPArgumentsTab extends AbstractLaunchConfigurationTab {
 	}
 
 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(PHPLaunchConfigurationAttribute.WORKING_DIRECTORY, workingDirectorySelector.getValidatedSelectionText());
-		configuration.setAttribute(PHPLaunchConfigurationAttribute.INTERPRETER_ARGUMENTS, interpreterArgsText.getText());
-		configuration.setAttribute(PHPLaunchConfigurationAttribute.PROGRAM_ARGUMENTS, programArgsText.getText());
-		configuration.setAttribute(PHPLaunchConfigurationAttribute.USE_DEFAULT_WORKING_DIRECTORY, useDefaultWorkingDirectoryButton.getSelection());
+		configuration.setAttribute(
+				PHPLaunchConfigurationAttribute.WORKING_DIRECTORY,
+				workingDirectorySelector.getValidatedSelectionText());
+		configuration.setAttribute(
+				PHPLaunchConfigurationAttribute.INTERPRETER_ARGUMENTS,
+				interpreterArgsText.getText());
+		configuration.setAttribute(
+				PHPLaunchConfigurationAttribute.PROGRAM_ARGUMENTS,
+				programArgsText.getText());
+		configuration.setAttribute(
+				PHPLaunchConfigurationAttribute.USE_DEFAULT_WORKING_DIRECTORY,
+				useDefaultWorkingDirectoryButton.getSelection());
 	}
 
 	protected Composite createPageRoot(Composite parent) {
@@ -121,14 +155,17 @@ public class PHPArgumentsTab extends AbstractLaunchConfigurationTab {
 	}
 
 	public String getName() {
-		return PHPDebugUiMessages.getString("LaunchConfigurationTab.PHPArguments.name");
+		return PHPDebugUiMessages
+				.getString("LaunchConfigurationTab.PHPArguments.name");
 	}
 
 	public boolean isValid(ILaunchConfiguration launchConfig) {
 		try {
-			String workingDirectory = launchConfig.getAttribute(PHPLaunchConfigurationAttribute.WORKING_DIRECTORY, "");
+			String workingDirectory = launchConfig.getAttribute(
+					PHPLaunchConfigurationAttribute.WORKING_DIRECTORY, "");
 			if (workingDirectory.length() == 0) {
-				setErrorMessage(PHPDebugUiMessages.getString("LaunchConfigurationTab.PHPArguments.working_dir_error_message"));
+				setErrorMessage(PHPDebugUiMessages
+						.getString("LaunchConfigurationTab.PHPArguments.working_dir_error_message"));
 				return false;
 			}
 		} catch (CoreException e) {
@@ -138,9 +175,9 @@ public class PHPArgumentsTab extends AbstractLaunchConfigurationTab {
 		setErrorMessage(null);
 		return true;
 	}
-	
+
 	protected void log(Throwable t) {
-		PHPDebugUiPlugin.getDefault().log(t);
+		PHPDebugUiPlugin.log(t);
 	}
 
 	public Image getImage() {