You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/07/25 09:02:23 UTC
[groovy] 02/02: Trival refactoring: replace 'for' loop with
enhanced 'for' loop
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit a7d258cd6938cbd3d690d79267b6ae33abc45198
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Jul 25 16:49:52 2020 +0800
Trival refactoring: replace 'for' loop with enhanced 'for' loop
(cherry picked from commit f89d10aa025ae111fc4d77f2d4d6e39e87825993)
---
.../groovy/console/ui/text/FindReplaceUtility.java | 28 ++++++++++++++++------
.../ui/text/StructuredSyntaxDocumentFilter.java | 4 ++--
.../java/groovy/sql/GroovyResultSetExtension.java | 5 ++--
.../groovy/groovy/swing/impl/TableLayoutRow.java | 9 +++----
4 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/FindReplaceUtility.java b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/FindReplaceUtility.java
index b1485de..05af7f2 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/FindReplaceUtility.java
+++ b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/FindReplaceUtility.java
@@ -18,14 +18,28 @@
*/
package groovy.console.ui.text;
-import javax.swing.*;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRootPane;
+import javax.swing.KeyStroke;
import javax.swing.event.EventListenerList;
import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
import javax.swing.text.Segment;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
@@ -193,8 +207,8 @@ public final class FindReplaceUtility {
if (lstrs != null && lstrs.length > 0) {
TextEvent te =
new TextEvent(FIND_REPLACE_DIALOG, TextEvent.TEXT_VALUE_CHANGED);
- for (int i = 0; i < lstrs.length; i++) {
- ((TextListener) lstrs[i]).textValueChanged(te);
+ for (EventListener lstr : lstrs) {
+ ((TextListener) lstr).textValueChanged(te);
}
}
}
@@ -377,9 +391,9 @@ public final class FindReplaceUtility {
FIND_REPLACE_DIALOG.pack();
java.awt.Frame[] frames = java.awt.Frame.getFrames();
- for (int i = 0; i < frames.length; i++) {
- if (frames[i].isFocused()) {
- FIND_REPLACE_DIALOG.setLocationRelativeTo(frames[i]);
+ for (Frame frame : frames) {
+ if (frame.isFocused()) {
+ FIND_REPLACE_DIALOG.setLocationRelativeTo(frame);
}
}
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java
index b73f24c..0d30e70 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java
+++ b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java
@@ -312,8 +312,8 @@ public class StructuredSyntaxDocumentFilter extends DocumentFilter {
private String buildRegexp(String[] regexps) {
StringBuilder regexp = new StringBuilder();
- for (int i = 0; i < regexps.length; i++) {
- regexp.append("|").append(regexps[i]);
+ for (String s : regexps) {
+ regexp.append("|").append(s);
}
// ensure leading '|' is removed
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java
index 759d13c..bda9232 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java
@@ -27,7 +27,6 @@ import org.codehaus.groovy.runtime.InvokerInvocationException;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
-import java.util.Iterator;
import java.util.Map;
/**
@@ -179,8 +178,8 @@ public class GroovyResultSetExtension extends GroovyObjectSupport {
*/
public void add(Map values) throws SQLException {
getResultSet().moveToInsertRow();
- for (Iterator iter = values.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
+ for (Object o : values.entrySet()) {
+ Map.Entry entry = (Map.Entry) o;
getResultSet().updateObject(entry.getKey().toString(), entry.getValue());
}
getResultSet().insertRow();
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutRow.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutRow.java
index a4eaed1..cd7d158 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutRow.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutRow.java
@@ -18,9 +18,8 @@
*/
package groovy.swing.impl;
-import java.awt.*;
+import java.awt.GridBagConstraints;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -42,8 +41,7 @@ public class TableLayoutRow {
*/
public void addCell(groovy.swing.impl.TableLayoutCell tag) {
int gridx = 0;
- for (Iterator iter = cells.iterator(); iter.hasNext(); ) {
- groovy.swing.impl.TableLayoutCell cell = (groovy.swing.impl.TableLayoutCell) iter.next();
+ for (TableLayoutCell cell : cells) {
gridx += cell.getColspan();
}
tag.getConstraints().gridx = gridx;
@@ -54,8 +52,7 @@ public class TableLayoutRow {
rowIndex = parent.nextRowIndex();
// iterate through the rows and add each one to the layout...
- for (Iterator iter = cells.iterator(); iter.hasNext(); ) {
- groovy.swing.impl.TableLayoutCell cell = (groovy.swing.impl.TableLayoutCell) iter.next();
+ for (TableLayoutCell cell : cells) {
GridBagConstraints c = cell.getConstraints();
c.gridy = rowIndex;
// add the cell to the table