Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link')
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java4
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java15
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java4
3 files changed, 11 insertions, 12 deletions
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java
index 34cb8769962..8e39c1391d9 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java
@@ -845,8 +845,8 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
if (characters == null)
return false;
- for (int i= 0; i < characters.length; i++) {
- if (c == characters[i])
+ for (char character : characters) {
+ if (c == character)
return true;
}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java
index 6549c11d5a4..6741ba96afa 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java
@@ -12,7 +12,6 @@ package org.eclipse.jface.internal.text.link.contentassist;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -263,9 +262,10 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
private boolean contains(char[] characters, char character) {
if (characters != null) {
- for (int i= 0; i < characters.length; i++) {
- if (character == characters[i])
+ for (char c : characters) {
+ if (character == c) {
return true;
+ }
}
}
return false;
@@ -634,9 +634,9 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
installKeyListener();
IContentAssistListener2[] listeners= fListeners.clone();
- for (int i= 0; i < listeners.length; i++) {
- if (listeners[i] != null) {
- listeners[i].processEvent(event);
+ for (IContentAssistListener2 listener : listeners) {
+ if (listener != null) {
+ listener.processEvent(event);
if (!event.doit)
return;
}
@@ -1523,8 +1523,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
*/
public void fireProposalChosen(ICompletionProposal proposal) {
List<IProposalListener> list= new ArrayList<>(fProposalListeners);
- for (Iterator<IProposalListener> it= list.iterator(); it.hasNext();) {
- IProposalListener listener= it.next();
+ for (IProposalListener listener : list) {
listener.proposalChosen(proposal);
}
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 ce022e648c0..0632c2d8ff3 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
@@ -395,8 +395,8 @@ class ContextInformationPopup2 implements IContentAssistListener2 {
TableItem item;
IContextInformation t;
- for (int i= 0; i < contexts.length; i++) {
- t= contexts[i];
+ for (IContextInformation context : contexts) {
+ t= context;
item= new TableItem(fContextSelectorTable, SWT.NULL);
if (t.getImage() != null)
item.setImage(t.getImage());

Back to the top