Bug 509946 - [clean up] fix trailing spaces in platform help once andY20170112-1300Y20170112-1000Y20170105-1040Y20170105-1000I20170112-0245I20170112-0200I20170111-2000I20170111-0200I20170110-2000I20170109-2000I20170108-2000I20170107-2000I20170106-2000I20170105-2000I20170105-0320I20170105-0230I20170104-2000

forever

Applied Cleanup-> Remove trailing spaces on all help projects. Only
those four projects had whitespace issues: org.eclipse.help.ui,
org.eclipse.ui.intro.quicklinks, org.eclipse.ui.intro.universal,
org.eclipse.ui.intro. Same four projects haven't automatic save actions
enabled, therefore I've updated the settings too.

Change-Id: If7f896ab4ceb6587af6f211057729f443fd016cb
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

21 files changed, 197 insertions, 138 deletions

diff --git a/org.eclipse.ui.intro.universal/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.ui.intro.universal/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 000000000..3f3352a58
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,59 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=false
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/BaseData.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/BaseData.java
index 82ec33ae1..a022398b1 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/BaseData.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/BaseData.java
@@ -24,7 +24,7 @@ public abstract class BaseData {
 	public GroupData getParent() {
 		return parent;
 	}
-	
+
 	public abstract void write(PrintWriter writer, String indent);
 
 	public String getId() {
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationContentsArea.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationContentsArea.java
index 9a404f434..2f4d9ab02 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationContentsArea.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationContentsArea.java
@@ -266,7 +266,7 @@ public class CustomizationContentsArea {
 			sel = null;
 		}
 	}
-	
+
 	CustomizationContentsArea() {
 	}
 
@@ -349,7 +349,7 @@ public class CustomizationContentsArea {
 			}
 			return super.getText(obj);
 		}
-		
+
 		@Override
 		public Image getImage(Object obj) {
 			if (obj instanceof ExtensionData) {
@@ -397,7 +397,7 @@ public class CustomizationContentsArea {
 		public String getId() {
 			return element.getAttribute("id"); //$NON-NLS-1$
 		}
-		
+
 		public boolean isScalable() {
 			return "true".equals(element.getAttribute(FontSelection.ATT_SCALABLE)); //$NON-NLS-1$
 		}
@@ -405,7 +405,7 @@ public class CustomizationContentsArea {
 		public IntroTheme(IConfigurationElement element) {
 			this.element = element;
 		}
-		
+
 		public Image getPreviewImage() {
 			if (previewImage==null) {
 				String path = element.getAttribute("previewImage"); //$NON-NLS-1$
@@ -420,7 +420,7 @@ public class CustomizationContentsArea {
 			}
 			return previewImage;
 		}
-		
+
 		public void dispose() {
 			if (previewImage!=null) {
 				previewImage.dispose();
@@ -552,7 +552,7 @@ public class CustomizationContentsArea {
 		gd.verticalSpan = 3;
 		gd.widthHint = 10;
 		label.setLayoutData(gd);
-		
+
 		label = new Label(pageContainer, SWT.NULL);
 		label.setText(Messages.WelcomeCustomizationPreferencePage_left);
 		label = new Label(pageContainer, SWT.NULL);
@@ -581,7 +581,7 @@ public class CustomizationContentsArea {
 		gd = new GridData(GridData.FILL_BOTH);
 		gd.widthHint = 100;
 		bottomLeft.getControl().setLayoutData(gd);
-		
+
 		bottomRight = createTableViewer(pageContainer, "bottom-right"); //$NON-NLS-1$
 		gd = new GridData(GridData.FILL_BOTH);
 		gd.widthHint = 100;
@@ -716,7 +716,7 @@ public class CustomizationContentsArea {
 	private void enableFontsButton() {
 		if (introTheme != null) {
 			useRelativeFonts.setEnabled(introTheme.isScalable());
-		}	
+		}
 	}
 
 	private void updateThemePreview() {
@@ -739,7 +739,7 @@ public class CustomizationContentsArea {
 
 	/**
 	 * Remember the current page, close intro, reopen it and show the saved page.
-	 * 
+	 *
 	 */
 	private void restartIntro() {
 		IIntroManager manager = PlatformUI.getWorkbench().getIntroManager();
@@ -943,7 +943,7 @@ public class CustomizationContentsArea {
 		});
 		item.setControl(container);
 	}
-	
+
 	private void loadThemes() {
 		IConfigurationElement [] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.ui.intro.configExtension"); //$NON-NLS-1$
 		for (int i=0; i<elements.length; i++) {
@@ -1077,7 +1077,7 @@ public class CustomizationContentsArea {
 
 	private void fillPopupMenu(IMenuManager manager, final TableViewer viewer) {
 		StructuredSelection ssel = (StructuredSelection) viewer.getSelection();
-		
+
 		manager.add(new Separator());
 		Action addSeparator = new Action(Messages.WelcomeCustomizationPreferencePage_addSeparator) {
 			@Override
@@ -1085,7 +1085,7 @@ public class CustomizationContentsArea {
 				doAddSeparator(viewer);
 			}
 		};
-		
+
 		manager.add(addSeparator);
 		manager.add(new Separator());
 
@@ -1121,9 +1121,9 @@ public class CustomizationContentsArea {
 			addMoveToAction(menu, bottomLeft, viewer, Messages.WelcomeCustomizationPreferencePage_menu_bottom_left);
 			addMoveToAction(menu, bottomRight, viewer, Messages.WelcomeCustomizationPreferencePage_menu_bottom_right);
 			manager.add(menu);
-			
+
 			boolean addDeleteSeparator=false;
-			
+
 			for (Iterator<?> iter=ssel.iterator(); iter.hasNext();) {
 				Object obj = iter.next();
 				if (obj instanceof SeparatorData)
@@ -1168,7 +1168,7 @@ public class CustomizationContentsArea {
 			gd.moveDown((BaseData) obj);
 		viewer.refresh();
 	}
-	
+
 	private void doAddSeparator(Viewer viewer) {
 		Object obj = ((StructuredSelection) viewer.getSelection()).getFirstElement();
 		GroupData gd = (GroupData) viewer.getInput();
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationDialog.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationDialog.java
index 7d9f46ed8..a35b2133e 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationDialog.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationDialog.java
@@ -23,7 +23,7 @@ public class CustomizationDialog extends TrayDialog {
 
     private CustomizationContentsArea contentsArea;
 	private String pageId;
-	
+
 	private CustomizationContentsArea getContentsArea() {
 		if (contentsArea == null) {
 			contentsArea = new CustomizationContentsArea();
@@ -35,7 +35,7 @@ public class CustomizationDialog extends TrayDialog {
 		setShellStyle(getShellStyle() | SWT.RESIZE);
 		this.pageId = pageId;
 	}
-	
+
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		CustomizationContentsArea contents = getContentsArea();
@@ -46,7 +46,7 @@ public class CustomizationDialog extends TrayDialog {
 		inner.setLayoutData(new GridData(GridData.FILL_BOTH));
 		return outerContainer;
 	}
-	
+
 	@Override
 	protected void okPressed() {
 		if (getContentsArea().performOk()) {
@@ -54,7 +54,7 @@ public class CustomizationDialog extends TrayDialog {
 		}
 		super.okPressed();
 	}
-	
+
 	@Override
 	protected void cancelPressed() {
 	    getContentsArea().dispose();
@@ -63,9 +63,9 @@ public class CustomizationDialog extends TrayDialog {
 
     @Override
 	protected void configureShell(Shell newShell) {
-	    super.configureShell(newShell);	
-		newShell.setText(Messages.WelcomeCustomizationPreferencePage_Customize); 
+	    super.configureShell(newShell);
+		newShell.setText(Messages.WelcomeCustomizationPreferencePage_Customize);
 	    newShell.setImage(ImageUtil.createImage("full/elcl16/configure.gif")); //$NON-NLS-1$);
     }
-	
+
 }
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizeAction.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizeAction.java
index fd2c69a90..d4242df17 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizeAction.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizeAction.java
@@ -19,11 +19,11 @@ import org.eclipse.ui.intro.IIntroSite;
 public class CustomizeAction extends Action {
 
 	private IIntroSite site;
-	
+
 	public CustomizeAction(IIntroSite site) {
 		this.site = site;
 	}
-	
+
 	@Override
 	public void run() {
 		String pageId = IntroPlugin.getDefault().getIntroModelRoot().getCurrentPageId();
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/GroupData.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/GroupData.java
index 276bd84f3..5c76409bd 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/GroupData.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/GroupData.java
@@ -24,7 +24,7 @@ public class GroupData {
 	boolean fDefault=false;
 	private String path;
 	private ArrayList<BaseData> children = new ArrayList<>();
-	
+
 	public GroupData(String path, boolean defaultGroup) {
 		fDefault = defaultGroup;
 		this.path = path;
@@ -42,7 +42,7 @@ public class GroupData {
 				if (child.getNodeName().equals("extension")) { //$NON-NLS-1$
 					loadExtension((Element) child);
 				}
-				else if (child.getNodeName().equals("separator")) {//$NON-NLS-1$" 
+				else if (child.getNodeName().equals("separator")) {//$NON-NLS-1$"
 					loadSeparator((Element)child);
 				}
 			}
@@ -51,11 +51,11 @@ public class GroupData {
 		if (df!=null && df.equalsIgnoreCase("true")) //$NON-NLS-1$
 			fDefault = true;
 	}
-	
+
 	public boolean isHidden() {
 		return (path.equals(IUniversalIntroConstants.HIDDEN));
 	}
-	
+
 	public boolean isDefault() {
 		return fDefault;
 	}
@@ -73,7 +73,7 @@ public class GroupData {
 			result.add(element);
 		}
 	}
-	
+
 	public void add(BaseData ed) {
 		children.add(ed);
 		ed.setParent(this);
@@ -86,12 +86,12 @@ public class GroupData {
 		children.remove(ed);
 		ed.setParent(null);
 	}
-	
+
 	public void addImplicitExtension(String id, String name) {
 		ExtensionData ed = new ExtensionData(id, name, IUniversalIntroConstants.LOW, true);
 		add(ed);
 	}
-	
+
 	private void loadSeparator(Element element) {
 		String id = element.getAttribute("id"); //$NON-NLS-1$
 		SeparatorData sd = new SeparatorData(id);
@@ -105,7 +105,7 @@ public class GroupData {
 		ExtensionData ed = new ExtensionData(id, name, importance, false);
 		add(ed);
 	}
-	
+
 	public BaseData[] getChildren() {
 		return children.toArray(new BaseData[children.size()]);
 	}
@@ -138,7 +138,7 @@ public class GroupData {
 	public boolean contains(String id) {
 		return find(id)!=null;
 	}
-	
+
 	BaseData find(String extensionId) {
 		for (int i = 0; i < children.size(); i++) {
 			BaseData data = children.get(i);
@@ -151,7 +151,7 @@ public class GroupData {
 	public int getIndexOf(BaseData ed) {
 		return children.indexOf(ed);
 	}
-	
+
 	public int getIndexOf(String baseId) {
 		for (int i = 0; i < children.size(); i++) {
 			BaseData bd = children.get(i);
@@ -160,17 +160,17 @@ public class GroupData {
 		}
 		return -1;
 	}
-	
+
 	public boolean canMoveUp(BaseData ed) {
 		int index = children.indexOf(ed);
 		return (index>0);
 	}
-	
+
 	public boolean canMoveDown(BaseData ed) {
 		int index = children.indexOf(ed);
 		return (index!= -1 && index < children.size()-1);
 	}
-	
+
 	public void moveUp(BaseData ed) {
 		int index = children.indexOf(ed);
 		BaseData swapped = children.get(index-1);
@@ -182,9 +182,9 @@ public class GroupData {
 		int index = children.indexOf(ed);
 		BaseData swapped = children.get(index+1);
 		children.set(index, swapped);
-		children.set(index+1, ed);		
+		children.set(index+1, ed);
 	}
-	
+
 	public void addSeparator(BaseData after) {
 		SeparatorData sd = new SeparatorData();
 		sd.id = ""+sd.hashCode(); //$NON-NLS-1$
@@ -197,7 +197,7 @@ public class GroupData {
 		}
 		children.add(sd);
 	}
-	
+
 	public void write(PrintWriter writer, String indent) {
 		writer.print(indent);
 		if (isHidden())
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IUniversalIntroConstants.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IUniversalIntroConstants.java
index b6d74638d..961fd4bbe 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IUniversalIntroConstants.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IUniversalIntroConstants.java
@@ -55,16 +55,16 @@ public interface IUniversalIntroConstants {
     String PERF_SET_STANDBY_STATE = PLUGIN_ID + "/perf/setStandbyState"; //$NON-NLS-1$
     // not exposed in .option. Used because framework is convenient.
     String PERF_UI_ZOOM = PLUGIN_ID + "/perf/uiZoom"; //$NON-NLS-1$
-    
+
     // Universal Welcome
-    
+
 	String LOW = "low"; //$NON-NLS-1$
 	String MEDIUM = "medium"; //$NON-NLS-1$
 	String HIGH = "high"; //$NON-NLS-1$
 	String CALLOUT = "callout"; //$NON-NLS-1$
 	String HIDDEN = "hidden"; //$NON-NLS-1$
 	String NEW = "new"; //$NON-NLS-1$
-	
+
 	String STYLE_LOW = "importance-low"; //$NON-NLS-1$
 	String STYLE_MEDIUM = "importance-medium"; //$NON-NLS-1$
 	String STYLE_HIGH = "importance-high"; //$NON-NLS-1$
@@ -85,7 +85,7 @@ public interface IUniversalIntroConstants {
 	String ID_MIGRATE = "migrate";//$NON-NLS-1$
 	String ID_WEBRESOURCES = "webresources";//$NON-NLS-1$
 	String ID_WORKBENCH = "workbench"; //$NON-NLS-1$
-	
+
 	// Page DIV ids
 	String DIV_PAGE_LINKS = "page-links"; //$NON-NLS-1$
 	String DIV_ACTION_LINKS = "action-links"; //$NON-NLS-1$
@@ -94,17 +94,17 @@ public interface IUniversalIntroConstants {
 	String DIV_LAYOUT_BOTTOM_LEFT = "bottom-left"; //$NON-NLS-1$
 	String DIV_LAYOUT_BOTTOM_RIGHT = "bottom-right"; //$NON-NLS-1$
 
-	// Product intro variables 
+	// Product intro variables
 	String VAR_INTRO_BACKGROUND_IMAGE = "INTRO_BACKGROUND_IMAGE"; //$NON-NLS-1$
 	String VAR_INTRO_ROOT_PAGES = "INTRO_ROOT_PAGES"; //$NON-NLS-1$
 	String VAR_INTRO_DATA = "INTRO_DATA";  //$NON-NLS-1$
 	String VAR_WORKBENCH_AS_ROOT_LINK="workbenchAsRootLink"; //$NON-NLS-1$
 	String VAR_INTRO_DESCRIPTION_PREFIX = "introDescription"; //$NON-NLS-1$
-	
+
 	//Page table properties
 	String P_IMPORTANCE = "importance"; //$NON-NLS-1$
 	String P_NAME = "name"; //$NON-NLS-1$
-	
+
 	//Theme property constants
 	String LAUNCHBAR_OVERVIEW_ICON = "launchbarOverviewIcon"; //$NON-NLS-1$
 	String LAUNCHBAR_FIRSTSTEPS_ICON = "launchbarFirststepsIcon"; //$NON-NLS-1$
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IntroData.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IntroData.java
index 00b42aa49..b08914e0f 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IntroData.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IntroData.java
@@ -39,18 +39,18 @@ public class IntroData {
 	private String productId;
 	private Map<String, PageData> pages = new HashMap<>();
 	private boolean active;
-	
+
 	public IntroData(String productId, String fileNameOrData, boolean active) {
 		this.productId = productId;
 		this.active = active;
 		if (fileNameOrData!=null)
 			initialize(fileNameOrData);
 	}
-	
+
 	public String getProductId() {
 		return productId;
 	}
-	
+
 	public PageData getPage(String pageId) {
 		return pages.get(pageId);
 	}
@@ -77,7 +77,7 @@ public class IntroData {
 		PageData pd = new PageData(page);
 		pages.put(pd.getId(), pd);
 	}
-	
+
 	public void addImplicitContent() {
 		IConfigurationElement [] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.ui.intro.configExtension"); //$NON-NLS-1$
 		for (int i=0; i<elements.length; i++) {
@@ -164,7 +164,7 @@ public class IntroData {
 			buffer.append(spe.getLineNumber());
 			buffer.append(", uri "); //$NON-NLS-1$
 			buffer.append(spe.getSystemId());
-			buffer.append("\n"); //$NON-NLS-1$   
+			buffer.append("\n"); //$NON-NLS-1$
 			buffer.append(spe.getMessage());
 
 			// Use the contained exception.
@@ -188,7 +188,7 @@ public class IntroData {
 		}
 		return null;
 	}
-	
+
 	public void write(PrintWriter writer) {
 		writer.println("<?xml version=\"1.0\" encoding=\"utf-8\" ?>"); //$NON-NLS-1$
 		writer.println("<extensions>"); //$NON-NLS-1$
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.java
index 41ed0b1c4..1c5cb6b6b 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.java
@@ -89,7 +89,7 @@ public class Messages extends NLS {
 	public static String WelcomeCustomizationPreferencePage_menu_top_left;
 	public static String WelcomeCustomizationPreferencePage_menu_top_right;
 	public static String WelcomeCustomizationPreferencePage_menu_bottom_left;
-	public static String WelcomeCustomizationPreferencePage_menu_bottom_right;	
+	public static String WelcomeCustomizationPreferencePage_menu_bottom_right;
 	public static String WelcomeCustomizationPreferencePage_browse;
 	public static String WelcomeCustomizationPreferencePage_browseTitle;
 	public static String SharedIntroConfigurer_customize_label;
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/PageData.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/PageData.java
index a27b628a2..d0b11ceb1 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/PageData.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/PageData.java
@@ -30,11 +30,11 @@ public class PageData {
 	private String id;
 	private ArrayList<GroupData> groups = new ArrayList<>();
 	private GroupData hidden=null;
-	
+
 	public PageData(String id) {
 		this.id = id;
 	}
-	
+
 	public PageData(Element page) {
 		this.id = page.getAttribute("id"); //$NON-NLS-1$
 		NodeList children = page.getChildNodes();
@@ -51,7 +51,7 @@ public class PageData {
 			}
 		}
 	}
-	
+
 	public void add(GroupData gd) {
 		if (gd.isHidden())
 			hidden = gd;
@@ -95,7 +95,7 @@ public class PageData {
 	public boolean isHidden(String extensionId) {
 		return hidden!=null && hidden.contains(extensionId);
 	}
-	
+
 	public GroupData findGroup(String groupId) {
 		if (groupId.equals(IUniversalIntroConstants.HIDDEN))
 			return hidden;
@@ -107,14 +107,14 @@ public class PageData {
 		}
 		return null;
 	}
-	
+
 	private void addGroup(Element element, boolean hide) {
 		GroupData gd = new GroupData(element);
 		if (hide) hidden = gd;
 		else
 			groups.add(gd);
 	}
-	
+
 	public void addImplicitExtension(String extensionId, String name) {
 		ExtensionData ed = findExtension(extensionId, true);
 		if (ed!=null) {
@@ -148,11 +148,11 @@ public class PageData {
 		}
 		return defaultGroup;
 	}
-	
+
 	public String getId() {
 		return id;
 	}
-	
+
 	public ExtensionData findExtension(String extensionId, boolean checkHidden) {
 		for (int i=0; i<groups.size(); i++) {
 			GroupData gdata = groups.get(i);
@@ -165,7 +165,7 @@ public class PageData {
 			return find (hidden, extensionId);
 		return null;
 	}
-		
+
 	private ExtensionData find(GroupData gd, String extensionId) {
 		BaseData bd = gd.find(extensionId);
 		if (bd!=null && bd instanceof ExtensionData)
@@ -189,7 +189,7 @@ public class PageData {
 		GroupData last = groups.get(groups.size()-1);
 		return id + "/" + last.getPath() + "/" + IUniversalIntroConstants.DEFAULT_ANCHOR;  //$NON-NLS-1$//$NON-NLS-2$
 	}
-	
+
 	public void write(PrintWriter writer, String indent) {
 		writer.print(indent);
 		String indent2 = indent+"   "; //$NON-NLS-1$
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/SeparatorData.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/SeparatorData.java
index 8e4eb2772..b92c15250 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/SeparatorData.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/SeparatorData.java
@@ -13,10 +13,10 @@ package org.eclipse.ui.internal.intro.universal;
 import java.io.PrintWriter;
 
 public class SeparatorData extends BaseData {
-	
+
 	public SeparatorData() {
 	}
-	
+
 	public SeparatorData(String id) {
 		this.id = id;
 	}
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroConfigurer.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroConfigurer.java
index 52b2f05a2..e4652431b 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroConfigurer.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroConfigurer.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
  *******************************************************************************/
@@ -41,12 +41,12 @@ import org.osgi.framework.Bundle;
 /**
  * This class provides for dynamic configuration of the shared intro
  * implementation based on the data file associated with the product.
- * 
+ *
  * @since 3.2
  */
 public class UniversalIntroConfigurer extends IntroConfigurer implements
 		IUniversalIntroConstants {
-	
+
 	private IntroData primaryIntroData;
 	private IntroData[] secondaryIntroData;
 	private SequenceResolver<IntroElement> sequenceResolver;
@@ -99,7 +99,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.ui.intro.config.IntroConfigurer#getMixinStyle(java.lang.String)
 	 */
 	@Override
@@ -216,7 +216,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 	 * <ul>
 	 * <li>foo &rarr; org.eclipse.ui.intro.universal.solstice/foo
 	 * </ul>
-	 * 
+	 *
 	 * @param path
 	 *            the path
 	 * @return same path with a prefixed theme directory component
@@ -297,7 +297,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 
 	private IntroElement[] getRootPageActionLinks(boolean standby) {
 		String wb = getVariable(VAR_WORKBENCH_AS_ROOT_LINK);
-		// only create the workbench link if 
+		// only create the workbench link if
 		// not already configured as a root link
 		if (wb==null || !wb.equalsIgnoreCase("true")) { //$NON-NLS-1$
 			IntroElement page = createRootPageLink(ID_WORKBENCH, standby);
@@ -309,9 +309,9 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 
 	private IntroElement[] getNavLinks(String pageId) {
 		ArrayList<IntroElement> links = new ArrayList<>();
-		String ids = getVariable(VAR_INTRO_ROOT_PAGES);		
+		String ids = getVariable(VAR_INTRO_ROOT_PAGES);
 		/*
-		 * In high contrast mode the workbench link must be generated in the nav links 
+		 * In high contrast mode the workbench link must be generated in the nav links
 		 * otherwise it will not show
 		 */
 		if (ImageUtil.isHighContrast()) {
@@ -397,7 +397,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 	private IntroElement createNavLink(String id, String pageId, int [] counter) {
 		if (id.equals(ID_OVERVIEW))
 			return createNavLink(Messages.SharedIntroConfigurer_overview_nav,
-					createPageURL(id, false), id, "left nav_link"+(++counter[0])); //$NON-NLS-1$ 
+					createPageURL(id, false), id, "left nav_link"+(++counter[0])); //$NON-NLS-1$
 		if (id.equals(ID_FIRSTSTEPS))
 			return createNavLink(Messages.SharedIntroConfigurer_firststeps_nav,
 					createPageURL(id, false), id, "left  nav_link"+(++counter[0])); //$NON-NLS-1$
@@ -421,7 +421,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 			return createNavLink(
 					Messages.SharedIntroConfigurer_workbench_name,
 					"http://org.eclipse.ui.intro/switchToLaunchBar", //$NON-NLS-1$
-					id, 
+					id,
 					"right nav_link"+(++counter[0])); //$NON-NLS-1$
 		return null;
 	}
@@ -436,31 +436,31 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 	private IntroElement createLaunchBarShortcut(String id) {
 		if (id.equals(ID_OVERVIEW))
 			return createShortcutLink(
-					getThemeProperty(LAUNCHBAR_OVERVIEW_ICON), Messages.SharedIntroConfigurer_overview_nav, 
+					getThemeProperty(LAUNCHBAR_OVERVIEW_ICON), Messages.SharedIntroConfigurer_overview_nav,
 					id);
 		if (id.equals(ID_FIRSTSTEPS))
 			return createShortcutLink(
-					getThemeProperty(LAUNCHBAR_FIRSTSTEPS_ICON), Messages.SharedIntroConfigurer_firststeps_nav, 
+					getThemeProperty(LAUNCHBAR_FIRSTSTEPS_ICON), Messages.SharedIntroConfigurer_firststeps_nav,
 					id);
 		if (id.equals(ID_TUTORIALS))
 			return createShortcutLink(
-					getThemeProperty(LAUNCHBAR_TUTORIALS_ICON), Messages.SharedIntroConfigurer_tutorials_nav, 
+					getThemeProperty(LAUNCHBAR_TUTORIALS_ICON), Messages.SharedIntroConfigurer_tutorials_nav,
 					id);
 		if (id.equals(ID_SAMPLES))
 			return createShortcutLink(
-					getThemeProperty(LAUNCHBAR_SAMPLES_ICON), Messages.SharedIntroConfigurer_samples_nav, 
+					getThemeProperty(LAUNCHBAR_SAMPLES_ICON), Messages.SharedIntroConfigurer_samples_nav,
 					id);
 		if (id.equals(ID_WHATSNEW))
 			return createShortcutLink(
-					getThemeProperty(LAUNCHBAR_WHATSNEW_ICON), Messages.SharedIntroConfigurer_whatsnew_nav, 
+					getThemeProperty(LAUNCHBAR_WHATSNEW_ICON), Messages.SharedIntroConfigurer_whatsnew_nav,
 					id);
 		if (id.equals(ID_MIGRATE))
 			return createShortcutLink(
-					getThemeProperty(LAUNCHBAR_MIGRATE_ICON), Messages.SharedIntroConfigurer_migrate_nav, 
+					getThemeProperty(LAUNCHBAR_MIGRATE_ICON), Messages.SharedIntroConfigurer_migrate_nav,
 					id);
 		if (id.equals(ID_WEBRESOURCES))
 			return createShortcutLink(
-					getThemeProperty(LAUNCHBAR_WEBRESOURCES_ICON), Messages.SharedIntroConfigurer_webresources_nav, 
+					getThemeProperty(LAUNCHBAR_WEBRESOURCES_ICON), Messages.SharedIntroConfigurer_webresources_nav,
 					id);
 		return null;
 	}
@@ -508,7 +508,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 			if (value!=null)
 				img.setAttribute("src", value); //$NON-NLS-1$
 			img.setAttribute("alt", label); //$NON-NLS-1$
-			element.addChild(img);		
+			element.addChild(img);
 			styleId += " "+HIGH_CONTRAST; //$NON-NLS-1$
 		}
 		element.setAttribute("style-id", styleId); //$NON-NLS-1$
@@ -594,7 +594,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 		}
 		return sequenceResolver.getSequence(primaryAnchors, secondaryAnchors);
 	}
-	
+
 	private List<IntroElement> getAnchors(IntroData data, String pageId, String groupId) {
 		PageData pdata = data.getPage(pageId);
 		if (pdata != null) {
@@ -604,7 +604,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 		}
 		return null;
 	}
-	
+
 	@Override
 	public String resolvePath(String extensionId, String path) {
 		boolean extensionRelativePath = false;
@@ -662,7 +662,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 		// there was no clear winner; fall back to the default
 		return resolveDefaultPath(pageId, extensionId);
 	}
-	
+
 	private String resolveDefaultPath(String pageId, String extensionId) {
 		String pluginId = ExtensionMap.getInstance().getPluginId(extensionId);
 		if (ContentDetector.isNew(pluginId)) {
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroPlugin.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroPlugin.java
index bfc6a360c..357828b8f 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroPlugin.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroPlugin.java
@@ -29,12 +29,12 @@ public class UniversalIntroPlugin extends AbstractUIPlugin {
     // used for performance logging. Time when the constructor of
     // CustomizableIntroPart is called.
     private long uiCreationStartTime;
-    
+
     // image registry that can be disposed while the
     // plug-in is still active. This is important for
     // switching themes after the plug-in has been loaded.
     private ImageRegistry volatileImageRegistry;
-    
+
     /**
      * The constructor.
      */
@@ -48,7 +48,7 @@ public class UniversalIntroPlugin extends AbstractUIPlugin {
     public static UniversalIntroPlugin getDefault() {
         return inst;
     }
-    
+
     /**
      * Returns the Intro Part.
      */
@@ -96,7 +96,7 @@ public class UniversalIntroPlugin extends AbstractUIPlugin {
         return PlatformUI.getWorkbench().getIntroManager().closeIntro(
             getIntro());
     }
-    
+
     public ImageRegistry getVolatileImageRegistry() {
     	if (volatileImageRegistry==null) {
     		volatileImageRegistry = createImageRegistry();
@@ -104,7 +104,7 @@ public class UniversalIntroPlugin extends AbstractUIPlugin {
     	}
     	return volatileImageRegistry;
     }
-    
+
     public void resetVolatileImageRegistry() {
     	if (volatileImageRegistry!=null) {
     		volatileImageRegistry.dispose();
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/WelcomeCustomizationPreferencePage.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/WelcomeCustomizationPreferencePage.java
index 4fb16219a..d4d00bf86 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/WelcomeCustomizationPreferencePage.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/WelcomeCustomizationPreferencePage.java
@@ -35,7 +35,7 @@ public class WelcomeCustomizationPreferencePage extends PreferencePage implement
 	public WelcomeCustomizationPreferencePage(String title, ImageDescriptor image) {
 		super(title, image);
 	}
-	
+
 	private CustomizationContentsArea getContentsArea() {
 		if (contentsArea == null) {
 			contentsArea = new CustomizationContentsArea();
@@ -74,7 +74,7 @@ public class WelcomeCustomizationPreferencePage extends PreferencePage implement
 	@Override
 	public void init(IWorkbench workbench) {
 	}
-	
+
 	public void setCurrentPage(String pageId) {
 		getContentsArea().setCurrentPage(pageId);
 	}
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetectHelper.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetectHelper.java
index 7fb469e04..026e77479 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetectHelper.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetectHelper.java
@@ -30,7 +30,7 @@ import org.eclipse.ui.IMemento;
 import org.eclipse.ui.XMLMemento;
 
 public class ContentDetectHelper {
-	
+
 	public static final int NO_STATE = -1;
 	private static final String EXTENSION_COUNT_XML = "extensionCount.xml"; //$NON-NLS-1$
 	private static final String EXTENSION_NAMES_XML = "extensionNames.xml"; //$NON-NLS-1$
@@ -39,7 +39,7 @@ public class ContentDetectHelper {
 	private static final String NAME = "name"; //$NON-NLS-1$
 	private static final String ROOT = "root"; //$NON-NLS-1$
 	private static final String PLUGIN_ID = "org.eclipse.ui.intro.universal"; //$NON-NLS-1$
-	
+
 	private File configurationDirectory;
 
 	private File getConfigurationLocation() {
@@ -57,14 +57,14 @@ public class ContentDetectHelper {
 		}
 		return configurationDirectory;
 	}
-	
-	public void saveExtensionCount(int count) {	
+
+	public void saveExtensionCount(int count) {
 		XMLMemento writeMemento = XMLMemento.createWriteRoot(ROOT);
 		writeMemento.putInteger(INTROCOUNT, count);
 		saveMemento(writeMemento, EXTENSION_COUNT_XML);
 	}
-	
-	public int getExtensionCount() {	
+
+	public int getExtensionCount() {
 		XMLMemento readMemento = getReadMemento(EXTENSION_COUNT_XML);
 		if (readMemento == null) {
 			return NO_STATE;
@@ -74,7 +74,7 @@ public class ContentDetectHelper {
 		if (extensionCount == null) {
 			return NO_STATE;
 		}
-			
+
 		return extensionCount.intValue();
 	}
 
@@ -86,7 +86,7 @@ public class ContentDetectHelper {
 		}
 		saveMemento(writeMemento, EXTENSION_NAMES_XML);
 	}
-	
+
 	public Set<String> getContributors() {
 		Set<String> contributors = new HashSet<>();
 		XMLMemento readMemento = getReadMemento(EXTENSION_NAMES_XML);
@@ -99,19 +99,19 @@ public class ContentDetectHelper {
 		}
 		return contributors;
 	}
-	
+
 	private XMLMemento getReadMemento(String filename) {
 		XMLMemento memento;
 		InputStreamReader reader = null;
 
 		try {
-			final File stateFile = getStateFile(filename); 
+			final File stateFile = getStateFile(filename);
 
 			FileInputStream input = new FileInputStream(stateFile);
 			reader = new InputStreamReader(input, StandardCharsets.UTF_8);
 			memento = XMLMemento.createReadRoot(reader);
 
-			
+
 		} catch (FileNotFoundException e) {
 			memento = null;
 			// Do nothing, the file will not exist the first time the workbench in used.
@@ -128,10 +128,10 @@ public class ContentDetectHelper {
 		}
 		return memento;
 	}
-	
+
 	private void saveMemento(XMLMemento memento, String filename) {
 		// Save the IMemento to a file.
-		File stateFile = getStateFile(filename); 
+		File stateFile = getStateFile(filename);
 		OutputStreamWriter writer = null;
 		try {
 			FileOutputStream stream = new FileOutputStream(stateFile);
@@ -147,7 +147,7 @@ public class ContentDetectHelper {
 			}
 		}
 	}
-	
+
 	private File getStateFile(String filename) {
 		if (getConfigurationLocation() == null) {
 			return null;
@@ -155,7 +155,7 @@ public class ContentDetectHelper {
 		File stateFile = new File(getConfigurationLocation(), filename);
 		return stateFile;
 	}
-	
+
 	public Set<String> findNewContributors(Set<String> contributors, Set<String> previousContributors) {
 		Set<String> result = new HashSet<>(contributors);
 		for (Iterator<String> iter = previousContributors.iterator(); iter.hasNext();) {
@@ -166,9 +166,9 @@ public class ContentDetectHelper {
 
 	public void deleteStateFiles() {
 		try {
-			File stateFile = new File(getConfigurationLocation(), EXTENSION_COUNT_XML);	
+			File stateFile = new File(getConfigurationLocation(), EXTENSION_COUNT_XML);
 			stateFile.delete();
-			stateFile = new File(getConfigurationLocation(), EXTENSION_NAMES_XML);	
+			stateFile = new File(getConfigurationLocation(), EXTENSION_NAMES_XML);
 			stateFile.delete();
 		} catch (RuntimeException e) {
 		}
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetector.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetector.java
index bd239ca66..8820600bd 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetector.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetector.java
@@ -22,12 +22,12 @@ public class ContentDetector extends IntroContentDetector {
 
 	private static Set<String> newContributors;
 	private static boolean detectorCalled = false;
-	
+
 	public ContentDetector() {
 	}
 
 	@Override
-	public boolean isNewContentAvailable() {		
+	public boolean isNewContentAvailable() {
 		try {
 			detectorCalled = true;
 			// If we have previously found new content no need to recompute
@@ -38,7 +38,7 @@ public class ContentDetector extends IntroContentDetector {
 					.getExtensionRegistry()
 					.getExtensionPoint("org.eclipse.ui.intro.configExtension").getExtensions(); //$NON-NLS-1$
 			int numIntroExtensions = extensions.length;
-      
+
 			ContentDetectHelper helper = new ContentDetectHelper();
 			int previous = helper.getExtensionCount();
 			if (numIntroExtensions != previous) {
@@ -55,13 +55,13 @@ public class ContentDetector extends IntroContentDetector {
 				}
 				helper.saveContributors(contributors);
 			}
-		} catch (Exception e) { 
+		} catch (Exception e) {
 			return false;
 		}
 		newContributors = new HashSet<>();
 		return false;
 	}
-	
+
 	/**
 	 * @return The set of the ids of config extensions which are new since the last time
 	 * intro was opened. May be null if there are no contributors.
@@ -73,7 +73,7 @@ public class ContentDetector extends IntroContentDetector {
 	    }
 		return newContributors;
 	}
-	
+
 	/**
 	 * Test to see if this contribution was newly installed
 	 * @param contributionId
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/BundleUtil.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/BundleUtil.java
index 65a6f4c46..53b1eee36 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/BundleUtil.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/BundleUtil.java
@@ -56,7 +56,7 @@ public class BundleUtil {
 
     /**
      * Retrieves the given key from the bundle header.
-     * 
+     *
      * @param bundle
      * @param key
      * @return
@@ -74,7 +74,7 @@ public class BundleUtil {
 
     /**
      * Get the resourcelocation, but do not force an $nl$ on it.
-     * 
+     *
      * @param resource
      * @param element
      * @return
@@ -90,7 +90,7 @@ public class BundleUtil {
      * Returns the fully qualified location of the passed resource string from
      * the passed plugin id. If the file could not be loaded from the plugin,
      * the resource is returned as is.
-     * 
+     *
      * @param resource
      * @return
      */
@@ -103,7 +103,7 @@ public class BundleUtil {
 
     /**
      * Shorthand util method.
-     * 
+     *
      * @param resource
      * @return
      */
@@ -174,7 +174,7 @@ public class BundleUtil {
             return resource;
         }
     }
-    
+
     private static String toExternalForm(URL localURL) {
     	try {
     		localURL = FileLocator.toFileURL(localURL);
@@ -215,7 +215,7 @@ public class BundleUtil {
     /**
      * Get the absolute path of the given bundle, in the form
      * file:/path_to_plugin
-     * 
+     *
      * @param bundle
      * @return
      */
@@ -243,7 +243,7 @@ public class BundleUtil {
     /**
      * Get the absolute path of the bundle with id <code>bundleId</code>. If
      * no such bundle is found, return null.
-     * 
+     *
      * @param bundleId
      * @return
      */
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/ImageUtil.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/ImageUtil.java
index 09e9b2211..833b93161 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/ImageUtil.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/ImageUtil.java
@@ -68,7 +68,7 @@ public final class ImageUtil {
 
 	/**
 	 * Convenience method to create an image descriptor from the Intro plugin.
-	 * 
+	 *
 	 * Method assumes that images are under the "icons" directory, so don't
 	 * append that directory name for "imageName".
 	 */
@@ -79,7 +79,7 @@ public final class ImageUtil {
 
 	/**
 	 * Convenience method to create an image descriptor.
-	 * 
+	 *
 	 */
 	public static ImageDescriptor createImageDescriptor(Bundle bundle,
 			String imageName) {
@@ -100,7 +100,7 @@ public final class ImageUtil {
 
 	/**
 	 * Convenience method to create an image descriptor.
-	 * 
+	 *
 	 */
 	public static ImageDescriptor createImageDescriptor(IPath base,
 			String imageName) {
@@ -118,7 +118,7 @@ public final class ImageUtil {
 
 	/**
 	 * Convenience method to create an image from the Intro plugin.
-	 * 
+	 *
 	 * Method assumes that images are under the "icons" directory, so don't
 	 * append that directory name for "imageName".
 	 */
@@ -135,7 +135,7 @@ public final class ImageUtil {
 
 	/**
 	 * Util method for image re-use in Intro Plugin.
-	 * 
+	 *
 	 * @param key
 	 * @return
 	 */
@@ -157,7 +157,7 @@ public final class ImageUtil {
 	/**
 	 * Register an image descriptor in the Intro Plugin image registry. Has no
 	 * effect if the key has already been registered.
-	 * 
+	 *
 	 * @param key
 	 * @param imageName
 	 */
@@ -188,11 +188,11 @@ public final class ImageUtil {
 			return;
 		registry.put(key, createImageDescriptor(base, imageName));
 	}
-	
+
 	/**
 	 * Tests for high contrast mode. Returns false if not called from a
 	 * UI thread (causes deadlocks during junit tests).
-	 * 
+	 *
 	 * @return whether or not the display is in high contrast mode
 	 */
 	public static boolean isHighContrast() {
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/Log.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/Log.java
index e3cd96c19..98675b084 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/Log.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/Log.java
@@ -25,7 +25,7 @@ import org.eclipse.ui.internal.intro.universal.UniversalIntroPlugin;
  * mode. Info messages are only logged when the /trace/logInfo debug option is
  * set to true. Performance reports are only logged when /trace/performance is
  * set to true.
- * 
+ *
  */
 public class Log implements IUniversalIntroConstants {
 
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/PreferenceArbiter.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/PreferenceArbiter.java
index 4173d89a3..07f5dc568 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/PreferenceArbiter.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/PreferenceArbiter.java
@@ -22,7 +22,7 @@ public class PreferenceArbiter {
 
 	private Map<Object, int[]> references;
 	private Object leader;
-	
+
 	public void consider(Object obj) {
 		if (obj != null) {
 			if (references == null) {
@@ -44,7 +44,7 @@ public class PreferenceArbiter {
 			}
 		}
 	}
-	
+
 	public Object getWinner() {
 		return leader;
 	}
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/intro/universal/ExtensionFactory.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/intro/universal/ExtensionFactory.java
index 631d34c2c..1bb0231e7 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/intro/universal/ExtensionFactory.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/intro/universal/ExtensionFactory.java
@@ -33,7 +33,7 @@ import org.eclipse.ui.internal.intro.universal.WelcomeCustomizationPreferencePag
  * </ul>
  * <p>This class should be referenced in extensions but not subclassed
  * or instantiated programmatically.
- * 
+ *
  * @since 3.2
  * @noextend This class is not intended to be subclassed by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
@@ -52,7 +52,7 @@ public class ExtensionFactory implements IExecutableExtensionFactory, IExecutabl
 			return configure(new WelcomeCustomizationPreferencePage());
 
 		throw new CoreException(new Status(IStatus.ERROR, UniversalIntroPlugin.PLUGIN_ID, 0,
-				"Unknown id in data argument for " + getClass(), null)); //$NON-NLS-1$        		
+				"Unknown id in data argument for " + getClass(), null)); //$NON-NLS-1$
 	}
 
 	private Object configure(Object obj) throws CoreException {