Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2019-06-14 09:20:16 +0000
committerLars Vogel2019-06-14 09:28:57 +0000
commite88d686c1fc682507b0246d04249afa81bdb6146 (patch)
treee277717f5e273ac4d8175534cdf68c80527bba73 /org.eclipse.search
parent45c0a30d7027df909b78fa167cf3da83488581d9 (diff)
downloadeclipse.platform.text-e88d686c1fc682507b0246d04249afa81bdb6146.tar.gz
eclipse.platform.text-e88d686c1fc682507b0246d04249afa81bdb6146.tar.xz
eclipse.platform.text-e88d686c1fc682507b0246d04249afa81bdb6146.zip
Use isEmpty() instead of length() to check if collection is emptyI20190615-1800I20190614-1800
Change-Id: I0106dd0c2ddfa318375877d4562068d82aa9ac5f Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Diffstat (limited to 'org.eclipse.search')
-rw-r--r--org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java2
-rw-r--r--org.eclipse.search/new search/org/eclipse/search/ui/text/FileTextSearchScope.java2
-rw-r--r--org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java2
-rw-r--r--org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/RetrieverAction.java4
-rw-r--r--org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/TextSearchQueryProviderRegistry.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchEngineRegistry.java2
-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/CopyToClipboardAction.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java2
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java4
-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/util/ExceptionHandler.java4
15 files changed, 19 insertions, 19 deletions
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 d3a7cd1dc54..55932b916d8 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
@@ -1245,7 +1245,7 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch
}
private synchronized boolean hasMoreUpdates() {
- return fBatchedClearAll || fBatchedUpdates.size() > 0;
+ return fBatchedClearAll || !fBatchedUpdates.isEmpty();
}
private boolean isQueryRunning() {
diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/text/FileTextSearchScope.java b/org.eclipse.search/new search/org/eclipse/search/ui/text/FileTextSearchScope.java
index 712b89c48a1..c526a26e35e 100644
--- a/org.eclipse.search/new search/org/eclipse/search/ui/text/FileTextSearchScope.java
+++ b/org.eclipse.search/new search/org/eclipse/search/ui/text/FileTextSearchScope.java
@@ -250,7 +250,7 @@ public final class FileTextSearchScope extends TextSearchScope {
if (negativeMatcher) {
pattern= pattern.substring(FileTypeEditor.FILE_PATTERN_NEGATOR.length()).trim();
}
- if (pattern.length() > 0) {
+ if (!pattern.isEmpty()) {
patterns.add(pattern);
}
}
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java
index e2ccdd20944..e36c96738b4 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchView.java
@@ -460,7 +460,7 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I
label= LegacyActionTools.escapeMnemonics(page.getLabel());
}
if (!fPageContent.isDisposed()) {
- if (label.length() == 0) {
+ if (label.isEmpty()) {
if (fDescriptionComposite != null) {
fDescriptionComposite.dispose();
fDescriptionComposite= null;
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/RetrieverAction.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/RetrieverAction.java
index 556d742435f..42662b0045b 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/RetrieverAction.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/RetrieverAction.java
@@ -71,7 +71,7 @@ abstract public class RetrieverAction extends Action {
}
TextSearchQueryProvider provider= TextSearchQueryProvider.getPreferred();
String searchForString= getSearchForString(page);
- if (searchForString.length() == 0) {
+ if (searchForString.isEmpty()) {
MessageDialog.openInformation(getShell(), SearchMessages.RetrieverAction_dialog_title, SearchMessages.RetrieverAction_empty_selection);
return;
}
@@ -310,7 +310,7 @@ abstract public class RetrieverAction extends Action {
protected String getSearchForString(IWorkbenchPage page) {
String searchFor= extractSearchTextFromSelection(page.getSelection());
- if (searchFor == null || searchFor.length() == 0) {
+ if (searchFor == null || searchFor.isEmpty()) {
IWorkbenchPart activePart= page.getActivePart();
if (activePart instanceof IEditorPart) {
searchFor= extractSearchTextFromEditor((IEditorPart) activePart);
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/TextSearchQueryProviderRegistry.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/TextSearchQueryProviderRegistry.java
index 9d29b05308b..9459d72d7a7 100644
--- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/TextSearchQueryProviderRegistry.java
+++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text2/TextSearchQueryProviderRegistry.java
@@ -55,7 +55,7 @@ public class TextSearchQueryProviderRegistry {
private void updateProvider(String preferredId) {
fPreferredProviderId= preferredId;
fPreferredProvider= null;
- if (preferredId.length() != 0) { // empty string: default engine
+ if (!preferredId.isEmpty()) { // empty string: default engine
fPreferredProvider= createFromExtension(preferredId);
}
if (fPreferredProvider == null) {
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchEngineRegistry.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchEngineRegistry.java
index b6ec7fd983c..3dec102d717 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchEngineRegistry.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchEngineRegistry.java
@@ -53,7 +53,7 @@ public class TextSearchEngineRegistry {
}
private void updateEngine(String preferredId) {
- if (preferredId.length() != 0) { // empty string: default engine
+ if (!preferredId.isEmpty()) { // empty string: default engine
TextSearchEngine engine= createFromExtension(preferredId);
if (engine != null) {
fPreferredEngineId= preferredId;
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 d54ca7c8626..6a23335415a 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
@@ -210,7 +210,7 @@ public class TextSearchVisitor {
public IStatus processFile(IFile file, IProgressMonitor monitor) {
// A natural cleanup after the change to use JobGroups is accepted would be to move these
// methods to the TextSearchJob class.
- Matcher matcher= fSearchPattern.pattern().length() == 0 ? null : fSearchPattern.matcher(""); //$NON-NLS-1$
+ Matcher matcher= fSearchPattern.pattern().isEmpty() ? null : fSearchPattern.matcher(""); //$NON-NLS-1$
try {
if (!fCollector.acceptFile(file) || matcher == null) {
@@ -377,7 +377,7 @@ public class TextSearchVisitor {
};
try {
- String taskName= fSearchPattern.pattern().length() == 0
+ String taskName= fSearchPattern.pattern().isEmpty()
? SearchMessages.TextSearchVisitor_filesearch_task_label
: Messages.format(SearchMessages.TextSearchVisitor_textsearch_task_label, fSearchPattern.pattern());
fProgressMonitor.beginTask(taskName, fNumberOfFilesToScan);
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java
index a6a1bc821da..48011ecb199 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java
@@ -90,7 +90,7 @@ public class CopyToClipboardAction extends Action {
sel= text.getSelectionText();
}
if (sel != null) {
- if (sel.length() > 0) {
+ if (!sel.isEmpty()) {
copyToClipboard(sel, shell);
}
return;
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java
index 14a3fe8760a..f07113fc3bf 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java
@@ -124,7 +124,7 @@ public class ScopePart {
}
private IWorkingSet getWorkingSet(IWorkingSetManager workingSetManager, String storedName) {
- if (storedName.length() == 0) {
+ if (storedName.isEmpty()) {
IWorkbenchPage page= fSearchDialog.getWorkbenchWindow().getActivePage();
if (page != null) {
return page.getAggregateWorkingSet();
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 316279d2eca..cc996bbd7e9 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
@@ -492,7 +492,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
fReplaceButton= createActionButton(composite, REPLACE_ID, SearchMessages.SearchDialog_replaceAction, true);
fReplaceButton.setVisible(fCurrentPage instanceof IReplacePage);
Button searchButton= createActionButton(composite, SEARCH_ID, SearchMessages.SearchDialog_searchAction, true);
- searchButton.setEnabled(fDescriptors.size() > 0);
+ searchButton.setEnabled(!fDescriptors.isEmpty());
super.createButtonsForButtonBar(composite); // cancel button
return composite;
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 7e868698d10..bc8fd238658 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
@@ -209,7 +209,7 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I
handleDeletedPerspectives();
IPreferenceStore store= SearchPlugin.getDefault().getPreferenceStore();
String id= store.getString(DEFAULT_PERSPECTIVE);
- if (id == null || id.length() == 0 || id.equals(NO_DEFAULT_PERSPECTIVE))
+ if (id == null || id.isEmpty() || id.equals(NO_DEFAULT_PERSPECTIVE))
return null;
else if (PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId(id) == null) {
store.putValue(DEFAULT_PERSPECTIVE, id);
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 b396c04c4bf..00228697fde 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
@@ -270,7 +270,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt
fActionGroup.setContext(new ActionContext(getSite().getSelectionProvider().getSelection()));
fActionGroup.fillContextMenu(mgr);
FileSearchQuery query= (FileSearchQuery) getInput().getQuery();
- if (query.getSearchString().length() > 0) {
+ if (!query.getSearchString().isEmpty()) {
IStructuredSelection selection = getViewer().getStructuredSelection();
if (!selection.isEmpty()) {
ReplaceAction replaceSelection= new ReplaceAction(getSite().getShell(), (FileSearchResult)getInput(), selection.toArray());
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java
index 01d9a59151c..721662cd70d 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java
@@ -282,7 +282,7 @@ public class FileSearchQuery implements ISearchQuery {
public String getResultLabel(int nMatches) {
String searchString= getSearchString();
- if (searchString.length() > 0) {
+ if (!searchString.isEmpty()) {
// text search
if (isScopeAllFileTypes()) {
// search all file extensions
@@ -330,7 +330,7 @@ public class FileSearchQuery implements ISearchQuery {
}
public boolean isFileNameSearch() {
- return fSearchText.length() == 0;
+ return fSearchText.isEmpty();
}
public boolean isRegexSearch() {
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 e07c3653509..ad1ab219fa8 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
@@ -206,7 +206,7 @@ public class ReplaceRefactoring extends Refactoring {
@Override
public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException {
String searchString= getQuery().getSearchString();
- if (searchString.length() == 0) {
+ if (searchString.isEmpty()) {
return RefactoringStatus.createFatalErrorStatus(SearchMessages.ReplaceRefactoring_error_illegal_search_string);
}
fMatches.clear();
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExceptionHandler.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExceptionHandler.java
index 0dea1ab343a..bbbf3ad3abd 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExceptionHandler.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExceptionHandler.java
@@ -116,7 +116,7 @@ public class ExceptionHandler {
perform((CoreException)target, shell, title, message);
} else {
SearchPlugin.log(e);
- if (e.getMessage() != null && e.getMessage().length() > 0) {
+ if (e.getMessage() != null && !e.getMessage().isEmpty()) {
displayMessageDialog(e.getMessage(), shell, title, message);
} else {
displayMessageDialog(target.getMessage(), shell, title, message);
@@ -140,7 +140,7 @@ public class ExceptionHandler {
msg.write(message);
msg.write("\n\n"); //$NON-NLS-1$
}
- if (exceptionMessage == null || exceptionMessage.length() == 0)
+ if (exceptionMessage == null || exceptionMessage.isEmpty())
msg.write(SearchMessages.ExceptionDialog_seeErrorLogMessage);
else
msg.write(exceptionMessage);

Back to the top