Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jface.text/src/org/eclipse
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.jface.text/src/org/eclipse
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.jface.text/src/org/eclipse')
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java6
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java6
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java8
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java4
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java4
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateStore.java2
19 files changed, 28 insertions, 28 deletions
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java
index e74a7da32d0..d5d1c605f02 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java
@@ -432,7 +432,7 @@ public final class SelectionProcessor {
for (int offset= 0; offset < lineLength; offset++) {
if (startColumn == -1) {
if (visual == visualStartColumn)
- if (!delete && isWider(content.charAt(offset), visual) && replacement.length() == 0)
+ if (!delete && isWider(content.charAt(offset), visual) && replacement.isEmpty())
startColumn= offset - 1;
else
startColumn= offset;
@@ -458,7 +458,7 @@ public final class SelectionProcessor {
visual+= visualSizeIncrement(content.charAt(offset), visual);
}
if (startColumn == -1) {
- boolean materializeVirtualSpace= replacement.length() != 0;
+ boolean materializeVirtualSpace= !replacement.isEmpty();
if (materializeVirtualSpace) {
int spaces= Math.max(0, visualStartColumn - visual);
char[] array= new char[spaces];
@@ -469,7 +469,7 @@ public final class SelectionProcessor {
}
if (endColumn == -1)
endColumn= lineLength;
- if (replacement.length() == 0)
+ if (replacement.isEmpty())
return new DeleteEdit(info.getOffset() + startColumn, endColumn - startColumn);
return new ReplaceEdit(info.getOffset() + startColumn, endColumn - startColumn, replacement);
}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java
index 4d7c78ba543..727d0114115 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java
@@ -250,7 +250,7 @@ public class CodeMiningManager implements Runnable {
Position pos= new Position(g.getKey().offset, g.getKey().length);
List<ICodeMining> minings= g.getValue();
- boolean inLineHeader= minings.size() > 0 ? (minings.get(0) instanceof LineHeaderCodeMining) : true;
+ boolean inLineHeader= !minings.isEmpty() ? (minings.get(0) instanceof LineHeaderCodeMining) : true;
// Try to find existing annotation
AbstractInlinedAnnotation ann= fInlinedAnnotationSupport.findExistingAnnotation(pos);
if (ann == null) {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java
index e0c31edb89f..3bcaab28954 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java
@@ -280,7 +280,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem
if (fInput != null)
content= fInput.getHtml();
- fBrowserHasContent= content != null && content.length() > 0;
+ fBrowserHasContent= content != null && !content.isEmpty();
if (!fBrowserHasContent)
content= "<html><body ></html>"; //$NON-NLS-1$
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java
index 3331c95d772..c148f497594 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java
@@ -195,7 +195,7 @@ public class HTML2TextReader extends SubstitutionTextReader {
private String html2Text(String html) {
- if (html == null || html.length() == 0)
+ if (html == null || html.isEmpty())
return EMPTY_STRING;
html= html.toLowerCase();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java
index dea4d1d26f8..dad34e718ef 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java
@@ -118,7 +118,7 @@ public abstract class SubstitutionTextReader extends SingleCharReader {
String s= computeSubstitution(c);
if (s == null)
break;
- if (s.length() > 0)
+ if (!s.isEmpty())
fBuffer.insert(0, s);
c= nextChar();
}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java
index 5dda118d83c..2d2b8a52a29 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java
@@ -600,7 +600,7 @@ class ContextInformationPopup2 implements IContentAssistListener2 {
* @param e the verify event describing the key stroke
*/
private void contextInfoPopupProcessEvent(VerifyEvent e) {
- if (e.start != e.end && (e.text == null || e.text.length() == 0))
+ if (e.start != e.end && (e.text == null || e.text.isEmpty()))
validateContextInformation();
}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java
index 710beacbbca..181e79cf20b 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java
@@ -1112,7 +1112,7 @@ abstract public class AbstractInformationControlManager {
protected void presentInformation() {
boolean hasContents= false;
if (fInformation instanceof String)
- hasContents= ((String)fInformation).trim().length() > 0;
+ hasContents= !((String)fInformation).trim().isEmpty();
else
hasContents= (fInformation != null);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java
index a02d9b8af4f..cf417ce4d71 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java
@@ -319,7 +319,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
TextChangedEvent event= new TextChangedEvent(this);
- if (fTextChangeListeners != null && fTextChangeListeners.size() > 0) {
+ if (fTextChangeListeners != null && !fTextChangeListeners.isEmpty()) {
Iterator<TextChangeListener> e= new ArrayList<>(fTextChangeListeners).iterator();
while (e.hasNext())
e.next().textChanged(event);
@@ -336,7 +336,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
TextChangedEvent event = new TextChangedEvent(this);
- if (fTextChangeListeners != null && fTextChangeListeners.size() > 0) {
+ if (fTextChangeListeners != null && !fTextChangeListeners.isEmpty()) {
Iterator<TextChangeListener> e= new ArrayList<>(fTextChangeListeners).iterator();
while (e.hasNext())
e.next().textSet(event);
@@ -364,7 +364,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
event.newCharCount= (fEvent.fText == null ? 0 : fEvent.fText.length());
event.newLineCount= (fEvent.fText == null ? 0 : document.computeNumberOfLines(fEvent.fText));
- if (fTextChangeListeners != null && fTextChangeListeners.size() > 0) {
+ if (fTextChangeListeners != null && !fTextChangeListeners.isEmpty()) {
Iterator<TextChangeListener> e= new ArrayList<>(fTextChangeListeners).iterator();
while (e.hasNext())
e.next().textChanging(event);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java
index dd19345c8ae..73c1c4ebff1 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java
@@ -61,7 +61,7 @@ public class DefaultTextHover implements ITextHover {
Position p= model.getPosition(a);
if (p != null && p.overlapsWith(hoverRegion.getOffset(), hoverRegion.getLength())) {
String msg= a.getText();
- if (msg != null && msg.trim().length() > 0)
+ if (msg != null && !msg.trim().isEmpty())
return msg;
}
}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java
index eae94c20c0f..34d2052678b 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java
@@ -544,7 +544,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
@Override
protected boolean isValid() {
if (isConnected())
- return (fStart > -1 || fCommands.size() > 0);
+ return (fStart > -1 || !fCommands.isEmpty());
return false;
}
@@ -558,7 +558,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
protected long getUndoModificationStamp() {
if (fStart > -1)
return super.getUndoModificationStamp();
- else if (fCommands.size() > 0)
+ else if (!fCommands.isEmpty())
return fCommands.get(0).getUndoModificationStamp();
return fUndoModificationStamp;
@@ -574,7 +574,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
protected long getRedoModificationStamp() {
if (fStart > -1)
return super.getRedoModificationStamp();
- else if (fCommands.size() > 0)
+ else if (!fCommands.isEmpty())
return fCommands.get(fCommands.size()-1).getRedoModificationStamp();
return fRedoModificationStamp;
@@ -988,7 +988,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
*/
private boolean isWhitespaceText(String text) {
- if (text == null || text.length() == 0)
+ if (text == null || text.isEmpty())
return false;
String[] delimiters= fTextViewer.getDocument().getLegalLineDelimiters();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
index 2c266dcea06..9b412ebf101 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
@@ -4315,7 +4315,7 @@ public class TextViewer extends Viewer implements
if (ignoreWhitespace) {
String s= d.get(line.getOffset(), found[0]);
s= s.trim();
- if (s.length() == 0)
+ if (s.isEmpty())
index= line.getOffset() + found[0];
} else if (found[0] == 0)
index= line.getOffset();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java
index 8d909ab49a5..3c1a8100422 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java
@@ -274,7 +274,7 @@ class AsyncCompletionProposalPopup extends CompletionProposalPopup {
fFutures= buildCompletionFuturesOrJobs(fInvocationOffset);
fFilteredProposals= runFutures(fInvocationOffset, (List<ICompletionProposal> proposals) -> {
ensureDocumentListenerInstalled();
- if (proposals.size() > 0 && completeCommonPrefix()) {
+ if (!proposals.isEmpty() && completeCommonPrefix()) {
hide();
} else {
fFilteredProposals= proposals;
@@ -311,7 +311,7 @@ class AsyncCompletionProposalPopup extends CompletionProposalPopup {
@Override
protected List<ICompletionProposal> computeFilteredProposals(int offset, DocumentEvent event) {
- if(fComputedProposals != null && fComputedProposals.size() > 0 && fComputedProposals.get(0) instanceof ComputingProposal) {
+ if(fComputedProposals != null && !fComputedProposals.isEmpty() && fComputedProposals.get(0) instanceof ComputingProposal) {
Set<CompletableFuture<List<ICompletionProposal>>> remaining = Collections.synchronizedSet(new HashSet<>(fFutures));
for (CompletableFuture<List<ICompletionProposal>> future : fFutures) {
future.thenRun(() -> {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java
index 364b6707941..24ca3e733ed 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java
@@ -369,7 +369,7 @@ class CompletionProposalPopup implements IContentAssistListener {
}
fFilterOffset= offset;
- if (proposals != null && proposals.size() > 0)
+ if (proposals != null && !proposals.isEmpty())
setProposals(proposals, fIsFilteredSubset);
else {
hide();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java
index 6f8b9e9f2ec..7b8de9855a1 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java
@@ -859,7 +859,7 @@ class ContextInformationPopup implements IContentAssistListener {
* @param e the verify event describing the key stroke
*/
private void contextInfoPopupProcessEvent(VerifyEvent e) {
- if (e.start != e.end && (e.text == null || e.text.length() == 0))
+ if (e.start != e.end && (e.text == null || e.text.isEmpty()))
validateContextInformation();
}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java
index 46f9e15c531..062d093494f 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java
@@ -677,7 +677,7 @@ public class LinkedModeUI {
Assert.isNotNull(model);
Assert.isNotNull(targets);
Assert.isTrue(targets.length > 0);
- Assert.isTrue(model.getTabStopSequence().size() > 0);
+ Assert.isTrue(!model.getTabStopSequence().isEmpty());
fModel= model;
fTargets= targets;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java
index c23974546dc..8b61857ba42 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java
@@ -502,7 +502,7 @@ abstract public class AbstractReconciler implements IReconciler {
// Insert
fDirtyRegionQueue.addDirtyRegion(new DirtyRegion(e.getOffset(), e.getText().length(), DirtyRegion.INSERT, e.getText()));
- } else if (e.getText() == null || e.getText().length() == 0) {
+ } else if (e.getText() == null || e.getText().isEmpty()) {
// Remove
fDirtyRegionQueue.addDirtyRegion(new DirtyRegion(e.getOffset(), e.getLength(), DirtyRegion.REMOVE, null));
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java
index 45f177595f0..3e2da3958c3 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java
@@ -95,7 +95,7 @@ public class PatternRule implements IPredicateRule {
* @param breaksOnEOL indicates whether the end of the line also terminates the pattern
*/
public PatternRule(String startSequence, String endSequence, IToken token, char escapeCharacter, boolean breaksOnEOL) {
- Assert.isTrue(startSequence != null && startSequence.length() > 0);
+ Assert.isTrue(startSequence != null && !startSequence.isEmpty());
Assert.isTrue(endSequence != null || breaksOnEOL);
Assert.isNotNull(token);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java
index 40b37db2c56..c3de3fae821 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java
@@ -69,7 +69,7 @@ public class DefaultAnnotationHover implements IAnnotationHover {
// optimization
Annotation annotation= javaAnnotations.get(0);
String message= annotation.getText();
- if (message != null && message.trim().length() > 0)
+ if (message != null && !message.trim().isEmpty())
return formatSingleMessage(message);
} else {
@@ -80,7 +80,7 @@ public class DefaultAnnotationHover implements IAnnotationHover {
while (e.hasNext()) {
Annotation annotation= e.next();
String message= annotation.getText();
- if (message != null && message.trim().length() > 0)
+ if (message != null && !message.trim().isEmpty())
messages.add(message.trim());
}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateStore.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateStore.java
index c02a6294191..c96ef35029b 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateStore.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateStore.java
@@ -211,7 +211,7 @@ public class TemplateStore extends TemplateStoreCore {
private void loadCustomTemplates() throws IOException {
String pref= fPreferenceStore.getString(getKey());
- if (pref != null && pref.trim().length() > 0) {
+ if (pref != null && !pref.trim().isEmpty()) {
Reader input= new StringReader(pref);
TemplateReaderWriter reader= new TemplateReaderWriter();
TemplatePersistenceData[] datas= reader.read(input);

Back to the top