Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2016-07-12 18:47:27 +0000
committerLars Vogel2016-07-12 18:47:27 +0000
commit20b4b0ef7905efca4c88f2b558085ffdd3a1889a (patch)
tree1a5ad926f7ad979bf64c4c43a99b4a5bc27d2555
parent34c52167cc14bbe842fb9fa24b010a7da19632ce (diff)
downloadeclipse.platform.text-20b4b0ef7905efca4c88f2b558085ffdd3a1889a.tar.gz
eclipse.platform.text-20b4b0ef7905efca4c88f2b558085ffdd3a1889a.tar.xz
eclipse.platform.text-20b4b0ef7905efca4c88f2b558085ffdd3a1889a.zip
Bug 497776 - Remove trailing whitespace from org.eclipse.search
Change-Id: Id918adb62f91392ce80c12f133061c5895e785ae Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--org.eclipse.search/new search/org/eclipse/search/core/text/TextSearchEngine.java2
-rw-r--r--org.eclipse.search/new search/org/eclipse/search/ui/ISearchPageContainer.java4
-rw-r--r--org.eclipse.search/new search/org/eclipse/search/ui/ISearchQuery.java2
-rw-r--r--org.eclipse.search/new search/org/eclipse/search/ui/NewSearchUI.java2
-rw-r--r--org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java4
-rw-r--r--org.eclipse.search/new search/org/eclipse/search/ui/text/TextSearchQueryProvider.java8
-rw-r--r--org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/core/text/FileNamePatternSearchScope.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/core/text/PatternConstructor.java6
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java4
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java10
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchAction.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java30
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java6
18 files changed, 46 insertions, 46 deletions
diff --git a/org.eclipse.search/new search/org/eclipse/search/core/text/TextSearchEngine.java b/org.eclipse.search/new search/org/eclipse/search/core/text/TextSearchEngine.java
index 5faab706dd0..cd09b056db7 100644
--- a/org.eclipse.search/new search/org/eclipse/search/core/text/TextSearchEngine.java
+++ b/org.eclipse.search/new search/org/eclipse/search/core/text/TextSearchEngine.java
@@ -91,7 +91,7 @@ public abstract class TextSearchEngine {
/**
* Creates a pattern for the given search string and the given options.
- *
+ *
* @param pattern the search pattern. If <code>isRegex</code> is:
* <ul>
* <li><code>false</code>: a string including '*' and '?' wildcards and '\' for
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 61dd8932d23..8f4b53909b0 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
@@ -110,7 +110,7 @@ public interface ISearchPageContainer {
/**
* Tells this container whether the active editor can provide the selection for the scope and
* hence the {@link #SELECTION_SCOPE} can be enabled if the active part is an editor.
- *
+ *
* @param state <code>true</code> if the active editor can provide the selection,
* <code>false</code> otherwise
* @since 3.7
@@ -119,7 +119,7 @@ public interface ISearchPageContainer {
/**
* Returns the editor input of the active editor.
- *
+ *
* @return the editor input or <code>null</code> if the active part is not an editor
* @since 3.7
*/
diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/ISearchQuery.java b/org.eclipse.search/new search/org/eclipse/search/ui/ISearchQuery.java
index 7470c9f2810..82b64fba345 100644
--- a/org.eclipse.search/new search/org/eclipse/search/ui/ISearchQuery.java
+++ b/org.eclipse.search/new search/org/eclipse/search/ui/ISearchQuery.java
@@ -23,7 +23,7 @@ import org.eclipse.core.runtime.OperationCanceledException;
* <p>
* Clients may implement this interface.
* </p>
- *
+ *
* @since 3.0
*/
public interface ISearchQuery {
diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/NewSearchUI.java b/org.eclipse.search/new search/org/eclipse/search/ui/NewSearchUI.java
index 01232f82a97..1636da33641 100644
--- a/org.eclipse.search/new search/org/eclipse/search/ui/NewSearchUI.java
+++ b/org.eclipse.search/new search/org/eclipse/search/ui/NewSearchUI.java
@@ -254,7 +254,7 @@ public class NewSearchUI {
/**
* Removes the given search query.
- *
+ *
* @param query the query to be removed
* @since 3.5
*/
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 ebc224fc568..cbcfd328bd5 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
@@ -434,7 +434,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch
* front; otherwise, a new editor is opened. If <code>activate == true</code> the editor will be
* activated.
* <p>
- *
+ *
* @param page the workbench page in which the editor will be opened
* @param file the file to open
* @param offset the offset to select in the editor
@@ -456,7 +456,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch
* front; otherwise, a new editor is opened. If <code>activate == true</code> the editor will be
* activated.
* <p>
- *
+ *
* @param page the workbench page in which the editor will be opened
* @param file the file to open
* @param activate if <code>true</code> the editor will be activated
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 7cc4be52f12..92cabf1d595 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
@@ -63,9 +63,9 @@ public abstract class TextSearchQueryProvider {
/**
* Returns whether to require a word boundary at the beginning and end of the pattern,
* excluding matches that only match part of a word.
- *
+ *
* This implementation returns <code>false</code>, subclasses can override.
- *
+ *
* @return <code>true</code> if the pattern should match only whole words. <code>true</code>
* is not allowed if {@link #isRegExSearch()} returns <code>true</code>. In this
* case, clients can either ignore this option or throw an
@@ -78,9 +78,9 @@ public abstract class TextSearchQueryProvider {
/**
* Returns whether binary files are searched.
- *
+ *
* This implementation returns <code>false</code>, subclasses can override.
- *
+ *
* @return <code>true</code> if binary files are searched
* @since 3.11
*/
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java
index 519c1439f87..8ee3db7c335 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java
@@ -69,7 +69,7 @@ public class MatchFilterSelectionDialog extends StatusDialog {
/**
* Creates a {@link MatchFilterSelectionDialog}.
- *
+ *
* @param shell the parent shell
* @param enableMatchFilterConfiguration <code>true</code> if match filter configuration should
* be enabled
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java
index cbc22757063..284d0fa4075 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java
@@ -154,7 +154,7 @@ public class FileCharSequenceProvider {
/**
* Fills the buffer by reading from the given reader.
- *
+ *
* @param reader the reader to read from
* @param pos the offset of the reader in the file
* @return returns true if the end of the file has been reached
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 f55b7e00e4f..14576e6ca3c 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
@@ -85,7 +85,7 @@ public class FileNamePatternSearchScope extends TextSearchScope {
/**
* Adds an file name pattern to the scope.
- *
+ *
* @param pattern the pattern
*/
public void addFileNamePattern(String pattern) {
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 2aa184e675c..fd102eaa27a 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
@@ -37,7 +37,7 @@ public class PatternConstructor {
/**
* Creates a pattern element from the pattern string which is either a reg-ex expression or in
* our old 'StringMatcher' format.
- *
+ *
* @param pattern The search pattern
* @param isRegex <code>true</code> if the passed string already is a reg-ex pattern
* @param isStringMatcher <code>true</code> if the passed string is in the StringMatcher format.
@@ -75,7 +75,7 @@ public class PatternConstructor {
/**
* Copied from {@link org.eclipse.jface.text.FindReplaceDocumentAdapter}' to support '\R'
- *
+ *
* @param findString the string to substitute
* @return the new string
* @throws PatternSyntaxException if "\R" is at an illegal position
@@ -159,7 +159,7 @@ public class PatternConstructor {
/**
* Creates a pattern element from an array of patterns in the old 'StringMatcher' format.
- *
+ *
* @param patterns The search patterns
* @param isCaseSensitive Set to <code>true</code> to create a case insensitive pattern
* @return The created 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 22e8862c80e..0133a07ccb4 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
@@ -151,12 +151,12 @@ public class TextSearchVisitor {
private final int fEnd;
private final Map<IFile, IDocument> fDocumentsInEditors;
private FileCharSequenceProvider fileCharSequenceProvider;
-
+
private IPath previousLocationFromFile;
// occurences need to be passed to FileSearchResultCollector with growing offset
private List<TextSearchMatchAccess> occurencesForPreviousLocation;
private CharSequence charsequenceForPreviousLocation;
-
+
/**
* Searches for matches in a set of files.
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 08e541244ee..fcd9e975652 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
@@ -94,7 +94,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
// Dialog store id constants
private static final String DIALOG_NAME= "SearchDialog"; //$NON-NLS-1$
- private static final String STORE_PREVIOUS_PAGE= "PREVIOUS_PAGE"; //$NON-NLS-1$
+ private static final String STORE_PREVIOUS_PAGE= "PREVIOUS_PAGE"; //$NON-NLS-1$
private static final String STORE_IS_OPEN_PREVIOUS_PAGE= "IS_OPEN_PREVIOUS_PAGE"; //$NON-NLS-1$
@@ -282,7 +282,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
/**
* Tells whether the given part is the old ('classic') search view.
- *
+ *
* @param part the part to test
* @return <code>true</code> if the given part is the old search view
* @deprecated old ('classic') search is deprecated
@@ -337,7 +337,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
ListSelectionDialog dialog= new ListSelectionDialog(getShell(), input, new ArrayContentProvider(), labelProvider, message) {
Button fLastUsedPageButton;
-
+
@Override
public void create() {
super.create();
@@ -367,7 +367,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
fLastUsedPageButton.setSelection(fDialogSettings.getBoolean(STORE_IS_OPEN_PREVIOUS_PAGE));
return control;
}
-
+
@Override
protected void okPressed() {
fDialogSettings.put(STORE_IS_OPEN_PREVIOUS_PAGE, fLastUsedPageButton.getSelection());
@@ -572,7 +572,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
SearchPageDescriptor descriptor= (SearchPageDescriptor) item.getData("descriptor"); //$NON-NLS-1$
-
+
if (item.getControl() == null) {
item.setControl(createPageControl(folder, descriptor));
}
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 3702c32cb06..1d2766069d3 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
@@ -362,7 +362,7 @@ public class SearchPlugin extends AbstractUIPlugin {
/**
* Creates the Search plugin standard groups in a context menu.
- *
+ *
* @param menu the menu to create in
* @deprecated old search
*/
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
index 4af2237ee0f..04dc2922634 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
@@ -652,7 +652,7 @@ public class SearchResultViewer extends TableViewer {
/**
* Handle an update of an entry.
- *
+ *
* @param entry the entry
* @param matchRemoved <code>true</code> if a match got removed
*/
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchAction.java
index aaf56521623..1ad10d075df 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchAction.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchAction.java
@@ -21,7 +21,7 @@ class ShowSearchAction extends Action {
/**
* Create a new instance of this class.
- *
+ *
* @param search the search
*/
public ShowSearchAction(Search search) {
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java
index 8ee249cb20e..b8c6b27deec 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java
@@ -37,12 +37,12 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc
private FileSearchPage fPage;
private AbstractTreeViewer fTreeViewer;
private Map<Object, Set<Object>> fChildrenMap;
-
+
FileTreeContentProvider(FileSearchPage page, AbstractTreeViewer viewer) {
fPage= page;
fTreeViewer= viewer;
}
-
+
@Override
public Object[] getElements(Object inputElement) {
Object[] children= getChildren(inputElement);
@@ -54,28 +54,28 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc
}
return children;
}
-
+
private int getElementLimit() {
return fPage.getElementLimit().intValue();
}
-
+
@Override
public void dispose() {
// nothing to do
}
-
+
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
if (newInput instanceof FileSearchResult) {
initialize((FileSearchResult) newInput);
}
}
-
+
private synchronized void initialize(AbstractTextSearchResult result) {
fResult= result;
fChildrenMap= new HashMap<>();
boolean showLineMatches= !((FileSearchQuery) fResult.getQuery()).isFileNameSearch();
-
+
if (result != null) {
Object[] elements= result.getElements();
for (int i= 0; i < elements.length; i++) {
@@ -113,7 +113,7 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc
/**
* Adds the child to the parent.
- *
+ *
* @param parent the parent
* @param child the child
* @return <code>true</code> if this set did not already contain the specified element
@@ -127,16 +127,16 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc
}
return children.add(child);
}
-
+
private boolean hasChild(Object parent, Object child) {
Set<Object> children= fChildrenMap.get(parent);
return children != null && children.contains(child);
}
-
+
private void remove(Object element, boolean refreshViewer) {
// precondition here: fResult.getMatchCount(child) <= 0
-
+
if (hasChildren(element)) {
if (refreshViewer)
fTreeViewer.refresh(element);
@@ -167,8 +167,8 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc
}
return fResult.getMatchCount(element) > 0;
}
-
-
+
+
private void removeFromSiblings(Object element, Object parent) {
Set<Object> siblings= fChildrenMap.get(parent);
if (siblings != null) {
@@ -196,7 +196,7 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc
// change events to elements are reported in file search
if (fResult.getMatchCount(updatedElements[i]) > 0)
insert(updatedElements[i], true);
- else
+ else
remove(updatedElements[i], true);
} else {
// change events to line elements are reported in text search
@@ -232,7 +232,7 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc
if (element instanceof LineElement) {
return ((LineElement) element).getParent();
}
-
+
if (element instanceof FileMatch) {
FileMatch match= (FileMatch) element;
return match.getLineElement();
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 c8d7bcee13c..1e7697f10e9 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
@@ -279,7 +279,7 @@ public class ReplaceRefactoring extends Refactoring {
/**
* Checks whether the match should be included. Also collects ignored matches whose
* file is linked to an already collected match.
- *
+ *
* @param match the match
* @return <code>true</code> iff the match should be included
* @since 3.7
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 5d81904ee4f..abe628986c7 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
@@ -141,7 +141,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP
*/
private String[] fPreviousExtensions;
-
+
private static class SearchPatternData {
public final boolean isCaseSensitive;
public final boolean isRegExSearch;
@@ -774,10 +774,10 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP
});
fSearchDerivedCheckbox.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false, 1, 1));
fSearchDerivedCheckbox.setFont(searchInGroup.getFont());
-
+
fSearchBinaryCheckbox= new Button(searchInGroup, SWT.CHECK);
fSearchBinaryCheckbox.setText(SearchMessages.TextSearchPage_searchBinary_label);
-
+
fSearchBinaryCheckbox.setSelection(fSearchBinaries);
fSearchBinaryCheckbox.addSelectionListener(new SelectionAdapter() {
@Override

Back to the top