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: I64fa6afd85181b24a5cc3bd13a61aca68dc59a00
Signed-off-by: chammer <carsten.hammer@t-online.de>
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
index fa31814..65ac016 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
@@ -231,9 +231,7 @@
if (delta == null) {
return false;
}
- IMarkerDelta[] markerDeltas= delta.getMarkerDeltas();
- for (int i= 0; i < markerDeltas.length; i++) {
- IMarkerDelta markerDelta= markerDeltas[i];
+ for (IMarkerDelta markerDelta : delta.getMarkerDeltas()) {
if (markerDelta.isSubtypeOf(IBreakpoint.BREAKPOINT_MARKER)) {
switch (markerDelta.getKind()) {
case IResourceDelta.ADDED :
@@ -275,10 +273,8 @@
*/
private void loadBreakpoints(IResource resource, boolean notify) throws CoreException {
initBreakpointExtensions();
- IMarker[] markers= getPersistedMarkers(resource);
List<IBreakpoint> added = new ArrayList<>();
- for (int i = 0; i < markers.length; i++) {
- IMarker marker= markers[i];
+ for (IMarker marker : getPersistedMarkers(resource)) {
try {
IBreakpoint breakpoint = createBreakpoint(marker);
synchronized (fPostChangMarkersChanged) {
@@ -315,11 +311,9 @@
* @throws CoreException if a problem is encountered
*/
protected IMarker[] getPersistedMarkers(IResource resource) throws CoreException {
- IMarker[] markers= resource.findMarkers(IBreakpoint.BREAKPOINT_MARKER, true, IResource.DEPTH_INFINITE);
final List<IMarker> delete = new ArrayList<>();
List<IMarker> persisted = new ArrayList<>();
- for (int i = 0; i < markers.length; i++) {
- IMarker marker= markers[i];
+ for (IMarker marker : resource.findMarkers(IBreakpoint.BREAKPOINT_MARKER, true, IResource.DEPTH_INFINITE)) {
// ensure the marker has a valid model identifier attribute
// and delete the breakpoint if not
String modelId = marker.getAttribute(IBreakpoint.ID, null);
@@ -340,8 +334,7 @@
IWorkspaceRunnable wr = new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor pm) throws CoreException {
- for (int i = 0; i < delMarkers.length; i++) {
- IMarker marker = delMarkers[i];
+ for (IMarker marker : delMarkers) {
marker.delete();
}
}
@@ -381,16 +374,15 @@
*/
private void initBreakpointExtensions() {
IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint(DebugPlugin.getUniqueIdentifier(), DebugPlugin.EXTENSION_POINT_BREAKPOINTS);
- IConfigurationElement[] elements = ep.getConfigurationElements();
- for (int i= 0; i < elements.length; i++) {
- String markerType = elements[i].getAttribute(IConfigurationElementConstants.MARKER_TYPE);
- String className = elements[i].getAttribute(IConfigurationElementConstants.CLASS);
+ for (IConfigurationElement element : ep.getConfigurationElements()) {
+ String markerType = element.getAttribute(IConfigurationElementConstants.MARKER_TYPE);
+ String className = element.getAttribute(IConfigurationElementConstants.CLASS);
if (markerType == null) {
- DebugPlugin.log(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, "Breakpoint extension " + elements[i].getDeclaringExtension().getUniqueIdentifier() + " missing required attribute: markerType", null)); //$NON-NLS-1$ //$NON-NLS-2$
+ DebugPlugin.log(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, "Breakpoint extension " + element.getDeclaringExtension().getUniqueIdentifier() + " missing required attribute: markerType", null)); //$NON-NLS-1$ //$NON-NLS-2$
} else if (className == null){
- DebugPlugin.log(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, "Breakpoint extension " + elements[i].getDeclaringExtension().getUniqueIdentifier() + " missing required attribute: class", null)); //$NON-NLS-1$ //$NON-NLS-2$
+ DebugPlugin.log(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, "Breakpoint extension " + element.getDeclaringExtension().getUniqueIdentifier() + " missing required attribute: class", null)); //$NON-NLS-1$ //$NON-NLS-2$
} else {
- fBreakpointExtensions.put(markerType, elements[i]);
+ fBreakpointExtensions.put(markerType, element);
}
}
}
@@ -506,8 +498,7 @@
public void removeBreakpoints(IBreakpoint[] breakpoints, final boolean delete) throws CoreException {
final List<IBreakpoint> remove = new ArrayList<>(breakpoints.length);
List<IBreakpoint> bps = getBreakpoints0();
- for (int i = 0; i < breakpoints.length; i++) {
- IBreakpoint breakpoint = breakpoints[i];
+ for (IBreakpoint breakpoint : breakpoints) {
if (bps.contains(breakpoint)) {
remove.add(breakpoint);
}
@@ -610,8 +601,7 @@
private void addBreakpoints(IBreakpoint[] breakpoints, boolean notify) throws CoreException {
List<IBreakpoint> added = new ArrayList<>(breakpoints.length);
final List<IBreakpoint> update = new ArrayList<>();
- for (int i = 0; i < breakpoints.length; i++) {
- IBreakpoint breakpoint = breakpoints[i];
+ for (IBreakpoint breakpoint : breakpoints) {
if (!getBreakpoints0().contains(breakpoint)) {
verifyBreakpoint(breakpoint);
if (breakpoint.isRegistered()) {
@@ -760,9 +750,8 @@
IWorkspaceRunnable wRunnable= new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
- IMarker[] markers = fMoved.toArray(new IMarker[fMoved.size()]);
- for (int i = 0; i < markers.length; i++) {
- markers[i].delete();
+ for (IMarker marker : fMoved) {
+ marker.delete();
}
}
};
@@ -813,9 +802,7 @@
handleProjectResourceOpenStateChange(delta.getResource());
return false;
}
- IMarkerDelta[] markerDeltas= delta.getMarkerDeltas();
- for (int i= 0; i < markerDeltas.length; i++) {
- IMarkerDelta markerDelta= markerDeltas[i];
+ for (IMarkerDelta markerDelta : delta.getMarkerDeltas()) {
if (markerDelta.isSubtypeOf(IBreakpoint.BREAKPOINT_MARKER)) {
switch (markerDelta.getKind()) {
case IResourceDelta.ADDED :
@@ -883,11 +870,9 @@
* @return matching breakpoint if exists else return <code>null</code>
*/
private IBreakpoint findMatchingBreakpoint(IMarker marker) {
- Vector<IBreakpoint> breakpoints = getBreakpoints0();
try {
Integer line = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
- for (int i = 0; i < breakpoints.size(); i++) {
- IBreakpoint breakpoint = breakpoints.get(i);
+ for (IBreakpoint breakpoint : getBreakpoints0()) {
IMarker bpMarker = breakpoint.getMarker();
if (bpMarker != null && marker.getResource().equals(bpMarker.getResource()) && bpMarker.getAttribute(IMarker.LINE_NUMBER, -1) == (line == null ? -1 : line.intValue())) {
return breakpoint;
@@ -1303,18 +1288,17 @@
fImportParticipants = new HashMap<>();
fDefaultParticipant = new DefaultImportParticipant();
IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint(DebugPlugin.getUniqueIdentifier(), DebugPlugin.EXTENSION_POINT_BREAKPOINT_IMPORT_PARTICIPANTS);
- IConfigurationElement[] elements = ep.getConfigurationElements();
String type = null;
ArrayList<BreakpointImportParticipantDelegate> list = null;
- for(int i = 0; i < elements.length; i++) {
- type = elements[i].getAttribute(IConfigurationElementConstants.TYPE);
+ for (IConfigurationElement element : ep.getConfigurationElements()) {
+ type = element.getAttribute(IConfigurationElementConstants.TYPE);
if(type != null) {
list = fImportParticipants.get(type);
if(list == null) {
list = new ArrayList<>();
fImportParticipants.put(type, list);
}
- list.add(new BreakpointImportParticipantDelegate(elements[i]));
+ list.add(new BreakpointImportParticipantDelegate(element));
}
}
}
@@ -1415,9 +1399,7 @@
IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
@Override
public void run(IProgressMonitor monitor) throws CoreException {
- IBreakpoint[] breakpoints = getBreakpoints();
- for (int i = 0; i < breakpoints.length; i++) {
- IBreakpoint breakpoint = breakpoints[i];
+ for (IBreakpoint breakpoint : getBreakpoints()) {
// Touch the marker (but don't actually change anything) so
// that the icon in
// the editor ruler will be updated (editors listen to
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerLabelProvider.java
index 13f305f..d19b878 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerLabelProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/BreakpointContainerLabelProvider.java
@@ -52,9 +52,8 @@
Object lastSegment = path.getLastSegment();
if (lastSegment instanceof IBreakpointContainer) {
IBreakpointContainer container = (IBreakpointContainer) lastSegment;
- IBreakpoint[] breakpoints = container.getBreakpoints();
- for (int i = 0; i < breakpoints.length; ++i) {
- if (breakpoints[i].isEnabled()) {
+ for (IBreakpoint breakpoint : container.getBreakpoints()) {
+ if (breakpoint.isEnabled()) {
return true;
}
}
@@ -70,15 +69,14 @@
Object lastSegment = path.getLastSegment();
if (lastSegment instanceof IBreakpointContainer) {
IBreakpointContainer container = (IBreakpointContainer) lastSegment;
- IBreakpoint[] breakpoints = container.getBreakpoints();
-
+
// Return true, gray if some breakpoints are enabled and some are disabled.
// return false if all breakpoints are either disabled or all are enabled.
boolean hasEnabled = false;
boolean hasDisabled = false;
- for (int i = 0; i < breakpoints.length; ++i) {
- if (breakpoints[i].isEnabled()) {
+ for (IBreakpoint breakpoint : container.getBreakpoints()) {
+ if (breakpoint.isEnabled()) {
hasEnabled = true;
} else {
hasDisabled = true;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java
index 2c772e1..fdb5cc0 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java
@@ -269,8 +269,8 @@
if (nodes == null) {
fElementToNodes.put(element, new ModelNode[] { node});
} else {
- for (int i = 0; i < nodes.length; i++) {
- if (nodes[i] == node) {
+ for (ModelNode mnode : nodes) {
+ if (mnode == node) {
return;
}
}
@@ -388,16 +388,16 @@
ViewerFilter[] filters = getViewer().getFilters();
if (filters != null) {
ArrayList<Object> filtered = new ArrayList<>(elements.length);
- for (int i = 0; i < elements.length; i++) {
+ for (Object element : elements) {
boolean add = true;
- for (int j = 0; j < filters.length; j++) {
- add = filters[j].select(getViewer(), parent, elements[i]);
+ for (ViewerFilter filter : filters) {
+ add = filter.select(getViewer(), parent, element);
if (!add) {
break;
}
}
if (add) {
- filtered.add(elements[i]);
+ filtered.add(element);
}
}
return filtered.toArray();
@@ -585,8 +585,7 @@
mapElement(child, newChildren[i]);
}
}
- for (int i = 0; i < prevKids.length; i++) {
- ModelNode kid = prevKids[i];
+ for (ModelNode kid : prevKids) {
if (kid != null) {
kid.dispose();
unmapNode(kid);
@@ -604,8 +603,8 @@
final ModelNode[] finalUnmap = unmap;
preservingSelection(() -> {
if (finalUnmap != null) {
- for (int i = 0; i < finalUnmap.length; i++) {
- viewer.unmapNode(finalUnmap[i]);
+ for (ModelNode element : finalUnmap) {
+ viewer.unmapNode(element);
}
}
viewer.nodeChildrenChanged(parentNode);
@@ -633,8 +632,8 @@
buf.append('\n');
ModelNode[] childrenNodes = node.getChildrenNodes();
if (childrenNodes != null) {
- for (int i = 0; i < childrenNodes.length; i++) {
- append(buf, childrenNodes[i], level + 1);
+ for (ModelNode childNode : childrenNodes) {
+ append(buf, childNode, level + 1);
}
}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java
index 92247cf..412b079 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java
@@ -60,13 +60,13 @@
kids = new ArrayList<>(elements.length);
} else {
kids = new ArrayList<>(elements.length + childrenNodes.length);
- for (int i = 0; i < childrenNodes.length; i++) {
- kids.add(childrenNodes[i].getElement());
+ for (ModelNode childNode : childrenNodes) {
+ kids.add(childNode.getElement());
}
}
- for (int i = 0; i < elements.length; i++) {
- if (!kids.contains(elements[i])) {
- kids.add(elements[i]);
+ for (Object element : elements) {
+ if (!kids.contains(element)) {
+ kids.add(element);
changed = true;
}
}
@@ -103,13 +103,13 @@
kids = new ArrayList<>(elements.length);
} else {
kids = new ArrayList<>(elements.length + childrenNodes.length);
- for (int i = 0; i < childrenNodes.length; i++) {
- kids.add(childrenNodes[i].getElement());
+ for (ModelNode childNode : childrenNodes) {
+ kids.add(childNode.getElement());
}
}
- for (int i = 0; i < elements.length; i++) {
- if (!kids.contains(elements[i])) {
- kids.add(index, elements[i]);
+ for (Object element : elements) {
+ if (!kids.contains(element)) {
+ kids.add(index, element);
index++;
changed = true;
}
@@ -143,11 +143,11 @@
ModelNode[] childrenNodes = getRootNode().getChildrenNodes();
if (childrenNodes != null) {
kids = new ArrayList<>(childrenNodes.length);
- for (int i = 0; i < childrenNodes.length; i++) {
- kids.add(childrenNodes[i].getElement());
+ for (ModelNode childrenNode : childrenNodes) {
+ kids.add(childrenNode.getElement());
}
- for (int i = 0; i < elements.length; i++) {
- if (kids.remove(elements[i])) {
+ for (Object element : elements) {
+ if (kids.remove(element)) {
changed = true;
}
}
@@ -182,9 +182,7 @@
}
List<ModelNode> list = new ArrayList<>();
synchronized (this) {
- ModelNode[] nodes = getNodes(element);
- for (int i = 0; i < nodes.length; i++) {
- ModelNode node = nodes[i];
+ for (ModelNode node : getNodes(element)) {
node.remap(replacement);
list.add(node);
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java
index a4715aa..81c439a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java
@@ -156,8 +156,8 @@
protected List getSelectionFromWidget() {
TableItem[] selection = fTable.getSelection();
List<Object> datas = new ArrayList<>(selection.length);
- for (int i = 0; i < selection.length; i++) {
- datas.add(selection[i].getData());
+ for (TableItem element : selection) {
+ datas.add(element.getData());
}
return datas;
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java
index 54511ed..aba77c7 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java
@@ -190,8 +190,8 @@
public void update(Object element) {
ModelNode[] nodes = getModel().getNodes(element);
if (nodes != null) {
- for (int i = 0; i < nodes.length; i++) {
- updateLabel(nodes[i]);
+ for (ModelNode node : nodes) {
+ updateLabel(node);
}
}
}
@@ -421,8 +421,7 @@
if (model != null) {
ModelNode[] nodes = model.getNodes(element);
if (nodes != null) {
- for (int i = 0; i < nodes.length; i++) {
- ModelNode node = nodes[i];
+ for (ModelNode node : nodes) {
// get the widget for the node
Widget item = findItem(node);
if (item != null) {
@@ -969,8 +968,8 @@
unmapElement(node);
ModelNode[] childrenNodes = node.getChildrenNodes();
if (childrenNodes != null) {
- for (int i = 0; i < childrenNodes.length; i++) {
- unmapNode(childrenNodes[i]);
+ for (ModelNode childNode : childrenNodes) {
+ unmapNode(childNode);
}
}
}
@@ -983,8 +982,7 @@
protected ModelNode findNode(Widget widget) {
ModelNode[] nodes = getModel().getNodes(widget.getData());
if (nodes != null) {
- for (int i = 0; i < nodes.length; i++) {
- ModelNode node = nodes[i];
+ for (ModelNode node : nodes) {
Widget item = findItem(node);
if (widget == item) {
return node;
@@ -1031,8 +1029,7 @@
if (parentItem != null) {
ModelNode[] nodes = getModel().getNodes(parentItem.getData());
if (nodes != null) {
- for (int i = 0; i < nodes.length; i++) {
- ModelNode parentNode = nodes[i];
+ for (ModelNode parentNode : nodes) {
Widget parentWidget = findItem(parentNode);
if (parentWidget == parentItem) {
ModelNode[] childrenNodes = parentNode.getChildrenNodes();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java
index 64d38a7..f3b1fd4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/breadcrumb/BreadcrumbViewer.java
@@ -170,8 +170,7 @@
* @return true if any of the items in the viewer is expanded
*/
public boolean isDropDownOpen() {
- for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
- BreadcrumbItem item= fBreadcrumbItems.get(i);
+ for (BreadcrumbItem item : fBreadcrumbItems) {
if (item.isMenuShown()) {
return true;
}
@@ -187,8 +186,7 @@
* @return the drop downs shell or <code>null</code>
*/
public Shell getDropDownShell() {
- for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
- BreadcrumbItem item= fBreadcrumbItems.get(i);
+ for (BreadcrumbItem item : fBreadcrumbItems) {
if (item.isMenuShown()) {
return item.getDropDownShell();
}
@@ -268,8 +266,7 @@
return null;
}
- for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
- BreadcrumbItem item= fBreadcrumbItems.get(i);
+ for (BreadcrumbItem item : fBreadcrumbItems) {
if (item.getData() == element || element.equals(item.getData())) {
return item;
}
@@ -329,9 +326,9 @@
protected TreePath getTreePathFromItem(BreadcrumbItem item) {
List<Object> elements = new ArrayList<>(fBreadcrumbItems.size());
- for (int i = 0; i < fBreadcrumbItems.size(); i++) {
- elements.add( fBreadcrumbItems.get(i).getData() );
- if (fBreadcrumbItems.get(i).equals(item)) {
+ for (BreadcrumbItem currItem : fBreadcrumbItems) {
+ elements.add( currItem.getData() );
+ if (currItem.equals(item)) {
return new TreePath(elements.toArray());
}
}
@@ -368,9 +365,8 @@
BreadcrumbItem item= (BreadcrumbItem) doFindItem(element);
if (item == null || element != null && element.equals(getInput())) {
- for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
- BreadcrumbItem item1= fBreadcrumbItems.get(i);
- layoutChanged = refreshItem(item1) || layoutChanged;
+ for (BreadcrumbItem currItem : fBreadcrumbItems) {
+ layoutChanged = refreshItem(currItem) || layoutChanged;
}
} else {
layoutChanged = refreshItem(item) || layoutChanged;
@@ -393,8 +389,7 @@
BreadcrumbItem focusItem= null;
// Unselect the currently selected items, and remember the focused item.
- for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
- BreadcrumbItem item= fBreadcrumbItems.get(i);
+ for (BreadcrumbItem item : fBreadcrumbItems) {
if (item.hasFocus()) {
focusItem= item;
}
@@ -729,8 +724,7 @@
*/
private int getCurrentWidth() {
int result= 0;
- for (int i= 0, size= fBreadcrumbItems.size(); i < size; i++) {
- BreadcrumbItem viewer= fBreadcrumbItems.get(i);
+ for (BreadcrumbItem viewer : fBreadcrumbItems) {
result+= viewer.getWidth();
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointContainerProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointContainerProxy.java
index ec9e20a..c54539e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointContainerProxy.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/update/BreakpointContainerProxy.java
@@ -45,10 +45,9 @@
@Override
public boolean setChecked(IPresentationContext context, Object viewerInput, TreePath path, boolean checked) {
boolean atLeastOne = false;
- IBreakpoint[] breakpoints = fContainer.getBreakpoints();
- for (int i = 0; i < breakpoints.length; ++i) {
+ for (IBreakpoint breakpoint : fContainer.getBreakpoints()) {
try {
- breakpoints[i].setEnabled(checked);
+ breakpoint.setEnabled(checked);
atLeastOne = true;
} catch (CoreException e) {}
}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java
index 3488c24..137a28b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java
@@ -131,13 +131,12 @@
if (fNesting != null && fNesting.length > 0) {
IAdaptable[] emptyCategories = fNesting[0].getCategories();
if (emptyCategories != null) {
- for (int i = 0; i < emptyCategories.length; i++) {
- IAdaptable empty = emptyCategories[i];
- BreakpointContainer container = findExistingContainer(fChildContainers, empty);
+ for (IAdaptable category : emptyCategories) {
+ BreakpointContainer container = findExistingContainer(fChildContainers, category);
if (container == null) {
IBreakpointOrganizer[] siblings = new IBreakpointOrganizer[fNesting.length - 1];
System.arraycopy(fNesting, 1, siblings, 0, siblings.length);
- container = new BreakpointContainer(this, empty, fNesting[0], fComparator, siblings);
+ container = new BreakpointContainer(this, category, fNesting[0], fComparator, siblings);
insertChildContainer(container);
container.fDefaultContainer = true;
@@ -276,11 +275,8 @@
IBreakpointOrganizer organizer = fNesting[0];
// get the breakpoint categories from the organizer
- IAdaptable[] categories = getCategories(breakpoint, organizer);
-
- for (int i = 0; i < categories.length; ++i) {
+ for (IAdaptable category : getCategories(breakpoint, organizer)) {
ModelDelta childDelta = null;
- IAdaptable category = categories[i];
BreakpointContainer container = findExistingContainer(fChildContainers, category);
// create a new container if it doesn't exist
@@ -595,8 +591,7 @@
return new BreakpointContainer[]{this};
}
ArrayList<BreakpointContainer> list = new ArrayList<>();
- for (int i = 0; i < containers.length; i++) {
- BreakpointContainer container = containers[i];
+ for (BreakpointContainer container : containers) {
BreakpointContainer[] subcontainers = container.getContainers(breakpoint);
if (subcontainers != null) {
Collections.addAll(list, subcontainers);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingCellModifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingCellModifier.java
index 9312bf7..801b2c7 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingCellModifier.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingCellModifier.java
@@ -94,8 +94,8 @@
return fCustomModifier.canModify(mElement, null);
}
- for (int i = 0; i < bytes.length; i++) {
- if (!bytes[i].isWritable()) {
+ for (MemoryByte b : bytes) {
+ if (!b.isWritable()) {
canModify = false;
}
}
