Bug 548309 - Use jdk 5 for-each loop
org.eclipse.jdt.ui
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.
Change-Id: Ia26dc4f31f204dd4d38a4fb12a3ab0559e62c05b
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/IndentAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/IndentAction.java
index b369e83..aa6947e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/IndentAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/IndentAction.java
@@ -15,7 +15,6 @@
package org.eclipse.jdt.internal.ui.actions;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.ResourceBundle;
import org.eclipse.swt.custom.BusyIndicator;
@@ -299,9 +298,8 @@
return edits.get(0);
MultiTextEdit result= new MultiTextEdit();
- for (Iterator<ReplaceEdit> iterator= edits.iterator(); iterator.hasNext();) {
- TextEdit edit= iterator.next();
- result.addChild(edit);
+ for (ReplaceEdit replaceEdit : edits) {
+ result.addChild(replaceEdit);
}
return result;
@@ -605,11 +603,11 @@
return 0;
else {
int size= 0;
- int l= indent.length();
int tabSize= getTabSize(project);
- for (int i= 0; i < l; i++)
- size += indent.charAt(i) == '\t' ? tabSize : 1;
+ for (char c : indent.toCharArray()) {
+ size += c == '\t' ? tabSize : 1;
+ }
return size;
}
}
@@ -625,10 +623,12 @@
String tab;
if (JavaCore.SPACE.equals(getCoreFormatterOption(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, project))) {
int size= getTabSize(project);
- StringBuilder buf= new StringBuilder();
- for (int i= 0; i< size; i++)
- buf.append(' ');
- tab= buf.toString();
+
+ if (size < 1) {
+ tab= ""; //$NON-NLS-1$
+ } else {
+ tab= String.format("%" + size + "s", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
} else
tab= "\t"; //$NON-NLS-1$
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/NewWizardsActionGroup.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/NewWizardsActionGroup.java
index f3b02ee..8f15747 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/NewWizardsActionGroup.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/NewWizardsActionGroup.java
@@ -14,7 +14,6 @@
*******************************************************************************/
package org.eclipse.jdt.internal.ui.actions;
-import java.util.Iterator;
import java.util.List;
import org.eclipse.core.resources.IResource;
@@ -88,8 +87,8 @@
return true;
List<?> list= sel.toList();
- for (Iterator<?> iterator= list.iterator(); iterator.hasNext();) {
- if (!isNewTarget(iterator.next()))
+ for (Object name : list) {
+ if (!isNewTarget(name))
return false;
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/OccurrencesSearchMenuAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/OccurrencesSearchMenuAction.java
index 4b54299..0c831f9 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/OccurrencesSearchMenuAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/OccurrencesSearchMenuAction.java
@@ -231,8 +231,8 @@
if (activeActions.isEmpty()) {
manager.add(NO_ACTION_AVAILABLE);
} else {
- for (int i= 0; i < activeActions.size(); i++) {
- manager.add(activeActions.get(i));
+ for (IAction activeAction : activeActions) {
+ manager.add(activeAction);
}
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/LogicalPackage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/LogicalPackage.java
index 596c8ff..de8c3e3 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/LogicalPackage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/LogicalPackage.java
@@ -14,7 +14,6 @@
package org.eclipse.jdt.internal.ui.browsing;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.eclipse.core.runtime.Assert;
@@ -93,8 +92,7 @@
}
public boolean hasSubpackages() throws JavaModelException {
- for (Iterator<IPackageFragment> iter= fPackages.iterator(); iter.hasNext();) {
- IPackageFragment pack= iter.next();
+ for (IPackageFragment pack : fPackages) {
if (pack.hasSubpackages()) {
return true;
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewHierarchicalContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewHierarchicalContentProvider.java
index 8fb7d71..88070e0 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewHierarchicalContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/browsing/PackagesViewHierarchicalContentProvider.java
@@ -186,8 +186,8 @@
private void addFragmentsToMap(List<IAdaptable> elements) {
List<IPackageFragment> packageFragments= new ArrayList<>();
- for (Iterator<IAdaptable> iter= elements.iterator(); iter.hasNext();) {
- Object elem= iter.next();
+ for (IAdaptable iAdaptable : elements) {
+ Object elem= iAdaptable;
if (elem instanceof IPackageFragment)
packageFragments.add((IPackageFragment) elem);
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyViewPart.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyViewPart.java
index a48e29b..eb47216 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyViewPart.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/CallHierarchyViewPart.java
@@ -177,8 +177,8 @@
@Override
protected void open(ISelection selection, boolean activate) {
if (selection instanceof IStructuredSelection) {
- for (Iterator<?> iter= ((IStructuredSelection)selection).iterator(); iter.hasNext();) {
- boolean noError= CallHierarchyUI.openInEditor(iter.next(), getSite().getShell(), OpenStrategy.activateOnOpen());
+ for (Object object : ((IStructuredSelection)selection)) {
+ boolean noError= CallHierarchyUI.openInEditor(object, getSite().getShell(), OpenStrategy.activateOnOpen());
if (!noError)
return;
}
@@ -750,8 +750,8 @@
* @param entry the history entry
*/
public void gotoHistoryEntry(IMember[] entry) {
- for (Iterator<IMember[]> iter= getMethodHistory().iterator(); iter.hasNext(); ) {
- if (Arrays.equals(entry, iter.next())) {
+ for (IMember[] name : getMethodHistory()) {
+ if (Arrays.equals(entry, name)) {
setInputElements(entry);
return;
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsConfigurationBlock.java
index 98b5756..aa8c2b3 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsConfigurationBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/ExpandWithConstructorsConfigurationBlock.java
@@ -49,6 +49,8 @@
import org.eclipse.jdt.core.search.IJavaSearchScope;
import org.eclipse.jdt.core.search.SearchEngine;
+import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
+
import org.eclipse.jdt.ui.IJavaElementSearchConstants;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jdt.ui.PreferenceConstants;
@@ -60,7 +62,6 @@
import org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock;
import org.eclipse.jdt.internal.ui.util.BusyIndicatorRunnableContext;
import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
-import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
import org.eclipse.jdt.internal.ui.viewsupport.JavaElementImageProvider;
import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
@@ -269,13 +270,7 @@
* <code>false</code> otherwise
*/
private boolean doesExist(String name) {
- for (int i= 0; i < fExistingEntries.size(); i++) {
- String entry= fExistingEntries.get(i);
- if (name.equals(entry)) {
- return true;
- }
- }
- return false;
+ return fExistingEntries.contains(name);
}
@@ -634,14 +629,7 @@
* @return the single output string from the list of strings using a delimiter
*/
public static String serializeMembers(List<String> list) {
- int size= list.size();
- StringBuilder buf= new StringBuilder();
- for (int i= 0; i < size; i++) {
- buf.append(list.get(i));
- if (i < size - 1)
- buf.append(';');
- }
- return buf.toString();
+ return String.join(";", list.toArray(new String[list.size()])); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/RefreshElementAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/RefreshElementAction.java
index c2c3ca2..198710c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/RefreshElementAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/RefreshElementAction.java
@@ -11,7 +11,6 @@
package org.eclipse.jdt.internal.ui.callhierarchy;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.eclipse.jface.action.Action;
@@ -65,8 +64,8 @@
return;
}
List<MethodWrapper> toExpand= new ArrayList<>();
- for (Iterator<?> iter= selection.iterator(); iter.hasNext();) {
- MethodWrapper element= (MethodWrapper)iter.next();
+ for (Object object : selection) {
+ MethodWrapper element= (MethodWrapper) object;
boolean isExpanded= fViewer.getExpandedState(element);
element.removeFromCache();
if (isExpanded) {
@@ -75,8 +74,7 @@
}
fViewer.refresh(element);
}
- for (Iterator<MethodWrapper> iter= toExpand.iterator(); iter.hasNext();) {
- MethodWrapper elem= iter.next();
+ for (MethodWrapper elem : toExpand) {
fViewer.setExpandedState(elem, true);
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/FilteredTypesSelectionDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/FilteredTypesSelectionDialog.java
index 075f2ea..20af32b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/FilteredTypesSelectionDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/FilteredTypesSelectionDialog.java
@@ -392,16 +392,16 @@
List<IType> resultToReturn= new ArrayList<>();
- for (int i= 0; i < newResult.size(); i++) {
- if (newResult.get(i) instanceof TypeNameMatch) {
- IType type= ((TypeNameMatch) newResult.get(i)).getType();
+ for (Object element : newResult) {
+ if (element instanceof TypeNameMatch) {
+ IType type= ((TypeNameMatch) element).getType();
if (type.exists()) {
// items are added to history in the
// org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#computeResult()
// method
resultToReturn.add(type);
} else {
- TypeNameMatch typeInfo= (TypeNameMatch) newResult.get(i);
+ TypeNameMatch typeInfo= (TypeNameMatch) element;
IPackageFragmentRoot root= typeInfo.getPackageFragmentRoot();
String containerName= JavaElementLabels.getElementLabel(root, JavaElementLabels.ROOT_QUALIFIED);
String message= Messages.format(JavaUIMessages.FilteredTypesSelectionDialog_dialogMessage, new String[] { TypeNameMatchLabelProvider.getText(typeInfo, TypeNameMatchLabelProvider.SHOW_FULLYQUALIFIED), containerName });
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/PackageSelectionDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/PackageSelectionDialog.java
index 60cb76e..167a7cb 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/PackageSelectionDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/PackageSelectionDialog.java
@@ -173,8 +173,8 @@
monitor.beginTask(JavaUIMessages.PackageSelectionDialog_progress_findEmpty, packageList.size());
try {
ArrayList<IPackageFragment> res= new ArrayList<>(packageList.size());
- for (int i= 0; i < packageList.size(); i++) {
- IPackageFragment pkg= (IPackageFragment) packageList.get(i);
+ for (IJavaElement element : packageList) {
+ IPackageFragment pkg= (IPackageFragment) element;
if (pkg.hasChildren() || !pkg.hasSubpackages()) {
res.add(pkg);
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/SourceActionDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/SourceActionDialog.java
index 32443b8..3cca930 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/SourceActionDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/SourceActionDialog.java
@@ -509,8 +509,8 @@
private List<Integer> convertToIntegerList(int[] array) {
List<Integer> result= new ArrayList<>(array.length);
- for (int i= 0; i < array.length; i++) {
- result.add(Integer.valueOf(array[i]));
+ for (int element : array) {
+ result.add(Integer.valueOf(element));
}
return result;
}
