Bug 548923 - Use jdk 5 for-each loop
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.
Change-Id: I17b9448072aaae582549f6b34800afa18b0b75d0
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AbstractVMInstallPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AbstractVMInstallPage.java
index 0ef2b92..e1196e3 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AbstractVMInstallPage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AbstractVMInstallPage.java
@@ -173,8 +173,8 @@
*/
private boolean isDuplicateName(String name) {
if (fExistingNames != null) {
- for (int i = 0; i < fExistingNames.length; i++) {
- if (name.equals(fExistingNames[i])) {
+ for (String n : fExistingNames) {
+ if (name.equals(n)) {
return true;
}
}
@@ -240,9 +240,7 @@
*/
protected void updatePageStatus() {
IStatus max = Status.OK_STATUS;
- IStatus[] vmStatus = getVMStatus();
- for (int i = 0; i < vmStatus.length; i++) {
- IStatus status = vmStatus[i];
+ for (IStatus status : getVMStatus()) {
if (status.getSeverity() > max.getSeverity()) {
max = status;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletParametersTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletParametersTab.java
index 61f09ae..93c83ca 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletParametersTab.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/AppletParametersTab.java
@@ -296,9 +296,8 @@
private void handleParametersRemoveButtonSelected() {
IStructuredSelection selection = (IStructuredSelection) fViewer.getSelection();
- Object[] keys = selection.toArray();
- for (int i = 0; i < keys.length; i++) {
- String key = (String) keys[i];
+ for (Object k : selection.toArray()) {
+ String key = (String) k;
Map<String, String> params = getViewerInput();
params.remove(key);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointChange.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointChange.java
index f6c042b..134c358 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointChange.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointChange.java
@@ -86,12 +86,12 @@
*/
protected void apply(IJavaBreakpoint breakpoint) throws CoreException {
breakpoint.setHitCount(fHitCount);
- for (int i = 0; i < fInstanceFilters.length; i++) {
- breakpoint.addInstanceFilter(fInstanceFilters[i]);
+ for (IJavaObject filter : fInstanceFilters) {
+ breakpoint.addInstanceFilter(filter);
}
breakpoint.setSuspendPolicy(fSuspendPolicy);
- for (int i = 0; i < fThreadFilters.length; i++) {
- breakpoint.setThreadFilter(fThreadFilters[i]);
+ for (IJavaThread filter : fThreadFilters) {
+ breakpoint.setThreadFilter(filter);
}
breakpoint.setEnabled(fEnabled);
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointMovePackageParticipant.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointMovePackageParticipant.java
index 7faf607..a550d52 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointMovePackageParticipant.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointMovePackageParticipant.java
@@ -49,8 +49,7 @@
@Override
protected void gatherChanges(IMarker[] markers, List<Change> changes) throws CoreException, OperationCanceledException {
IPackageFragmentRoot destRoot = (IPackageFragmentRoot)getDestination();
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
+ for (IMarker marker : markers) {
IBreakpoint breakpoint = getBreakpoint(marker);
if (breakpoint instanceof IJavaBreakpoint) {
IJavaBreakpoint javaBreakpoint = (IJavaBreakpoint) breakpoint;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointMoveTypeParticipant.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointMoveTypeParticipant.java
index 5ec6e5c..5d2159e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointMoveTypeParticipant.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointMoveTypeParticipant.java
@@ -49,8 +49,7 @@
protected void gatherChanges(IMarker[] markers, List<Change> changes) throws CoreException, OperationCanceledException {
IType originalType = (IType) getOriginalElement();
IPackageFragment destPackage = (IPackageFragment) getDestination();
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
+ for (IMarker marker : markers) {
IBreakpoint breakpoint = getBreakpoint(marker);
if (breakpoint instanceof IJavaBreakpoint) {
IJavaBreakpoint javaBreakpoint = (IJavaBreakpoint) breakpoint;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameFieldParticipant.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameFieldParticipant.java
index edb2a46..ce7835e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameFieldParticipant.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameFieldParticipant.java
@@ -69,8 +69,7 @@
@Override
protected void gatherChanges(IMarker[] markers, List<Change> changes, String destFieldName) throws CoreException, OperationCanceledException {
IField originalField = (IField) getOriginalElement();
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
+ for (IMarker marker : markers) {
IBreakpoint breakpoint = getBreakpoint(marker);
if (breakpoint instanceof IJavaWatchpoint) {
IJavaWatchpoint watchpoint = (IJavaWatchpoint) breakpoint;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameMethodParticipant.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameMethodParticipant.java
index 2f2b03e..d192589 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameMethodParticipant.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameMethodParticipant.java
@@ -48,15 +48,14 @@
@Override
protected void gatherChanges(IMarker[] markers, List<Change> changes, String destMethodName) throws CoreException, OperationCanceledException {
IMethod originalMethod = (IMethod) getOriginalElement();
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
+ for (IMarker marker : markers) {
IBreakpoint breakpoint = getBreakpoint(marker);
if (breakpoint instanceof IJavaMethodBreakpoint) {
IJavaMethodBreakpoint methodBreakpoint = (IJavaMethodBreakpoint) breakpoint;
//ensure we only update the marker that corresponds to the method being renamed
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=280518
if(methodBreakpoint.getMethodName().equals(originalMethod.getElementName()) &&
- methodBreakpoint.getMethodSignature().equals(originalMethod.getSignature())) {
+ methodBreakpoint.getMethodSignature().equals(originalMethod.getSignature())) {
IType breakpointType = BreakpointUtils.getType(methodBreakpoint);
if (breakpointType != null && originalMethod.getDeclaringType().equals(breakpointType)) {
IMethod destMethod = originalMethod.getDeclaringType().getMethod(destMethodName, originalMethod.getParameterTypes());
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenamePackageParticipant.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenamePackageParticipant.java
index 847729a..41c6d0e 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenamePackageParticipant.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenamePackageParticipant.java
@@ -51,8 +51,7 @@
IPackageFragment originalPackage = (IPackageFragment) getOriginalElement();
String originalPackageName = originalPackage.getElementName();
IPackageFragmentRoot root = (IPackageFragmentRoot)originalPackage.getParent();
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
+ for (IMarker marker : markers) {
IBreakpoint breakpoint = getBreakpoint(marker);
if (breakpoint instanceof IJavaBreakpoint) {
IJavaBreakpoint javaBreakpoint = (IJavaBreakpoint) breakpoint;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameProjectParticipant.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameProjectParticipant.java
index c3f6a13..4e0e575 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameProjectParticipant.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameProjectParticipant.java
@@ -56,8 +56,7 @@
protected void gatherChanges(IMarker[] markers, List<Change> changes, String destProjectName) throws CoreException, OperationCanceledException {
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(destProjectName);
IJavaProject destProject = JavaCore.create(project);
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
+ for (IMarker marker : markers) {
IBreakpoint breakpoint = getBreakpoint(marker);
if (breakpoint instanceof IJavaBreakpoint) {
IJavaBreakpoint javaBreakpoint = (IJavaBreakpoint) breakpoint;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameTypeParticipant.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameTypeParticipant.java
index e701b72..0848ca7 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameTypeParticipant.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/core/refactoring/BreakpointRenameTypeParticipant.java
@@ -84,29 +84,28 @@
newType = (IType) BreakpointChange.findElement(destCU, newType);
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- IBreakpoint breakpoint = getBreakpoint(marker);
- if (breakpoint instanceof IJavaBreakpoint) {
- IJavaBreakpoint javaBreakpoint = (IJavaBreakpoint) breakpoint;
- IType breakpointType = BreakpointUtils.getType(javaBreakpoint);
- IType destType = null;
- if (breakpointType != null) {
- IJavaElement element = null;
- if (isContained(originalType, breakpointType)) {
- element = BreakpointChange.findElement(newType, breakpointType);
- } else if (isContained(originalCU, breakpointType)) {
- // non public, or other type in the CU
- element = BreakpointChange.findElement(destCU, breakpointType);
- }
- if (element instanceof IType) {
- destType = (IType) element;
- changes.add(createTypeChange(javaBreakpoint, destType, breakpointType));
- }
- }
-
- }
- }
+ for (IMarker marker : markers) {
+ IBreakpoint breakpoint = getBreakpoint(marker);
+ if (breakpoint instanceof IJavaBreakpoint) {
+ IJavaBreakpoint javaBreakpoint = (IJavaBreakpoint) breakpoint;
+ IType breakpointType = BreakpointUtils.getType(javaBreakpoint);
+ IType destType = null;
+ if (breakpointType != null) {
+ IJavaElement element = null;
+ if (isContained(originalType, breakpointType)) {
+ element = BreakpointChange.findElement(newType, breakpointType);
+ } else if (isContained(originalCU, breakpointType)) {
+ // non public, or other type in the CU
+ element = BreakpointChange.findElement(destCU, breakpointType);
+ }
+ if (element instanceof IType) {
+ destType = (IType) element;
+ changes.add(createTypeChange(javaBreakpoint, destType, breakpointType));
+ }
+ }
+
+ }
+ }
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointMarkerUpdater.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointMarkerUpdater.java
index fface6e..afb621c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointMarkerUpdater.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointMarkerUpdater.java
@@ -193,18 +193,17 @@
String modelId = JDIDebugPlugin.getUniqueIdentifier();
String markerType= JavaLineBreakpoint.getMarkerType();
IBreakpointManager manager= DebugPlugin.getDefault().getBreakpointManager();
- IBreakpoint[] breakpoints= manager.getBreakpoints(modelId);
- for (int i = 0; i < breakpoints.length; i++) {
- if (!(breakpoints[i] instanceof IJavaLineBreakpoint)) {
+ for (IBreakpoint b : manager.getBreakpoints(modelId)) {
+ if (!(b instanceof IJavaLineBreakpoint)) {
continue;
}
- IJavaLineBreakpoint breakpoint = (IJavaLineBreakpoint) breakpoints[i];
+ IJavaLineBreakpoint breakpoint = (IJavaLineBreakpoint) b;
IMarker marker = breakpoint.getMarker();
if (marker != null && marker.exists() && marker.getType().equals(markerType) && currentmarker.getId() != marker.getId()) {
String breakpointTypeName = breakpoint.getTypeName();
if ((JavaDebugUtils.typeNamesEqual(breakpointTypeName, typeName) || (breakpointTypeName != null && breakpointTypeName.startsWith(typeName + '$')))
- && breakpoint.getLineNumber() == lineNumber && resource.equals(marker.getResource())) {
- return breakpoint;
+ && breakpoint.getLineNumber() == lineNumber && resource.equals(marker.getResource())) {
+ return breakpoint;
}
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/CreateStepFilterDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/CreateStepFilterDialog.java
index 50cd85e..03e069c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/CreateStepFilterDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/CreateStepFilterDialog.java
@@ -134,8 +134,8 @@
}
private boolean isDuplicateFilter(String trimmedValue) {
- for (int i=0; i<existingFilters.length; i++) {
- if(existingFilters[i].getName().equals(trimmedValue)) {
+ for (Filter existingFilter : existingFilters) {
+ if (existingFilter.getName().equals(trimmedValue)) {
return true;
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EditLogicalStructureDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EditLogicalStructureDialog.java
index ac3aed6..abbb0fa 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EditLogicalStructureDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EditLogicalStructureDialog.java
@@ -14,7 +14,6 @@
package org.eclipse.jdt.internal.debug.ui;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.eclipse.core.commands.AbstractHandler;
@@ -95,10 +94,10 @@
public AttributesContentProvider(String[][] variables) {
fVariables= new ArrayList<>();
- for (int i= 0; i < variables.length; i++) {
+ for (String[] v : variables) {
String[] variable= new String[2];
- variable[0]= variables[i][0];
- variable[1]= variables[i][1];
+ variable[0] = v[0];
+ variable[1] = v[1];
fVariables.add(variable);
}
}
@@ -154,8 +153,7 @@
* @param list the list
*/
public void up(List<String[]> list) {
- for (Iterator<String[]> iter= list.iterator(); iter.hasNext();) {
- String[] variable= iter.next();
+ for (String[] variable : list) {
int index= fVariables.indexOf(variable);
fVariables.remove(variable);
fVariables.add(index - 1, variable);
@@ -167,8 +165,7 @@
* @param list the list
*/
public void down(List<String[]> list) {
- for (Iterator<String[]> iter= list.iterator(); iter.hasNext();) {
- String[] variable= iter.next();
+ for (String[] variable : list) {
int index= fVariables.indexOf(variable);
fVariables.remove(variable);
fVariables.add(index + 1, variable);
@@ -442,11 +439,10 @@
IStructuredSelection selection= (IStructuredSelection)fAttributeListViewer.getSelection();
if (selection.size() > 0) {
List<String[]> selectedElements= selection.toList();
- Object[] elements= fAttributesContentProvider.getElements();
Object newSelectedElement= null;
- for (int i= 0; i < elements.length; i++) {
- if (!selectedElements.contains(elements[i])) {
- newSelectedElement= elements[i];
+ for (Object element : fAttributesContentProvider.getElements()) {
+ if (!selectedElements.contains(element)) {
+ newSelectedElement = element;
} else {
break;
}
@@ -505,16 +501,14 @@
} else if (isValue) {
// dispose the attribute list
saveAttributeValue();
- Control[] children= fAttributesContainer.getChildren();
- for (int i= 0; i < children.length; i++) {
- children[i].dispose();
+ for (Control child : fAttributesContainer.getChildren()) {
+ child.dispose();
}
}
// dispose and recreate the code snippet editor group
- Control[] children= fCodeGroup.getChildren();
- for (int i = 0; i < children.length; i++) {
- children[i].dispose();
+ for (Control child : fCodeGroup.getChildren()) {
+ child.dispose();
}
fSnippetViewer.dispose();
createCodeGroupWidgets(isValue);
@@ -598,8 +592,8 @@
} else if (oneElementSelected && fSnippetDocument.get().trim().length() == 0) {
status.setError(DebugUIMessages.EditLogicalStructureDialog_21);
} else {
- for (int i= 0; i < elements.length; i++) {
- String[] variable= (String[]) elements[i];
+ for (Object element : elements) {
+ String[] variable = (String[]) element;
if (variable[0].trim().length() == 0) {
status.setError(DebugUIMessages.EditLogicalStructureDialog_22);
break;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextManager.java
index c09f994..9868c61 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextManager.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/EvaluationContextManager.java
@@ -79,9 +79,8 @@
if (fgManager == null) {
fgManager = new EvaluationContextManager();
IWorkbench workbench = PlatformUI.getWorkbench();
- IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
- for (int i = 0; i < windows.length; i++) {
- fgManager.windowOpened(windows[i]);
+ for (IWorkbenchWindow window : workbench.getWorkbenchWindows()) {
+ fgManager.windowOpened(window);
}
workbench.addWindowListener(fgManager);
fgManager.fActiveWindow = workbench.getActiveWorkbenchWindow();
@@ -231,10 +230,9 @@
frame = getContext(activePage);
}
if (frame == null) {
- IWorkbenchPage[] pages = window.getPages();
- for (int i = 0; i < pages.length; i++) {
- if (activePage != pages[i]) {
- frame = getContext(pages[i]);
+ for (IWorkbenchPage page : window.getPages()) {
+ if (activePage != page) {
+ frame = getContext(page);
if (frame != null) {
return frame;
}
@@ -243,10 +241,9 @@
alreadyVisited.add(window);
- IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
- for (int i = 0; i < windows.length; i++) {
- if (!alreadyVisited.contains(windows[i])) {
- frame = getEvaluationContext(windows[i], alreadyVisited);
+ for (IWorkbenchWindow w : PlatformUI.getWorkbench().getWorkbenchWindows()) {
+ if (!alreadyVisited.contains(w)) {
+ frame = getEvaluationContext(w, alreadyVisited);
if (frame != null) {
return frame;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractThreadsViewFilterAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractThreadsViewFilterAction.java
index d511cbf..8bbd01c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractThreadsViewFilterAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractThreadsViewFilterAction.java
@@ -103,8 +103,7 @@
// if showing all threads, no need to worry about displaying/hiding
return;
}
- for (int i = 0; i < events.length; i++) {
- DebugEvent event = events[i];
+ for (DebugEvent event : events) {
switch (event.getKind()) {
case DebugEvent.RESUME:
if (event.getDetail() == DebugEvent.CLIENT_REQUEST) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddAdvancedAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddAdvancedAction.java
index 42e6984..1e98d6c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddAdvancedAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddAdvancedAction.java
@@ -50,9 +50,9 @@
public void setViewer(IClasspathViewer viewer) {
super.setViewer(viewer);
if (fActions != null) {
- for (int i = 0; i < fActions.length; i++) {
- if (fActions[i] instanceof RuntimeClasspathAction) {
- ((RuntimeClasspathAction)fActions[i]).setViewer(viewer);
+ for (IAction action : fActions) {
+ if (action instanceof RuntimeClasspathAction) {
+ ((RuntimeClasspathAction) action).setViewer(viewer);
}
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddFolderAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddFolderAction.java
index ee59566..c45a163 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddFolderAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddFolderAction.java
@@ -83,10 +83,10 @@
List<IResource> fAlreadySelected = getSelectedFolders();
@Override
public IStatus validate(Object[] selection) {
- for (int i= 0; i < selection.length; i++) {
- if (!(selection[i] instanceof IContainer)) {
+ for (Object s : selection) {
+ if (!(s instanceof IContainer)) {
return new Status(IStatus.ERROR, JDIDebugPlugin.getUniqueIdentifier(), IJavaDebugUIConstants.INTERNAL_ERROR, "Selection must be a folder", null); //$NON-NLS-1$
- } else if (fAlreadySelected.contains(selection[i])) {
+ } else if (fAlreadySelected.contains(s)) {
return new Status(IStatus.ERROR, JDIDebugPlugin.getUniqueIdentifier(), IJavaDebugUIConstants.INTERNAL_ERROR, "Classpath already includes selected folder(s).", null); //$NON-NLS-1$
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddProjectAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddProjectAction.java
index 042fee0..b6118fc 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddProjectAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddProjectAction.java
@@ -68,8 +68,8 @@
List<IJavaProject> additions = new ArrayList<>(selections.length);
try {
- for (int i = 0; i < selections.length; i++) {
- IJavaProject jp = (IJavaProject)selections[i];
+ for (Object selection : selections) {
+ IJavaProject jp = (IJavaProject) selection;
if (dialog.isAddRequiredProjects()) {
collectRequiredProjects(jp, additions);
} else {
@@ -129,14 +129,13 @@
projects= new IJavaProject[0];
}
List<IJavaProject> remaining = new ArrayList<>();
- for (int i = 0; i < projects.length; i++) {
- remaining.add(projects[i]);
+ for (IJavaProject project : projects) {
+ remaining.add(project);
}
List<IJavaProject> alreadySelected = new ArrayList<>();
- IRuntimeClasspathEntry[] entries = getViewer().getEntries();
- for (int i = 0; i < entries.length; i++) {
- if (entries[i].getType() == IRuntimeClasspathEntry.PROJECT) {
- IResource res = root.findMember(entries[i].getPath());
+ for (IRuntimeClasspathEntry entry : getViewer().getEntries()) {
+ if (entry.getType() == IRuntimeClasspathEntry.PROJECT) {
+ IResource res = root.findMember(entry.getPath());
IJavaProject jp = (IJavaProject)JavaCore.create(res);
alreadySelected.add(jp);
}
@@ -160,9 +159,7 @@
IJavaModel model= proj.getJavaModel();
- IClasspathEntry[] entries= proj.getRawClasspath();
- for (int i= 0; i < entries.length; i++) {
- IClasspathEntry curr= entries[i];
+ for (IClasspathEntry curr : proj.getRawClasspath()) {
if (curr.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
IJavaProject ref= model.getJavaProject(curr.getPath().segment(0));
if (ref.exists()) {
@@ -182,48 +179,46 @@
* @throws CoreException if an exception occurs
*/
protected void collectExportedEntries(IJavaProject proj, List<IRuntimeClasspathEntry> runtimeEntries) throws CoreException {
- IClasspathEntry[] entries = proj.getRawClasspath();
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry entry = entries[i];
+ for (IClasspathEntry entry : proj.getRawClasspath()) {
if (entry.isExported()) {
IRuntimeClasspathEntry rte = null;
switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_CONTAINER:
- IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), proj);
- int kind = 0;
- switch (container.getKind()) {
- case IClasspathContainer.K_APPLICATION:
- kind = IRuntimeClasspathEntry.USER_CLASSES;
- break;
- case IClasspathContainer.K_SYSTEM:
- kind = IRuntimeClasspathEntry.BOOTSTRAP_CLASSES;
- break;
- case IClasspathContainer.K_DEFAULT_SYSTEM:
- kind = IRuntimeClasspathEntry.STANDARD_CLASSES;
- break;
+ case IClasspathEntry.CPE_CONTAINER:
+ IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), proj);
+ int kind = 0;
+ switch (container.getKind()) {
+ case IClasspathContainer.K_APPLICATION:
+ kind = IRuntimeClasspathEntry.USER_CLASSES;
+ break;
+ case IClasspathContainer.K_SYSTEM:
+ kind = IRuntimeClasspathEntry.BOOTSTRAP_CLASSES;
+ break;
+ case IClasspathContainer.K_DEFAULT_SYSTEM:
+ kind = IRuntimeClasspathEntry.STANDARD_CLASSES;
+ break;
+ }
+ rte = JavaRuntime.newRuntimeContainerClasspathEntry(entry.getPath(), kind, proj);
+ break;
+ case IClasspathEntry.CPE_LIBRARY:
+ rte = JavaRuntime.newArchiveRuntimeClasspathEntry(entry.getPath());
+ rte.setSourceAttachmentPath(entry.getSourceAttachmentPath());
+ rte.setSourceAttachmentRootPath(entry.getSourceAttachmentRootPath());
+ break;
+ case IClasspathEntry.CPE_PROJECT:
+ String name = entry.getPath().segment(0);
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
+ if (p.exists()) {
+ IJavaProject jp = JavaCore.create(p);
+ if (jp.exists()) {
+ rte = JavaRuntime.newProjectRuntimeClasspathEntry(jp);
}
- rte = JavaRuntime.newRuntimeContainerClasspathEntry(entry.getPath(), kind, proj);
- break;
- case IClasspathEntry.CPE_LIBRARY:
- rte = JavaRuntime.newArchiveRuntimeClasspathEntry(entry.getPath());
- rte.setSourceAttachmentPath(entry.getSourceAttachmentPath());
- rte.setSourceAttachmentRootPath(entry.getSourceAttachmentRootPath());
- break;
- case IClasspathEntry.CPE_PROJECT:
- String name = entry.getPath().segment(0);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if (p.exists()) {
- IJavaProject jp = JavaCore.create(p);
- if (jp.exists()) {
- rte = JavaRuntime.newProjectRuntimeClasspathEntry(jp);
- }
- }
- break;
- case IClasspathEntry.CPE_VARIABLE:
- rte = JavaRuntime.newVariableRuntimeClasspathEntry(entry.getPath());
- break;
- default:
- break;
+ }
+ break;
+ case IClasspathEntry.CPE_VARIABLE:
+ rte = JavaRuntime.newVariableRuntimeClasspathEntry(entry.getPath());
+ break;
+ default:
+ break;
}
if (rte != null) {
if (!runtimeEntries.contains(rte)) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AttachSourceAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AttachSourceAction.java
index b602b0b..be9134f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AttachSourceAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AttachSourceAction.java
@@ -49,8 +49,7 @@
public void run() {
IClasspathEntry classpathEntry = BuildPathDialogAccess.configureSourceAttachment(getShell(), fEntries[0].getClasspathEntry());
if (classpathEntry != null) {
- for (int i = 0; i < fEntries.length; i++) {
- IRuntimeClasspathEntry entry = fEntries[i];
+ for (IRuntimeClasspathEntry entry : fEntries) {
entry.setSourceAttachmentPath(classpathEntry.getSourceAttachmentPath());
entry.setSourceAttachmentRootPath(classpathEntry.getSourceAttachmentRootPath());
getViewer().refresh(entry);
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointToggleAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointToggleAction.java
index 615ee7b..4afc2e4 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointToggleAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointToggleAction.java
@@ -177,8 +177,7 @@
IStructuredSelection selection= getStructuredSelection();
if (selection != null) {
IBreakpoint selectedBreakpoint= (IBreakpoint)selection.getFirstElement();
- for (int i = 0; i < breakpoints.length; i++) {
- IBreakpoint breakpoint = breakpoints[i];
+ for (IBreakpoint breakpoint : breakpoints) {
if (selectedBreakpoint.equals(breakpoint)) {
selectionChanged(getAction(), selection);
return;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ControlAccessibleListener.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ControlAccessibleListener.java
index 448dfcc..9844f68 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ControlAccessibleListener.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ControlAccessibleListener.java
@@ -31,10 +31,9 @@
public static void addListener(Control comp, String name) {
//strip mnemonic
- String[] strs = name.split("&"); //$NON-NLS-1$
StringBuilder stripped = new StringBuilder();
- for (int i = 0; i < strs.length; i++) {
- stripped.append(strs[i]);
+ for (String str : name.split("&")) { //$NON-NLS-1$
+ stripped.append(str);
}
comp.getAccessible().addAccessibleListener(new ControlAccessibleListener(stripped.toString()));
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditClasspathEntryAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditClasspathEntryAction.java
index 8bd13d4..73de762 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditClasspathEntryAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EditClasspathEntryAction.java
@@ -74,8 +74,8 @@
}
}
setEntries(list);
- for (int i = 0; i < wrappers.length; i++) {
- getViewer().refresh(wrappers[i]);
+ for (IRuntimeClasspathEntry wrapper : wrappers) {
+ getViewer().refresh(wrapper);
}
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractDetailPane.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractDetailPane.java
index adde917..9292b24 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractDetailPane.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractDetailPane.java
@@ -147,8 +147,8 @@
* @param autosave the auto-save properties
*/
protected void addAutosaveProperties(int[] autosave) {
- for (int i = 0; i < autosave.length; i++) {
- fAutoSaveProperties.add(new Integer(autosave[i]));
+ for (int element : autosave) {
+ fAutoSaveProperties.add(new Integer(element));
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddClassPrepareBreakpointAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddClassPrepareBreakpointAction.java
index f6359b7..94e5110 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddClassPrepareBreakpointAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddClassPrepareBreakpointAction.java
@@ -59,52 +59,51 @@
*/
private void createBreakpoints(final Object[] selection) {
try {
- for (int i = 0; i < selection.length; i++) {
- final IType type = (IType) selection[i];
- final IResource resource = BreakpointUtils.getBreakpointResource(type);
- final Map<String, Object> map = new HashMap<>(10);
- BreakpointUtils.addJavaBreakpointAttributes(map, type);
- int kind = IJavaClassPrepareBreakpoint.TYPE_CLASS;
- if (!type.isClass()) {
- kind = IJavaClassPrepareBreakpoint.TYPE_INTERFACE;
- }
- IBreakpoint[] breakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(JDIDebugModel.getPluginIdentifier());
- boolean exists = false;
- for (int j = 0; j < breakpoints.length; j++) {
- IJavaBreakpoint breakpoint = (IJavaBreakpoint) breakpoints[j];
- if (breakpoint instanceof IJavaClassPrepareBreakpoint) {
+ for (Object a : selection) {
+ final IType type = (IType) a;
+ final IResource resource = BreakpointUtils.getBreakpointResource(type);
+ final Map<String, Object> map = new HashMap<>(10);
+ BreakpointUtils.addJavaBreakpointAttributes(map, type);
+ int kind = IJavaClassPrepareBreakpoint.TYPE_CLASS;
+ if (!type.isClass()) {
+ kind = IJavaClassPrepareBreakpoint.TYPE_INTERFACE;
+ }
+ boolean exists = false;
+ for (IBreakpoint b : DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(JDIDebugModel.getPluginIdentifier())) {
+ IJavaBreakpoint breakpoint = (IJavaBreakpoint) b;
+ if (breakpoint instanceof IJavaClassPrepareBreakpoint) {
String typeName = breakpoint.getTypeName();
if (typeName != null && typeName.equals(type.getFullyQualifiedName())) {
- exists = true;
- break;
- }
- }
- }
- if (!exists) {
- ISourceRange range = type.getNameRange();
- int start = -1;
- int end = -1;
- if (range != null) {
- start = range.getOffset();
- end = start + range.getLength();
- }
- final int finalKind = kind;
- final int finalStart = start;
- final int finalEnd = end;
- new Job(BreakpointMessages.AddClassPrepareBreakpointAction_2) {
- @Override
+ exists = true;
+ break;
+ }
+ }
+ }
+ if (!exists) {
+ ISourceRange range = type.getNameRange();
+ int start = -1;
+ int end = -1;
+ if (range != null) {
+ start = range.getOffset();
+ end = start + range.getLength();
+ }
+ final int finalKind = kind;
+ final int finalStart = start;
+ final int finalEnd = end;
+ new Job(BreakpointMessages.AddClassPrepareBreakpointAction_2) {
+ @Override
protected IStatus run(IProgressMonitor monitor) {
- try {
- JDIDebugModel.createClassPrepareBreakpoint(resource, type.getFullyQualifiedName(), finalKind, finalStart, finalEnd, true, map);
- return Status.OK_STATUS;
- } catch (CoreException e) {
- return e.getStatus();
- }
- }
+ try {
+ JDIDebugModel.createClassPrepareBreakpoint(resource, type.getFullyQualifiedName(), finalKind, finalStart, finalEnd, true, map);
+ return Status.OK_STATUS;
+ } catch (CoreException e) {
+ return e.getStatus();
+ }
+ }
- }.schedule();
- }
- }
+ }.schedule();
+ }
+ }
} catch(CoreException e) {
JDIDebugUIPlugin.statusDialog(e.getStatus());
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionAction.java
index 3a0bea7..1b148a2 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AddExceptionAction.java
@@ -129,9 +129,9 @@
JDIDebugModel.getPluginIdentifier());
IJavaExceptionBreakpoint breakpoint = null;
boolean exists = false;
- for (int j = 0; j < breakpoints.length; j++) {
- if (breakpoints[j] instanceof IJavaExceptionBreakpoint) {
- breakpoint = (IJavaExceptionBreakpoint) breakpoints[j];
+ for (IBreakpoint b : breakpoints) {
+ if (b instanceof IJavaExceptionBreakpoint) {
+ breakpoint = (IJavaExceptionBreakpoint) b;
String typeName = breakpoint.getTypeName();
if (typeName != null && typeName.equals(type.getFullyQualifiedName())) {
exists = true;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/CompositeBreakpointEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/CompositeBreakpointEditor.java
index 94ded24..25e78c8 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/CompositeBreakpointEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/CompositeBreakpointEditor.java
@@ -40,8 +40,8 @@
*/
@Override
public void addPropertyListener(IPropertyListener listener) {
- for (int i = 0; i < fEditors.length; i++) {
- fEditors[i].addPropertyListener(listener);
+ for (AbstractJavaBreakpointEditor editor : fEditors) {
+ editor.addPropertyListener(listener);
}
}
@@ -50,8 +50,8 @@
*/
@Override
public void removePropertyListener(IPropertyListener listener) {
- for (int i = 0; i < fEditors.length; i++) {
- fEditors[i].removePropertyListener(listener);
+ for (AbstractJavaBreakpointEditor editor : fEditors) {
+ editor.removePropertyListener(listener);
}
}
@@ -60,8 +60,8 @@
*/
@Override
protected void dispose() {
- for (int i = 0; i < fEditors.length; i++) {
- fEditors[i].dispose();
+ for (AbstractJavaBreakpointEditor editor : fEditors) {
+ editor.dispose();
}
fEditors = null;
}
@@ -72,8 +72,8 @@
@Override
public Control createControl(Composite parent) {
Composite comp = SWTFactory.createComposite(parent, parent.getFont(), 1, 1, GridData.FILL_BOTH, 0, 0);
- for (int i = 0; i < fEditors.length; i++) {
- fEditors[i].createControl(comp);
+ for (AbstractJavaBreakpointEditor editor : fEditors) {
+ editor.createControl(comp);
}
return comp;
}
@@ -91,8 +91,8 @@
*/
@Override
public void doSave() throws CoreException {
- for (int i = 0; i < fEditors.length; i++) {
- fEditors[i].doSave();
+ for (AbstractJavaBreakpointEditor editor : fEditors) {
+ editor.doSave();
}
}
@@ -101,8 +101,8 @@
*/
@Override
public boolean isDirty() {
- for (int i = 0; i < fEditors.length; i++) {
- if (fEditors[i].isDirty()) {
+ for (AbstractJavaBreakpointEditor editor : fEditors) {
+ if (editor.isDirty()) {
return true;
}
}
@@ -114,8 +114,8 @@
*/
@Override
public IStatus getStatus() {
- for (int i = 0; i < fEditors.length; i++) {
- IStatus status = fEditors[i].getStatus();
+ for (AbstractJavaBreakpointEditor editor : fEditors) {
+ IStatus status = editor.getStatus();
if (!status.isOK()) {
return status;
}
@@ -136,8 +136,8 @@
*/
@Override
public void setInput(Object breakpoint) throws CoreException {
- for (int i = 0; i < fEditors.length; i++) {
- fEditors[i].setInput(breakpoint);
+ for (AbstractJavaBreakpointEditor editor : fEditors) {
+ editor.setInput(breakpoint);
}
}
@@ -147,8 +147,8 @@
@Override
public void setMnemonics(boolean mnemonics) {
super.setMnemonics(mnemonics);
- for (int i = 0; i < fEditors.length; i++) {
- fEditors[i].setMnemonics(mnemonics);
+ for (AbstractJavaBreakpointEditor editor : fEditors) {
+ editor.setMnemonics(mnemonics);
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathContentProvider.java
index b189413..321b765 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathContentProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathContentProvider.java
@@ -170,9 +170,7 @@
}
if (parentElement == null) {
List<Object> all= new ArrayList<>();
- Object[] topEntries= model.getEntries();
- for (int i = 0; i < topEntries.length; i++) {
- Object object = topEntries[i];
+ for (Object object : model.getEntries()) {
if (object instanceof ClasspathEntry) {
all.add(object);
} else if (object instanceof ClasspathGroup) {
@@ -219,16 +217,14 @@
public void setEntries(IRuntimeClasspathEntry[] entries) {
model.removeAll();
- IRuntimeClasspathEntry entry;
- for (int i = 0; i < entries.length; i++) {
- entry= entries[i];
+ for (IRuntimeClasspathEntry entry : entries) {
switch (entry.getClasspathProperty()) {
- case IRuntimeClasspathEntry.USER_CLASSES:
- model.addEntry(ClasspathModel.USER, entry);
- break;
- default:
- model.addEntry(ClasspathModel.BOOTSTRAP, entry);
- break;
+ case IRuntimeClasspathEntry.USER_CLASSES:
+ model.addEntry(ClasspathModel.USER, entry);
+ break;
+ default:
+ model.addEntry(ClasspathModel.BOOTSTRAP, entry);
+ break;
}
}
refresh();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathModel.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathModel.java
index ee97b2f..09ec096 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathModel.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathModel.java
@@ -145,8 +145,7 @@
public void removeAll(Object[] entries) {
- for (int i = 0; i < entries.length; i++) {
- Object object = entries[i];
+ for (Object object : entries) {
if (object instanceof ClasspathEntry) {
IClasspathEntry entryParent= ((ClasspathEntry)object).getParent();
if (entryParent instanceof ClasspathGroup) {
@@ -165,8 +164,8 @@
getBootstrapEntry();
}
bootstrapEntries.removeAll();
- for (int i = 0; i < entries.length; i++) {
- bootstrapEntries.addEntry(new ClasspathEntry(entries[i], bootstrapEntries), null);
+ for (IRuntimeClasspathEntry entry : entries) {
+ bootstrapEntries.addEntry(new ClasspathEntry(entry, bootstrapEntries), null);
}
}
@@ -174,8 +173,8 @@
ClasspathGroup group= new ClasspathGroup(name, entryParent, canBeRemoved);
- for (int i = 0; i < entries.length; i++) {
- group.addEntry(new ClasspathEntry(entries[i], group), null);
+ for (IRuntimeClasspathEntry entry : entries) {
+ group.addEntry(new ClasspathEntry(entry, group), null);
}
if (addEntry) {
@@ -189,8 +188,8 @@
getUserEntry();
}
userEntries.removeAll();
- for (int i = 0; i < entries.length; i++) {
- userEntries.addEntry(new ClasspathEntry(entries[i], userEntries), null);
+ for (IRuntimeClasspathEntry entry : entries) {
+ userEntries.addEntry(new ClasspathEntry(entry, userEntries), null);
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DependenciesContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DependenciesContentProvider.java
index a50f491..aceb4d9 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DependenciesContentProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/DependenciesContentProvider.java
@@ -44,16 +44,14 @@
@Override
public void setEntries(IRuntimeClasspathEntry[] entries) {
model.removeAll();
- IRuntimeClasspathEntry entry;
- for (int i = 0; i < entries.length; i++) {
- entry= entries[i];
+ for (IRuntimeClasspathEntry entry : entries) {
switch (entry.getClasspathProperty()) {
- case IRuntimeClasspathEntry.MODULE_PATH:
- model.addEntry(DependencyModel.MODULE_PATH, entry);
- break;
- default:
- model.addEntry(DependencyModel.CLASS_PATH, entry);
- break;
+ case IRuntimeClasspathEntry.MODULE_PATH:
+ model.addEntry(DependencyModel.MODULE_PATH, entry);
+ break;
+ default:
+ model.addEntry(DependencyModel.CLASS_PATH, entry);
+ break;
}
}
refresh();
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java
index bea23dc..aa81d95 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletLaunchConfigurationUtils.java
@@ -145,10 +145,9 @@
}
if (element instanceof ICompilationUnit) {
ICompilationUnit cu= (ICompilationUnit)element;
- IType[] types= cu.getAllTypes();
- for (int i= 0; i < types.length; i++) {
- if (isSubclassOfApplet(monitor, types[i])) {
- result.add(types[i]);
+ for (IType type : cu.getAllTypes()) {
+ if (isSubclassOfApplet(monitor, type)) {
+ result.add(type);
}
}
} else if (element instanceof IOrdinaryClassFile) {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ArchiveFileFilter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ArchiveFileFilter.java
index da61bf0..57a7afb 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ArchiveFileFilter.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ArchiveFileFilter.java
@@ -60,10 +60,9 @@
return isArchivePath(((IFile)element).getFullPath());
} else if (element instanceof IContainer) { // IProject, IFolder
try {
- IResource[] resources= ((IContainer)element).members();
- for (int i= 0; i < resources.length; i++) {
+ for (IResource resource : ((IContainer) element).members()) {
// recursive! Only show containers that contain an archive
- if (select(viewer, parent, resources[i])) {
+ if (select(viewer, parent, resource)) {
return true;
}
}
@@ -77,8 +76,8 @@
public static boolean isArchivePath(IPath path) {
String ext= path.getFileExtension();
if (ext != null && ext.length() != 0) {
- for (int i= 0; i < fgArchiveExtensions.length; i++) {
- if (ext.equalsIgnoreCase(fgArchiveExtensions[i])) {
+ for (String archiveExtension : fgArchiveExtensions) {
+ if (ext.equalsIgnoreCase(archiveExtension)) {
return true;
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java
index 11a002a..224cab5 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java
@@ -288,9 +288,9 @@
@Override
protected void fillContentProvider(AbstractContentProvider contentProvider, ItemsFilter itemsFilter, IProgressMonitor progressMonitor) throws CoreException {
if(fTypes != null && fTypes.length > 0) {
- for(int i = 0; i < fTypes.length; i++) {
- if(itemsFilter.isConsistentItem(fTypes[i])) {
- contentProvider.add(fTypes[i], itemsFilter);
+ for (IType type : fTypes) {
+ if (itemsFilter.isConsistentItem(type)) {
+ contentProvider.add(type, itemsFilter);
}
}
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ExceptionFilterEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ExceptionFilterEditor.java
index 0849d31..0aad2b2 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ExceptionFilterEditor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/propertypages/ExceptionFilterEditor.java
@@ -183,8 +183,8 @@
Object[] filters = fFilterContentProvider.getElements(null);
List<String> inclusionFilters = new ArrayList<>(filters.length);
List<String> exclusionFilters = new ArrayList<>(filters.length);
- for (int i = 0; i < filters.length; i++) {
- Filter filter = (Filter) filters[i];
+ for (Object f : filters) {
+ Filter filter = (Filter) f;
String name = filter.getName();
if (name.equals(DEFAULT_PACKAGE)) {
name = ""; //$NON-NLS-1$
@@ -350,9 +350,8 @@
return;
// otherwise, commit the new value if not a duplicate
} else {
- Object[] filters = fFilterContentProvider.getElements(null);
- for (int i = 0; i < filters.length; i++) {
- Filter filter = (Filter) filters[i];
+ for (Object f : fFilterContentProvider.getElements(null)) {
+ Filter filter = (Filter) f;
if (filter.getName().equals(trimmedValue)) {
removeNewFilter();
cleanupEditor();
@@ -446,8 +445,8 @@
}
Object[] packages = dialog.getResult();
if (packages != null) {
- for (int i = 0; i < packages.length; i++) {
- IJavaElement pkg = (IJavaElement) packages[i];
+ for (Object p : packages) {
+ IJavaElement pkg = (IJavaElement) p;
String filter = pkg.getElementName();
if (filter.length() < 1) {
filter = DEFAULT_PACKAGE;
@@ -479,10 +478,9 @@
}
Object[] types = dialog.getResult();
- IType type;
if (types != null) {
- for (int i = 0; i < types.length; i++) {
- type = (IType) types[i];
+ for (Object t : types) {
+ IType type = (IType) t;
Filter f = fFilterContentProvider.addFilter(type.getFullyQualifiedName());
fFilterContentProvider.checkFilter(f, true);
}
@@ -522,8 +520,7 @@
}
protected void populateFilters(String[] filters, boolean checked) {
- for (int i = 0; i < filters.length; i++) {
- String name = filters[i];
+ for (String name : filters) {
if (name.length() == 0) {
name = DEFAULT_PACKAGE;
}
@@ -542,8 +539,8 @@
}
public void removeFilters(Object[] filters) {
- for (int i = 0; i < filters.length; i++) {
- Filter filter = (Filter) filters[i];
+ for (Object f : filters) {
+ Filter filter = (Filter) f;
fFilters.remove(filter);
}
fViewer.remove(filters);
