Revert "Bug 522027 - Remove trailing whitespace from org.eclipse.ui.externaltools"

This reverts commit 597f63f236bb78f7dd63a019735a9fd53d5361ea.

Change-Id: Id5f826090359188cc01972d112751250b898b945

10 files changed, 57 insertions, 57 deletions

diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.java
index e84a10414..bd7651f0c 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.java
@@ -3,8 +3,8 @@
  * program and the accompanying materials are made available under the terms of
  * the Eclipse Public License v1.0 which accompanies this distribution, and is
  * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
+ * 
+ * Contributors: 
  * IBM - Initial API and implementation
  * dakshinamurthy.karra@gmail.com - bug 165371
  **********************************************************************/
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java
index 507dccd56..8f7a871b2 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java
@@ -33,7 +33,7 @@ public class ExternalToolsUtil {
 	/**
 	 * Throws a core exception with an error status object built from
 	 * the given message, lower level exception, and error code.
-	 *
+	 * 
 	 * @param message the status message
 	 * @param exception lower level exception associated with the
 	 *  error, or <code>null</code> if none
@@ -42,14 +42,14 @@ public class ExternalToolsUtil {
 	protected static void abort(String message, Throwable exception, int code) throws CoreException {
 		throw new CoreException(new Status(IStatus.ERROR, ExternalToolsPlugin.PLUGIN_ID, code, message, exception));
 	}
-
+	
 	/**
 	 * Expands and returns the location attribute of the given launch
 	 * configuration. The location is
 	 * verified to point to an existing file, in the local file system.
-	 *
+	 * 
 	 * @param configuration launch configuration
-	 * @return an absolute path to a file in the local file system
+	 * @return an absolute path to a file in the local file system  
 	 * @throws CoreException if unable to retrieve the associated launch
 	 * configuration attribute, if unable to resolve any variables, or if the
 	 * resolved location does not point to an existing file in the local file
@@ -58,11 +58,11 @@ public class ExternalToolsUtil {
 	public static IPath getLocation(ILaunchConfiguration configuration) throws CoreException {
 		return ExternalToolsCoreUtil.getLocation(configuration);
 	}
-
+	
 	/**
 	 * Returns a boolean specifying whether or not output should be captured for
 	 * the given configuration
-	 *
+	 * 
 	 * @param configuration the configuration from which the value will be
 	 * extracted
 	 * @return boolean specifying whether or not output should be captured
@@ -77,7 +77,7 @@ public class ExternalToolsUtil {
 	 * configuration. Returns <code>null</code> if a working directory is not
 	 * specified. If specified, the working is verified to point to an existing
 	 * directory in the local file system.
-	 *
+	 * 
 	 * @param configuration launch configuration
 	 * @return an absolute path to a directory in the local file system, or
 	 * <code>null</code> if unspecified
@@ -93,7 +93,7 @@ public class ExternalToolsUtil {
 	/**
 	 * Expands and returns the arguments attribute of the given launch
 	 * configuration. Returns <code>null</code> if arguments are not specified.
-	 *
+	 * 
 	 * @param configuration launch configuration
 	 * @return an array of resolved arguments, or <code>null</code> if
 	 * unspecified
@@ -103,13 +103,13 @@ public class ExternalToolsUtil {
 	public static String[] getArguments(ILaunchConfiguration configuration) throws CoreException {
 		return ExternalToolsCoreUtil.getArguments(configuration);
 	}
-
+	
 	/**
 	 * Returns whether the given launch configuration is enabled. This property
 	 * is intended only to apply to external tool builder configurations and
 	 * determines whether the project builder will launch the configuration
 	 * when it builds.
-	 *
+	 *  
 	 * @param configuration the configuration for which the enabled state should
 	 * 		be determined.
 	 * @return whether the given configuration is enabled to be run when a build occurs.
@@ -118,30 +118,30 @@ public class ExternalToolsUtil {
 	public static boolean isBuilderEnabled(ILaunchConfiguration configuration) throws CoreException {
 		return ExternalToolsCoreUtil.isBuilderEnabled(configuration);
 	}
-
+	
 	/**
 	 * Returns the collection of resources for the build scope as specified by the given launch configuration.
-	 *
+	 * 
 	 * @param configuration launch configuration
 	 * @throws CoreException if an exception occurs while retrieving the resources
 	 */
 	public static IResource[] getResourcesForBuildScope(ILaunchConfiguration configuration) throws CoreException {
 		return ExternalToolsCoreUtil.getResourcesForBuildScope(configuration);
 	}
-
+	
 	/**
 	 * Parses the argument text into an array of individual
 	 * strings using the space character as the delimiter.
 	 * An individual argument containing spaces must have a
-	 * double quote (") at the start and end. Two double
+	 * double quote (") at the start and end. Two double 
 	 * quotes together is taken to mean an embedded double
 	 * quote in the argument text.
-	 *
+	 * 
 	 * @param arguments the arguments as one string
 	 * @return the array of arguments
 	 */
 	public static String[] parseStringIntoList(String arguments) {
 		return ExternalToolsCoreUtil.parseStringIntoList(arguments);
-	}
-
+	}	
+	
 }
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/menu/OpenExternalToolsConfigurations.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/menu/OpenExternalToolsConfigurations.java
index 4ce5b12b6..dcb105fd0 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/menu/OpenExternalToolsConfigurations.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/menu/OpenExternalToolsConfigurations.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsImages.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsImages.java
index a476b0e10..9fc9e6b38 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsImages.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsImages.java
@@ -26,11 +26,11 @@ import org.eclipse.swt.graphics.Image;
  */
 public class ExternalToolsImages {
 
-	/**
+	/** 
 	 * The image registry containing <code>Image</code>s.
 	 */
 	private static ImageRegistry imageRegistry;
-
+	
 	/**
 	 * The registry for composite images
 	 */
@@ -40,17 +40,17 @@ public class ExternalToolsImages {
 	private static URL ICON_BASE_URL= null;
 
 	static {
-		String pathSuffix = "icons/full/"; //$NON-NLS-1$
+		String pathSuffix = "icons/full/"; //$NON-NLS-1$	
 		ICON_BASE_URL= ExternalToolsPlugin.getDefault().getBundle().getEntry(pathSuffix);
 	}
 
 	// Use IPath and toOSString to build the names to ensure they have the slashes correct
 	private final static String OBJECT= "obj16/"; //basic colors - size 16x16 //$NON-NLS-1$
-
+	
 	/**
 	 * Declare all images
 	 */
-	private static void declareImages() {
+	private static void declareImages() {		
 		// Objects
 		declareRegistryImage(IExternalToolConstants.IMG_TAB_MAIN, OBJECT + "main_tab.png"); //$NON-NLS-1$
 		declareRegistryImage(IExternalToolConstants.IMG_TAB_BUILD, OBJECT + "build_tab.png"); //$NON-NLS-1$
@@ -70,7 +70,7 @@ public class ExternalToolsImages {
 		}
 		imageRegistry.put(key, desc);
 	}
-
+	
 	/**
 	 * Returns the ImageRegistry.
 	 */
@@ -122,7 +122,7 @@ public class ExternalToolsImages {
 	public static Image getImage(String key) {
 		return getImageRegistry().get(key);
 	}
-
+	
 	/**
 	 * Returns the <code>ImageDescriptor<code> identified by the given key,
 	 * or <code>null</code> if it does not exist.
@@ -130,15 +130,15 @@ public class ExternalToolsImages {
 	public static ImageDescriptor getImageDescriptor(String key) {
 		return getImageRegistry().getDescriptor(key);
 	}
-
+	
 	private static URL makeIconFileURL(String iconPath) throws MalformedURLException {
 		if (ICON_BASE_URL == null) {
 			throw new MalformedURLException();
 		}
-
+			
 		return new URL(ICON_BASE_URL, iconPath);
 	}
-
+	
 	/**
 	 * Sets the three image descriptors for enabled, disabled, and hovered to an action. The actions
 	 * are retrieved from the *lcl16 folders.
@@ -146,9 +146,9 @@ public class ExternalToolsImages {
 	public static void setLocalImageDescriptors(IAction action, String iconName) {
 		setImageDescriptors(action, "lcl16", iconName); //$NON-NLS-1$
 	}
-
+	
 	private static void setImageDescriptors(IAction action, String type, String relPath) {
-
+		
 		try {
 			ImageDescriptor id= ImageDescriptor.createFromURL(makeIconFileURL("d" + type, relPath)); //$NON-NLS-1$
 			if (id != null)
@@ -167,18 +167,18 @@ public class ExternalToolsImages {
 
 		action.setImageDescriptor(create("e" + type, relPath)); //$NON-NLS-1$
 	}
-
+	
 	private static URL makeIconFileURL(String prefix, String name) throws MalformedURLException {
 		if (ICON_BASE_URL == null) {
 			throw new MalformedURLException();
 		}
-
+		
 		StringBuffer buffer= new StringBuffer(prefix);
 		buffer.append('/');
 		buffer.append(name);
 		return new URL(ICON_BASE_URL, buffer.toString());
 	}
-
+	
 	private static ImageDescriptor create(String prefix, String name) {
 		try {
 			return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name));
@@ -187,20 +187,20 @@ public class ExternalToolsImages {
 			return ImageDescriptor.getMissingImageDescriptor();
 		}
 	}
-
-	/**
-	 * Returns the image for the given composite descriptor.
+	
+	/** 
+	 * Returns the image for the given composite descriptor. 
 	 */
 	public static Image getImage(CompositeImageDescriptor imageDescriptor) {
 		if (imageDescriptorRegistry == null) {
-			imageDescriptorRegistry = new ImageDescriptorRegistry();
+			imageDescriptorRegistry = new ImageDescriptorRegistry();	
 		}
 		return imageDescriptorRegistry.get(imageDescriptor);
 	}
-
+	
 	public static void disposeImageDescriptorRegistry() {
 		if (imageDescriptorRegistry != null) {
-			imageDescriptorRegistry.dispose();
+			imageDescriptorRegistry.dispose(); 
 		}
 	}
 }
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsModelMessages.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsModelMessages.java
index f3070965f..3b66a05c5 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsModelMessages.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolsModelMessages.java
@@ -3,8 +3,8 @@
  * program and the accompanying materials are made available under the terms of
  * the Eclipse Public License v1.0 which accompanies this distribution, and is
  * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
+ * 
+ * Contributors: 
  * IBM - Initial API and implementation
  **********************************************************************/
 package org.eclipse.ui.externaltools.internal.model;
@@ -13,7 +13,7 @@ import org.eclipse.osgi.util.NLS;
 
 public class ExternalToolsModelMessages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.ui.externaltools.internal.model.ExternalToolsModelMessages";//$NON-NLS-1$
-
+    
 	public static String ImageDescriptorRegistry_Allocating_image_for_wrong_display_1;
 	public static String BuilderUtils_5;
 	public static String BuilderUtils_6;
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/IExternalToolsHelpContextIds.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/IExternalToolsHelpContextIds.java
index bce35c8a2..5b557bf92 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/IExternalToolsHelpContextIds.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/IExternalToolsHelpContextIds.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
@@ -20,17 +20,17 @@ package org.eclipse.ui.externaltools.internal.model;
  */
 public interface IExternalToolsHelpContextIds {
 	public static final String PREFIX = "org.eclipse.ui.externaltools."; //$NON-NLS-1$
-
+	
 	// Preference Pages
 	public static final String EXTERNAL_TOOLS_PREFERENCE_PAGE = PREFIX + "preference_page_context";  //$NON-NLS-1$
-
+		
 	// Property Pages
 	public static final String EXTERNAL_TOOLS_BUILDER_PROPERTY_PAGE = PREFIX + "builder_property_page_context"; //$NON-NLS-1$
-
+	
 	//Dialogs
 	public static final String MESSAGE_WITH_TOGGLE_DIALOG = PREFIX + "message_with_toggle_dialog_context"; //$NON-NLS-1$
 	public static final String FILE_SELECTION_DIALOG = PREFIX + "file_selection_dialog_context"; //$NON-NLS-1$
-
+	
 	//Launch configuration dialog tabs
 	public static final String EXTERNAL_TOOLS_LAUNCH_CONFIGURATION_DIALOG_BUILDER_TAB = PREFIX + "builders_tab_context"; //$NON-NLS-1$
 	public static final String EXTERNAL_TOOLS_LAUNCH_CONFIGURATION_DIALOG_PROGRAM_MAIN_TAB = PREFIX + "program_main_tab_context"; //$NON-NLS-1$
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/IPreferenceConstants.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/IPreferenceConstants.java
index 167409ee4..ab0944c78 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/IPreferenceConstants.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/IPreferenceConstants.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- *
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
@@ -15,7 +15,7 @@ package org.eclipse.ui.externaltools.internal.model;
  * Constants used to identify user preferences.
  */
 public interface IPreferenceConstants {
-
+	
 	/**
 	 * Boolean preference key which indicates whether or not the user should be prompted
 	 * before an external tool project builder is migrated to the new builder format.
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.java
index 17cb8eb67..e51a01194 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.java
@@ -3,8 +3,8 @@
  * program and the accompanying materials are made available under the terms of
  * the Eclipse Public License v1.0 which accompanies this distribution, and is
  * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
+ * 
+ * Contributors: 
  * IBM - Initial API and implementation
  **********************************************************************/
 package org.eclipse.ui.externaltools.internal.ui;
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.java
index c091d81a8..959a71486 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.java
@@ -3,8 +3,8 @@
  * program and the accompanying materials are made available under the terms of
  * the Eclipse Public License v1.0 which accompanies this distribution, and is
  * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
+ * 
+ * Contributors: 
  * IBM - Initial API and implementation
  **********************************************************************/
 package org.eclipse.ui.externaltools.internal.variables;
diff --git a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.java b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.java
index 084c864d7..da41c1ff8 100644
--- a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.java
+++ b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ExternalToolsProgramMessages.java
@@ -3,8 +3,8 @@
  * program and the accompanying materials are made available under the terms of
  * the Eclipse Public License v1.0 which accompanies this distribution, and is
  * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
+ * 
+ * Contributors: 
  * IBM - Initial API and implementation
  **********************************************************************/
 package org.eclipse.ui.externaltools.internal.program.launchConfigurations;