bug 520954 - Replace iterators with foreach in org.eclipse.ui.regex

* Replaces marker interface IListener with generics
* Replaces IListener iterators with forEach
* replaces iterators with loops where possible

Change-Id: I05c98fd04b768d7fd201a016e3c242de1eb44ec6
Signed-off-by: Fabian Pfaff <fabian.pfaff@vogella.com>

9 files changed, 42 insertions, 101 deletions

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/IRegExListener.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/IRegExListener.java
index 001f532c..2f352c88 100644
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/IRegExListener.java
+++ b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/IRegExListener.java
@@ -11,9 +11,7 @@
  ******************************************************************************/

 package org.eclipse.ui.regex;

 

-import org.eclipse.ui.regex.event.IListener;

-

-public interface IRegExListener extends IListener {

+public interface IRegExListener {

 

 	public void foundMatches(Matches matches);

 

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/RegExListenerManager.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/RegExListenerManager.java
index cdf20ced..9b07f774 100644
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/RegExListenerManager.java
+++ b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/RegExListenerManager.java
@@ -12,53 +12,32 @@
 

 package org.eclipse.ui.regex;

 

-import java.util.Iterator;

-

-import org.eclipse.ui.regex.event.IListener;

 import org.eclipse.ui.regex.event.ListenerManager;

 

-public class RegExListenerManager extends ListenerManager {

+public class RegExListenerManager extends ListenerManager<IRegExListener> {

 

 	public void publishExpressionError(String errMsg) {

-		for (Iterator<IListener> i = getListeners().iterator(); i.hasNext();) {

-			IRegExListener listener = (IRegExListener) i.next();

-			listener.expressionError(errMsg);

-		}

+		getListeners().forEach(listener -> listener.expressionError(errMsg));

 	}

 

 	public void publishFoundMatches(Matches foundMatches) {

-		for (Iterator<IListener> i = getListeners().iterator(); i.hasNext();) {

-			IRegExListener listener = (IRegExListener) i.next();

-			listener.foundMatches(foundMatches);

-		}

+		getListeners().forEach(listener -> listener.foundMatches(foundMatches));

 	}

 

 	public void publishFoundNoMatches() {

-		for (Iterator<IListener> i = getListeners().iterator(); i.hasNext();) {

-			IRegExListener listener = (IRegExListener) i.next();

-			listener.foundNoMatches();

-		}

+		getListeners().forEach(listener -> listener.foundNoMatches());

 	}

 

 	public void publishDoneWithReplace(ReplaceResult result) {

-		for (Iterator<IListener> i = getListeners().iterator(); i.hasNext();) {

-			IRegExListener listener = (IRegExListener) i.next();

-			listener.doneWithReplace(result);

-		}

+		getListeners().forEach(listener -> listener.doneWithReplace(result));

 	}

 

 	public void publishDoneWithSplit(String[] result) {

-		for (Iterator<IListener> i = getListeners().iterator(); i.hasNext();) {

-			IRegExListener listener = (IRegExListener) i.next();

-			listener.doneWithSplit(result);

-		}

+		getListeners().forEach(listener -> listener.doneWithSplit(result));

 	}

 

 	public void updateRequested() {

-		for (Iterator<IListener> i = getListeners().iterator(); i.hasNext();) {

-			IRegExListener listener = (IRegExListener) i.next();

-			listener.updateRequested();

-		}

+		getListeners().forEach(listener -> listener.updateRequested());

 	}

 

 }

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/event/IListener.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/event/IListener.java
deleted file mode 100644
index a777fb59..00000000
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/event/IListener.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2012 Stephan Brosinski

- *

- * All rights reserved.

- * This program and the accompanying materials are made available under the

- * terms of the Eclipse Public License v1.0 which accompanies this distribution,

- * and is available at http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   Stephan Brosinski - initial API and implementation

- ******************************************************************************/

-

-package org.eclipse.ui.regex.event;

-

-public interface IListener {

-

-}

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/event/ListenerManager.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/event/ListenerManager.java
index f89b52d2..596c0f12 100644
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/event/ListenerManager.java
+++ b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/event/ListenerManager.java
@@ -15,19 +15,19 @@ package org.eclipse.ui.regex.event;
 import java.util.ArrayList;

 import java.util.List;

 

-public abstract class ListenerManager {

+public abstract class ListenerManager<Listener> {

 

-	private List<IListener> listeners = new ArrayList<>();

+	private List<Listener> listeners = new ArrayList<>();

 

-	public void addListener(IListener listener) {

+	public void addListener(Listener listener) {

 		listeners.add(listener);

 	}

 

-	public void removeListener(IListener listener) {

+	public void removeListener(Listener listener) {

 		listeners.remove(listener);

 	}

 

-	protected List<IListener> getListeners() {

+	protected List<Listener> getListeners() {

 		return listeners;

 	}

 }

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/AssistPopup.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/AssistPopup.java
index 333a9a20..113cbe15 100644
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/AssistPopup.java
+++ b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/AssistPopup.java
@@ -15,7 +15,6 @@ import static org.eclipse.swt.events.KeyListener.keyPressedAdapter;
 import static org.eclipse.swt.events.MouseListener.mouseUpAdapter;

 

 import java.util.ArrayList;

-import java.util.Iterator;

 

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.ControlAdapter;

@@ -149,13 +148,11 @@ public class AssistPopup {
 

 	public void setProposals(ArrayList<Proposal> proposals) {

 		this.proposals = proposals;

-		int c = 0;

-		String[] items = new String[proposals.size()];

-		for (Iterator<Proposal> i = proposals.iterator(); i.hasNext();) {

-			Proposal proposal = i.next();

-			items[c++] = proposal.getDescription();

+		String[] proposalDescriptions = new String[proposals.size()];

+		for (int i = 0; i < proposals.size(); i++) {

+			proposalDescriptions[i] = proposals.get(i).getDescription();

 		}

-		list.setItems(items);

+		list.setItems(proposalDescriptions);

 	}

 

 }

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/ExpressionLoader.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/ExpressionLoader.java
index bf8bbfa1..482d348e 100644
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/ExpressionLoader.java
+++ b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/ExpressionLoader.java
@@ -12,7 +12,6 @@
 package org.eclipse.ui.regex.view;

 

 import java.util.ArrayList;

-import java.util.Iterator;

 import java.util.List;

 

 public class ExpressionLoader {

@@ -40,8 +39,7 @@ public class ExpressionLoader {
 	}

 

 	public void fireLoadExpression(Expression expression) {

-		for (Iterator<IExpressionLoaderListener> i = listener.iterator(); i.hasNext();) {

-			IExpressionLoaderListener l = i.next();

+		for (IExpressionLoaderListener l : listener) {

 			l.loadExpression(expression);

 		}

 	}

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/ILiveEvalListener.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/ILiveEvalListener.java
index de4080ad..a15fb468 100644
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/ILiveEvalListener.java
+++ b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/ILiveEvalListener.java
@@ -12,9 +12,7 @@
 

 package org.eclipse.ui.regex.view;

 

-import org.eclipse.ui.regex.event.IListener;

-

-public interface ILiveEvalListener extends IListener {

+public interface ILiveEvalListener {

 

 	public void evalActivated();

 

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/LiveEvalListenerManager.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/LiveEvalListenerManager.java
index 2fbc9101..c47507d6 100644
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/LiveEvalListenerManager.java
+++ b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/LiveEvalListenerManager.java
@@ -11,39 +11,24 @@
  ******************************************************************************/

 package org.eclipse.ui.regex.view;

 

-import java.util.Iterator;

-

-import org.eclipse.ui.regex.event.IListener;

 import org.eclipse.ui.regex.event.ListenerManager;

 

-public class LiveEvalListenerManager extends ListenerManager {

+public class LiveEvalListenerManager extends ListenerManager<ILiveEvalListener> {

 

 	public void publishEvalActivated() {

-		for (Iterator<IListener> i = getListeners().iterator(); i.hasNext();) {

-			ILiveEvalListener listener = (ILiveEvalListener) i.next();

-			listener.evalActivated();

-		}

+		getListeners().forEach(listener -> listener.evalActivated());

 	};

 

 	public void publishEvalDeactivated() {

-		for (Iterator<IListener> i = getListeners().iterator(); i.hasNext();) {

-			ILiveEvalListener listener = (ILiveEvalListener) i.next();

-			listener.evalDeactivated();

-		}

+		getListeners().forEach(listener -> listener.evalDeactivated());

 	};

 

 	public void publishEvalDone() {

-		for (Iterator<IListener> i = getListeners().iterator(); i.hasNext();) {

-			ILiveEvalListener listener = (ILiveEvalListener) i.next();

-			listener.evalDone();

-		}

+		getListeners().forEach(listener -> listener.evalDone());

 	};

 

 	public void publishDoEval() {

-		for (Iterator<IListener> i = getListeners().iterator(); i.hasNext();) {

-			ILiveEvalListener listener = (ILiveEvalListener) i.next();

-			listener.doEval();

-		}

+		getListeners().forEach(listener -> listener.doEval());

 	};

 

 }

diff --git a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/RegExView.java b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/RegExView.java
index 39156448..e6f258b6 100644
--- a/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/RegExView.java
+++ b/bundles/org.eclipse.ui.regex/src/org/eclipse/ui/regex/view/RegExView.java
@@ -697,27 +697,30 @@ public class RegExView extends ViewPart implements SelectionListener, IRegExList
 			styleRanges[c++] = new StyleRange(match.getStart(), match.getEnd() - match.getStart(), COLOR_RED,

 					COLOR_WHITE);

 

-			out.append("start=");

-			out.append(match.getStart());

-			out.append(", end=");

-			out.append(match.getEnd());

-			out.append("\n");

-			for (Iterator<Group> groups = match.getGroups().iterator(); groups.hasNext();) {

-				Group group = groups.next();

-				out.append("Group(");

-				out.append(group.getIndex());

-				out.append(") = ");

-				out.append(group.getText());

-				out.append("\n");

-			}

-

-			out.append("\n");

+			appendMatchInfoToOutput(out, match);

 

 		}

 		txt_SearchText.setStyleRanges(styleRanges);

 		txt_Result.setText(out.toString());

 	}

 

+	private void appendMatchInfoToOutput(StringBuffer out, Match match) {

+		out.append("start=");

+		out.append(match.getStart());

+		out.append(", end=");

+		out.append(match.getEnd());

+		out.append("\n");

+		for (Group group : match.getGroups()) {

+			out.append("Group(");

+			out.append(group.getIndex());

+			out.append(") = ");

+			out.append(group.getText());

+			out.append("\n");

+		}

+

+		out.append("\n");

+	}

+

 	@Override

 	public void foundMatches(Matches matches) {

 		displayMatches(matches);