Bug 547304 - [cleanup] Fix wrong space/tab indentationS4_12_0_RC2S4_12_0_RC1aS4_12_0_RC1S4_12_0_M3R4_12I20190605-1800I20190605-0600I20190604-1800I20190604-0600I20190603-1800I20190603-0600I20190602-1800I20190602-0600I20190601-1800I20190531-1800I20190531-0245I20190529-2005I20190529-1800I20190529-0600I20190528-1800I20190528-0915I20190528-0850I20190528-0600I20190527-1805I20190527-0600I20190526-1800I20190526-0600I20190525-1800I20190525-0600I20190524-1800I20190524-0135I20190522-1800I20190522-0600I20190521-1800I20190521-0600I20190520-1805I20190520-0600R4_12_maintenance

This change fixes space or mixed tab/space indentations in all Java
files. This also includes two or three space indentations and even fix
most stray single spaces in indentations.
The change includes only whitespace formatting and no code changes.

Change-Id: I3e7b6abb69a1894c402f9123417346a44fc0992a

23 files changed, 232 insertions, 232 deletions

diff --git a/org.eclipse.search/META-INF/MANIFEST.MF b/org.eclipse.search/META-INF/MANIFEST.MF
index e1f7826aeb6..a47e00dbe6a 100644
--- a/org.eclipse.search/META-INF/MANIFEST.MF
+++ b/org.eclipse.search/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.search; singleton:=true
-Bundle-Version: 3.11.500.qualifier
+Bundle-Version: 3.11.600.qualifier
 Bundle-Activator: org.eclipse.search.internal.ui.SearchPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/ISearchPageContainer.java b/org.eclipse.search/new search/org/eclipse/search/ui/ISearchPageContainer.java
index 8d15e6e7f0f..c90a6584eac 100644
--- a/org.eclipse.search/new search/org/eclipse/search/ui/ISearchPageContainer.java
+++ b/org.eclipse.search/new search/org/eclipse/search/ui/ISearchPageContainer.java
@@ -98,7 +98,7 @@ public interface ISearchPageContainer {
 	 * The scope is WORKSPACE_SCOPE, SELECTED_PROJECTS_SCOPE, SELECTION_SCOPE or WORKING_SET_SCOPE.
 	 * @param scope the newly selected scope
 	 *
- 	 * @since 2.0
+	 * @since 2.0
 	 */
 	public void setSelectedScope(int scope);
 
@@ -106,7 +106,7 @@ public interface ISearchPageContainer {
 	 * Tells whether a valid scope is selected.
 	 *
 	 * @return a <code>true</code> if a valid scope is selected in this search page container
- 	 * @since 2.0
+	 * @since 2.0
 	 */
 	public boolean hasValidScope();
 
diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java
index 01310e7e571..a3f53b0e70d 100644
--- a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java
+++ b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java
@@ -152,14 +152,14 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch
 			} else {
 				fIsUIUpdateScheduled= false;
 				turnOnDecoration();
-                updateBusyLabel();
-                if (fScheduleEnsureSelection) {
-                    fScheduleEnsureSelection= false;
-                    AbstractTextSearchResult result = getInput();
-                    if (result != null && fViewer.getSelection().isEmpty()) {
-                        navigateNext(true);
-                    }
-                }
+				updateBusyLabel();
+				if (fScheduleEnsureSelection) {
+					fScheduleEnsureSelection= false;
+					AbstractTextSearchResult result = getInput();
+					if (result != null && fViewer.getSelection().isEmpty()) {
+						navigateNext(true);
+					}
+				}
 			}
 			fViewPart.updateLabel();
 			return Status.OK_STATUS;
@@ -210,7 +210,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch
 	}
 
 	private volatile boolean fIsUIUpdateScheduled= false;
-    private volatile boolean fScheduleEnsureSelection= false;
+	private volatile boolean fScheduleEnsureSelection= false;
 	private static final String KEY_LAYOUT = "org.eclipse.search.resultpage.layout"; //$NON-NLS-1$
 
 	/**
@@ -606,9 +606,9 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch
 
 			@Override
 			public void queryFinished(final ISearchQuery query) {
-                // handle the end of the query in the UIUpdateJob, as ui updates
-                // may not be finished here.
-                postEnsureSelection();
+				// handle the end of the query in the UIUpdateJob, as ui updates
+				// may not be finished here.
+				postEnsureSelection();
 			}
 		};
 	}
@@ -617,10 +617,10 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch
 	 * Posts a  UI update to make sure an element is selected.
 	 * @since 3.2
 	 */
-    protected void postEnsureSelection() {
-        fScheduleEnsureSelection= true;
-        scheduleUIUpdate();
-    }
+	protected void postEnsureSelection() {
+		fScheduleEnsureSelection= true;
+		scheduleUIUpdate();
+	}
 
 
 	private void updateBusyLabel() {
diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/text/MatchFilter.java b/org.eclipse.search/new search/org/eclipse/search/ui/text/MatchFilter.java
index b94617b4906..391648ade87 100644
--- a/org.eclipse.search/new search/org/eclipse/search/ui/text/MatchFilter.java
+++ b/org.eclipse.search/new search/org/eclipse/search/ui/text/MatchFilter.java
@@ -21,40 +21,40 @@ package org.eclipse.search.ui.text;
  */
 public abstract class MatchFilter {
 
-    /**
-     * Returns whether the given match is filtered by this filter.
-     *
-     * @param match the match to look at
-     * @return returns <code>true</code> if the given match should be filtered or <code>false</code> if not.
-     */
+	/**
+	 * Returns whether the given match is filtered by this filter.
+	 *
+	 * @param match the match to look at
+	 * @return returns <code>true</code> if the given match should be filtered or <code>false</code> if not.
+	 */
 	public abstract boolean filters(Match match);
 
-    /**
-     * Returns the name of the filter as shown in the match filter selection dialog.
-     *
-     * @return the name of the filter as shown in the match filter selection dialog.
-     */
+	/**
+	 * Returns the name of the filter as shown in the match filter selection dialog.
+	 *
+	 * @return the name of the filter as shown in the match filter selection dialog.
+	 */
 	public abstract String getName();
 
-    /**
-     * Returns the description of the filter as shown in the match filter selection dialog.
-     *
-     * @return the description of the filter as shown in the match filter selection dialog.
-     */
+	/**
+	 * Returns the description of the filter as shown in the match filter selection dialog.
+	 *
+	 * @return the description of the filter as shown in the match filter selection dialog.
+	 */
 	public abstract String getDescription();
 
 	/**
-     * Returns the label of the filter as shown by the filter action.
-     *
-     * @return the label of the filter as shown by the filter action.
-     */
+	 * Returns the label of the filter as shown by the filter action.
+	 *
+	 * @return the label of the filter as shown by the filter action.
+	 */
 	public abstract String getActionLabel();
 
 	/**
-     * Returns an ID of this filter.
-     *
-     * @return the id of the filter to be used when persisting this filter.
-     */
+	 * Returns an ID of this filter.
+	 *
+	 * @return the id of the filter to be used when persisting this filter.
+	 */
 	public abstract String getID();
 
 }
diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/text/TextSearchQueryProvider.java b/org.eclipse.search/new search/org/eclipse/search/ui/text/TextSearchQueryProvider.java
index a58695c3124..0613d9c7d1c 100644
--- a/org.eclipse.search/new search/org/eclipse/search/ui/text/TextSearchQueryProvider.java
+++ b/org.eclipse.search/new search/org/eclipse/search/ui/text/TextSearchQueryProvider.java
@@ -37,9 +37,9 @@ public abstract class TextSearchQueryProvider {
 
 	/**
 	 * Specified the input for a search query.
-     * <p>
-     * Clients may instantiate this class.
-     * </p>
+	 * <p>
+	 * Clients may instantiate this class.
+	 * </p>
 	 */
 	public static abstract class TextSearchInput {
 
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java
index 361691bbab1..51904bcb03a 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java
@@ -36,7 +36,7 @@ class SearchHistoryDropDownAction extends Action implements IMenuCreator {
 		private ISearchResult fSearch;
 
 		public ShowSearchFromHistoryAction(ISearchResult search) {
-	        super("", AS_RADIO_BUTTON); //$NON-NLS-1$
+			super("", AS_RADIO_BUTTON); //$NON-NLS-1$
 			fSearch= search;
 
 			String label= escapeAmp(search.getLabel());
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java
index d727777d191..6ee61f8836c 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java
@@ -321,14 +321,14 @@ public class SearchHistorySelectionDialog extends SelectionDialog {
 		table.setLayoutData(gd);
 
 
-        fRemoveButton= new Button(parent, SWT.PUSH);
-        fRemoveButton.setText(SearchMessages.SearchesDialog_remove_label);
-        fRemoveButton.addSelectionListener(new SelectionAdapter() {
-            @Override
+		fRemoveButton= new Button(parent, SWT.PUSH);
+		fRemoveButton.setText(SearchMessages.SearchesDialog_remove_label);
+		fRemoveButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent event) {
-                buttonPressed(REMOVE_ID);
-            }
-        });
+				buttonPressed(REMOVE_ID);
+			}
+		});
 		fRemoveButton.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 		SWTUtil.setButtonDimensionHint(fRemoveButton);
 
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchMessages.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchMessages.java
index 9552fa922a5..7a3de33bda0 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchMessages.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchMessages.java
@@ -23,9 +23,9 @@ public final class SearchMessages extends NLS {
 		// Do not instantiate
 	}
 
-    static {
-        NLS.initializeMessages(BUNDLE_NAME, SearchMessages.class);
-    }
+	static {
+		NLS.initializeMessages(BUNDLE_NAME, SearchMessages.class);
+	}
 
 	public static String AbstractTextSearchViewPage_update_job_name;
 	public static String MatchFilterSelectionAction_label;
@@ -92,11 +92,11 @@ public final class SearchMessages extends NLS {
 	public static String PinSearchViewAction_label;
 	public static String PinSearchViewAction_tooltip;
 	public static String SearchPageRegistry_error_creating_extensionpoint;
-    public static String TextSearchGroup_submenu_text;
-    public static String FindInWorkspaceActionDelegate_text;
-    public static String FindInProjectActionDelegate_text;
-    public static String FindInWorkingSetActionDelegate_text;
-    public static String FindInFileActionDelegate_text;
+	public static String TextSearchGroup_submenu_text;
+	public static String FindInWorkspaceActionDelegate_text;
+	public static String FindInProjectActionDelegate_text;
+	public static String FindInWorkingSetActionDelegate_text;
+	public static String FindInFileActionDelegate_text;
 	public static String TextSearchQueryProviderRegistry_defaultProviderLabel;
 	public static String RetrieverAction_dialog_title;
 	public static String RetrieverAction_empty_selection;
diff --git a/org.eclipse.search/pom.xml b/org.eclipse.search/pom.xml
index a5c584cf755..8f32b33d154 100644
--- a/org.eclipse.search/pom.xml
+++ b/org.eclipse.search/pom.xml
@@ -18,6 +18,6 @@
   </parent>
   <groupId>org.eclipse.search</groupId>
   <artifactId>org.eclipse.search</artifactId>
-  <version>3.11.500-SNAPSHOT</version>
+  <version>3.11.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileNamePatternSearchScope.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileNamePatternSearchScope.java
index ec48bda03be..28cd5899a74 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileNamePatternSearchScope.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileNamePatternSearchScope.java
@@ -136,7 +136,7 @@ public class FileNamePatternSearchScope extends TextSearchScope {
 	 * @return returns true if the file name is matching to a file name pattern
 	 */
 	private boolean matchesFileName(String fileName) {
- 		return getFileNameMatcher().reset(fileName).matches();
+		return getFileNameMatcher().reset(fileName).matches();
 	}
 
 	/**
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/PatternConstructor.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/PatternConstructor.java
index 5210d2505e5..f4b1a8b22a1 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/PatternConstructor.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/PatternConstructor.java
@@ -156,9 +156,9 @@ public class PatternConstructor {
 	}
 
 
-    private static boolean isWordChar(char c) {
-        return Character.isLetterOrDigit(c);
-    }
+	private static boolean isWordChar(char c) {
+		return Character.isLetterOrDigit(c);
+	}
 
 	/**
 	 * Creates a pattern element from an array of patterns in the old 'StringMatcher' format.
@@ -172,8 +172,8 @@ public class PatternConstructor {
 		StringBuilder pattern= new StringBuilder();
 		for (int i= 0; i < patterns.length; i++) {
 			if (i > 0) {
-                // note that this works only as we know that the operands of the
-                // or expression will be simple and need no brackets.
+				// note that this works only as we know that the operands of the
+				// or expression will be simple and need no brackets.
 				pattern.append('|');
 			}
 			appendAsRegEx(true, patterns[i], pattern);
@@ -183,75 +183,75 @@ public class PatternConstructor {
 
 
 	public static StringBuilder appendAsRegEx(boolean isStringMatcher, String pattern, StringBuilder buffer) {
-        boolean isEscaped= false;
-        for (int i = 0; i < pattern.length(); i++) {
-            char c = pattern.charAt(i);
-            switch(c) {
-            // the backslash
-            case '\\':
-                // the backslash is escape char in string matcher
-                if (isStringMatcher && !isEscaped) {
-                    isEscaped= true;
-                }
-                else {
-                    buffer.append("\\\\");  //$NON-NLS-1$
-                    isEscaped= false;
-                }
-                break;
-            // characters that need to be escaped in the regex.
-            case '(':
-            case ')':
-            case '{':
-            case '}':
-            case '.':
-            case '[':
-            case ']':
-            case '$':
-            case '^':
-            case '+':
-            case '|':
-                if (isEscaped) {
-                    buffer.append("\\\\");  //$NON-NLS-1$
-                    isEscaped= false;
-                }
-                buffer.append('\\');
-                buffer.append(c);
-                break;
-            case '?':
-                if (isStringMatcher && !isEscaped) {
-                    buffer.append('.');
-                }
-                else {
-                    buffer.append('\\');
-                    buffer.append(c);
-                    isEscaped= false;
-                }
-                break;
-            case '*':
-                if (isStringMatcher && !isEscaped) {
-                    buffer.append(".*"); //$NON-NLS-1$
-                }
-                else {
-                    buffer.append('\\');
-                    buffer.append(c);
-                    isEscaped= false;
-                }
-                break;
-            default:
-                if (isEscaped) {
-                    buffer.append("\\\\");  //$NON-NLS-1$
-                    isEscaped= false;
-                }
-                buffer.append(c);
-                break;
-            }
-        }
-        if (isEscaped) {
-            buffer.append("\\\\");  //$NON-NLS-1$
-            isEscaped= false;
-        }
-        return buffer;
-    }
+		boolean isEscaped= false;
+		for (int i = 0; i < pattern.length(); i++) {
+			char c = pattern.charAt(i);
+			switch(c) {
+			// the backslash
+			case '\\':
+				// the backslash is escape char in string matcher
+				if (isStringMatcher && !isEscaped) {
+					isEscaped= true;
+				}
+				else {
+					buffer.append("\\\\");  //$NON-NLS-1$
+					isEscaped= false;
+				}
+				break;
+			// characters that need to be escaped in the regex.
+			case '(':
+			case ')':
+			case '{':
+			case '}':
+			case '.':
+			case '[':
+			case ']':
+			case '$':
+			case '^':
+			case '+':
+			case '|':
+				if (isEscaped) {
+					buffer.append("\\\\");  //$NON-NLS-1$
+					isEscaped= false;
+				}
+				buffer.append('\\');
+				buffer.append(c);
+				break;
+			case '?':
+				if (isStringMatcher && !isEscaped) {
+					buffer.append('.');
+				}
+				else {
+					buffer.append('\\');
+					buffer.append(c);
+					isEscaped= false;
+				}
+				break;
+			case '*':
+				if (isStringMatcher && !isEscaped) {
+					buffer.append(".*"); //$NON-NLS-1$
+				}
+				else {
+					buffer.append('\\');
+					buffer.append(c);
+					isEscaped= false;
+				}
+				break;
+			default:
+				if (isEscaped) {
+					buffer.append("\\\\");  //$NON-NLS-1$
+					isEscaped= false;
+				}
+				buffer.append(c);
+				break;
+			}
+		}
+		if (isEscaped) {
+			buffer.append("\\\\");  //$NON-NLS-1$
+			isEscaped= false;
+		}
+		return buffer;
+	}
 
 	/**
 	 * Interprets escaped characters in the given replace pattern.
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java
index d7cb7cca8fe..d54ca7c8626 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java
@@ -434,7 +434,7 @@ public class TextSearchVisitor {
 				System.out.println(Messages.format(
 						"[TextSearch] Search duration for {0} files in {1} jobs using {2} threads: {3}ms", args)); //$NON-NLS-1$
 			}
-	   }
+		}
 	}
 
 	public IStatus search(TextSearchScope scope, IProgressMonitor monitor) {
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
index 4af679f816e..316279d2eca 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
@@ -385,7 +385,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
 		ArrayList<SearchPageDescriptor> filteredList= new ArrayList<>(input.size());
 		for (SearchPageDescriptor descriptor : input) {
 			if (!WorkbenchActivityHelper.filterItem(descriptor))
-			    filteredList.add(descriptor);
+				filteredList.add(descriptor);
 
 		}
 		return filteredList;
@@ -431,7 +431,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
 		for (int i= 0; i < numPages; i++) {
 			SearchPageDescriptor descriptor= getDescriptorAt(i);
 			if (WorkbenchActivityHelper.filterItem(descriptor))
-			    continue;
+				continue;
 
 			final CTabItem item = new CTabItem(folder, SWT.NONE);
 			item.setData("descriptor", descriptor); //$NON-NLS-1$
@@ -480,9 +480,9 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
 		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		// create help control if needed
-        if (isHelpAvailable()) {
-        	createHelpControl(composite);
-        }
+		if (isHelpAvailable()) {
+			createHelpControl(composite);
+		}
 		fCustomizeButton= createButton(composite, CUSTOMIZE_ID, SearchMessages.SearchDialog_customize, true);
 
 		Label filler= new Label(composite, SWT.NONE);
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.java
index 128325ba81f..090407b3325 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.java
@@ -216,7 +216,7 @@ public final class SearchMessages extends NLS {
 	}
 
 //	public static String ReplaceDialog2_nomatches_error;
-    public static String SearchPreferencePage_textSearchEngine;
+	public static String SearchPreferencePage_textSearchEngine;
 	public static String TextSearchEngineRegistry_defaulttextsearch_label;
 	public static String FileSearchQuery_singularPatternWithFileExt;
 	public static String FileSearchQuery_pluralPatternWithFileExt;
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java
index 372c4dedeb5..e9ced17ae76 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java
@@ -192,15 +192,15 @@ class SearchPageDescriptor implements IPluginContribution, Comparable<SearchPage
 		if (sizeHint != null) {
 			int commaSep= sizeHint.indexOf(',');
 			if (commaSep != -1) {
-		        try {
-		            int xval= Integer.parseInt(sizeHint.substring(0, commaSep).trim());
-		            int yval= Integer.parseInt(sizeHint.substring(commaSep + 1).trim());
-		            return new Point(xval, yval);
-		        } catch (NumberFormatException e) {
-		        }
+				try {
+					int xval= Integer.parseInt(sizeHint.substring(0, commaSep).trim());
+					int yval= Integer.parseInt(sizeHint.substring(commaSep + 1).trim());
+					return new Point(xval, yval);
+				} catch (NumberFormatException e) {
+				}
 			}
 		}
-    	return UNKNOWN_SIZE;
+		return UNKNOWN_SIZE;
 	}
 
 	/**
@@ -367,13 +367,13 @@ class SearchPageDescriptor implements IPluginContribution, Comparable<SearchPage
 		}
 	}
 
-    @Override
+	@Override
 	public String getLocalId() {
-        return getId();
-    }
+		return getId();
+	}
 
-    @Override
+	@Override
 	public String getPluginId() {
-        return fElement.getContributor().getName();
-    }
+		return fElement.getContributor().getName();
+	}
 }
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java
index 62feefb89dc..d5860f28bec 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java
@@ -302,19 +302,19 @@ public class SearchPlugin extends AbstractUIPlugin {
 	}
 
 
-    public TextSearchEngineRegistry getTextSearchEngineRegistry() {
-        if (fTextSearchEngineRegistry == null) {
-        	fTextSearchEngineRegistry= new TextSearchEngineRegistry();
-        }
-        return fTextSearchEngineRegistry;
-    }
-
-    public TextSearchQueryProviderRegistry getTextSearchQueryProviderRegistry() {
-        if (fTextSearchQueryProviderRegistry == null) {
-        	fTextSearchQueryProviderRegistry= new TextSearchQueryProviderRegistry();
-        }
-        return fTextSearchQueryProviderRegistry;
-    }
+	public TextSearchEngineRegistry getTextSearchEngineRegistry() {
+		if (fTextSearchEngineRegistry == null) {
+			fTextSearchEngineRegistry= new TextSearchEngineRegistry();
+		}
+		return fTextSearchEngineRegistry;
+	}
+
+	public TextSearchQueryProviderRegistry getTextSearchQueryProviderRegistry() {
+		if (fTextSearchQueryProviderRegistry == null) {
+			fTextSearchQueryProviderRegistry= new TextSearchQueryProviderRegistry();
+		}
+		return fTextSearchQueryProviderRegistry;
+	}
 
 	/**
 	 * Creates all necessary sorter description nodes.
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java
index 331f9c81a93..7e868698d10 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java
@@ -53,8 +53,8 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I
 	public static final String DEFAULT_PERSPECTIVE= "org.eclipse.search.defaultPerspective"; //$NON-NLS-1$
 	private static final String NO_DEFAULT_PERSPECTIVE= "org.eclipse.search.defaultPerspective.none"; //$NON-NLS-1$
 	public static final String BRING_VIEW_TO_FRONT= "org.eclipse.search.bringToFront"; //$NON-NLS-1$
-    public static final String TEXT_SEARCH_ENGINE = "org.eclipse.search.textSearchEngine"; //$NON-NLS-1$
-    public static final String TEXT_SEARCH_QUERY_PROVIDER = "org.eclipse.search.textSearchQueryProvider"; //$NON-NLS-1$
+	public static final String TEXT_SEARCH_ENGINE = "org.eclipse.search.textSearchEngine"; //$NON-NLS-1$
+	public static final String TEXT_SEARCH_QUERY_PROVIDER = "org.eclipse.search.textSearchQueryProvider"; //$NON-NLS-1$
 	public static final String LIMIT_HISTORY= "org.eclipse.search.limitHistory"; //$NON-NLS-1$
 
 	private ColorFieldEditor fColorEditor;
@@ -119,7 +119,7 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I
 			POTENTIAL_MATCH_FG_COLOR,
 			SearchMessages.SearchPreferencePage_potentialMatchFgColor,
 			getFieldEditorParent()
-        );
+		);
 		addField(fColorEditor);
 
 		fEmphasizedCheckbox.setEnabled(!arePotentialMatchesIgnored(), getFieldEditorParent());
@@ -134,17 +134,17 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I
 			getFieldEditorParent());
 		addField(comboEditor);
 
-        // in case we have a contributed engine, let the user choose.
-        TextSearchEngineRegistry reg= SearchPlugin.getDefault().getTextSearchEngineRegistry();
-        String[][] engineNamesAndIds= reg.getAvailableEngines();
-        if (engineNamesAndIds.length > 1) {
-            comboEditor= new ComboFieldEditor(
-                    TEXT_SEARCH_ENGINE,
-                    SearchMessages.SearchPreferencePage_textSearchEngine,
-                    engineNamesAndIds,
-                    getFieldEditorParent());
-            addField(comboEditor);
-        }
+		// in case we have a contributed engine, let the user choose.
+		TextSearchEngineRegistry reg= SearchPlugin.getDefault().getTextSearchEngineRegistry();
+		String[][] engineNamesAndIds= reg.getAvailableEngines();
+		if (engineNamesAndIds.length > 1) {
+			comboEditor= new ComboFieldEditor(
+					TEXT_SEARCH_ENGINE,
+					SearchMessages.SearchPreferencePage_textSearchEngine,
+					engineNamesAndIds,
+					getFieldEditorParent());
+			addField(comboEditor);
+		}
 	}
 
 	@Override
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java
index 32a76bcdb88..6d843df2483 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java
@@ -132,10 +132,10 @@ class SortDropDownAction extends Action implements IMenuCreator {
 		item.fill(parent, -1);
 	}
 
-    @Override
+	@Override
 	public void run() {
 		// nothing to do
-	    }
+	}
 
 	private SorterDescriptor findSorter(String pageId) {
 		Iterator<SorterDescriptor> iter= SearchPlugin.getDefault().getSorterDescriptors().iterator();
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java
index 8a64d62fc1e..b396c04c4bf 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java
@@ -90,30 +90,30 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt
 			return 2;
 		}
 
-	    @Override
+		@Override
 		public int compare(Viewer viewer, Object e1, Object e2) {
-	        int cat1 = category(e1);
-	        int cat2 = category(e2);
+			int cat1 = category(e1);
+			int cat2 = category(e2);
 
-	        if (cat1 != cat2) {
+			if (cat1 != cat2) {
 				return cat1 - cat2;
 			}
 
-	        if (e1 instanceof LineElement && e2 instanceof LineElement) {
+			if (e1 instanceof LineElement && e2 instanceof LineElement) {
 				LineElement m1= (LineElement) e1;
 				LineElement m2= (LineElement) e2;
-        		return m1.getOffset() - m2.getOffset();
-	        }
-
-	        String name1= fLabelProvider.getText(e1);
-	        String name2= fLabelProvider.getText(e2);
-	        if (name1 == null)
-	            name1 = "";//$NON-NLS-1$
-	        if (name2 == null)
-	            name2 = "";//$NON-NLS-1$
+				return m1.getOffset() - m2.getOffset();
+			}
+
+			String name1= fLabelProvider.getText(e1);
+			String name2= fLabelProvider.getText(e2);
+			if (name1 == null)
+				name1 = "";//$NON-NLS-1$
+			if (name2 == null)
+				name2 = "";//$NON-NLS-1$
 			int result= getComparator().compare(name1, name2);
 			return result;
-	    }
+		}
 	}
 
 	private static final String KEY_SORTING= "org.eclipse.search.resultpage.sorting"; //$NON-NLS-1$
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java
index 07a7d597cbd..803577488a6 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java
@@ -63,12 +63,12 @@ public class ReplaceConfigurationPage extends UserInputWizardPage {
 	public ReplaceConfigurationPage(ReplaceRefactoring refactoring) {
 		super("ReplaceConfigurationPage"); //$NON-NLS-1$
 		fReplaceRefactoring= refactoring;
-    }
+	}
 
-    @Override
+	@Override
 	public void createControl(Composite parent) {
-    	Composite result= new Composite(parent, SWT.NONE);
-    	GridLayout layout= new GridLayout(2, false);
+		Composite result= new Composite(parent, SWT.NONE);
+		GridLayout layout= new GridLayout(2, false);
 		result.setLayout(layout);
 
 		Label description= new Label(result, SWT.NONE);
@@ -153,7 +153,7 @@ public class ReplaceConfigurationPage extends UserInputWizardPage {
 		Dialog.applyDialogFont(result);
 
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ISearchHelpContextIds.REPLACE_DIALOG);
-    }
+	}
 
 	final void updateOKStatus() {
 		RefactoringStatus status= new RefactoringStatus();
@@ -176,7 +176,7 @@ public class ReplaceConfigurationPage extends UserInputWizardPage {
 		fTextFieldContentAssist.setEnabled(enable);
 	}
 
-    @Override
+	@Override
 	protected boolean performFinish() {
 		initializeRefactoring();
 		storeSettings();
@@ -204,10 +204,10 @@ public class ReplaceConfigurationPage extends UserInputWizardPage {
 		IDialogSettings settings= SearchPlugin.getDefault().getDialogSettings().addNewSection(SETTINGS_GROUP);
 		settings.put(SETTINGS_REPLACE_WITH, history.toArray(new String[history.size()]));
 
-    }
+	}
 
 	private void initializeRefactoring() {
 		fReplaceRefactoring.setReplaceString(fTextField.getText());
-    }
+	}
 
 }
\ No newline at end of file
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java
index 6c7648f2b32..e07c3653509 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java
@@ -476,15 +476,15 @@ public class ReplaceRefactoring extends Refactoring {
 				replacementText= PatternConstructor.interpretReplaceEscapes(replacementText, originalText, lineDelimiter);
 
 				Matcher matcher= pattern.matcher(originalText);
-		        StringBuffer sb = new StringBuffer();
-		        matcher.reset();
-		        if (matcher.find()) {
-		        	matcher.appendReplacement(sb, replacementText);
-		        } else {
-		        	return null;
-		        }
-		        matcher.appendTail(sb);
-		        return sb.toString();
+				StringBuffer sb = new StringBuffer();
+				matcher.reset();
+				if (matcher.find()) {
+					matcher.appendReplacement(sb, replacementText);
+				} else {
+					return null;
+				}
+				matcher.appendTail(sb);
+				return sb.toString();
 			} catch (IndexOutOfBoundsException ex) {
 				throw new PatternSyntaxException(ex.getLocalizedMessage(), replacementText, -1);
 			}
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java
index 09ce30ad928..75bb63ea705 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java
@@ -279,7 +279,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP
 			ErrorDialog.openError(getShell(), SearchMessages.TextSearchPage_replace_searchproblems_title, SearchMessages.TextSearchPage_replace_searchproblems_message, e.getStatus());
 			return false;
 		}
- 		return true;
+		return true;
 	}
 
 	@Override
@@ -741,7 +741,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP
 		});
 		fSearchBinaryCheckbox.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false, 1, 1));
 		fSearchBinaryCheckbox.setFont(searchInGroup.getFont());
-  	}
+	}
 
 	/**
 	 * Sets the search page's container.
diff --git a/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java b/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java
index 19696cbc6d0..180084c81ab 100644
--- a/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java
+++ b/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java
@@ -53,26 +53,26 @@ public interface ISearchResultView extends IViewPart {
 	 * If every match should show up in the search result view then the match
 	 * itself can be used as key.
 	 *
- 	 * @param	groupFactory			the action group factory
-  	 *								  		or <code>null</code> if no factory is provided.
- 	 * @param	singularLabel			the label to be used for this search occurrence
- 	 * 									  if there is one match
+	 * @param	groupFactory			the action group factory
+	 *								  		or <code>null</code> if no factory is provided.
+	 * @param	singularLabel			the label to be used for this search occurrence
+	 * 									  if there is one match
 	 *									  or <code>null</code> if the pluralLabelPattern should be used
- 	 * @param	pluralLabelPattern		the label pattern to be used for this search occurrence
- 	 * 									  if there are more than one matches or none.
- 	 * 									  This string may contain {0} which will be replace by the match count
- 	 * @param	imageDescriptor			the image descriptor to be used for this search occurrence,
+	 * @param	pluralLabelPattern		the label pattern to be used for this search occurrence
+	 * 									  if there are more than one matches or none.
+	 * 									  This string may contain {0} which will be replace by the match count
+	 * @param	imageDescriptor			the image descriptor to be used for this search occurrence,
 	 *									  or <code>null</code> if this search should not have an image
 	 * @param	pageId					the id of the search page which started the search
 	 * @param	labelProvider			the label provider used by this search result view
-  	 *									  or <code>null</code> if the default provider should be used.
+	 *									  or <code>null</code> if the default provider should be used.
 	 *									  The default label provider shows the resource name and the corresponding image.
 	 * @param	gotoAction				the action used by the view to go to a marker
 	 * @param	groupByKeyComputer		the computer used by the view to compute the key for a marker
 	 * @param	operation				the runnable used by the view to repeat the search
 	 *
 	 * @see IActionGroupFactory
- 	 * @since 2.0
+	 * @since 2.0
 	 */
 	public void searchStarted(
 				IActionGroupFactory		groupFactory,
@@ -200,7 +200,7 @@ public interface ISearchResultView extends IViewPart {
 	 *
 	 * @param	description		the text description of the match
 	 * @param	groupByKey		the <code>Object</code> by which this match is grouped
- 	 * @param	marker			the marker for this match
+	 * @param	marker			the marker for this match
 	 * @param	resource		the marker's resource passed for optimization
 	 */
 	public void addMatch(String description, Object groupByKey, IResource resource, IMarker marker);