From 1b721f2561afb4ec9518dbc3f8ac1d880ac11c8f Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Tue, 6 Oct 2015 13:10:10 +0300 Subject: [PATCH] cleanup - for-each loops --- .../debugger/actions/EditSourceAction.java | 5 ++--- .../evaluation/expression/FieldEvaluator.java | 2 +- .../com/intellij/debugger/jdi/Bytecodes.java | 6 +++--- .../jdi/ThreadGroupReferenceProxyImpl.java | 9 +++------ .../debugger/settings/CompositeDataBinding.java | 17 ++++++++--------- .../settings/ThreadsViewConfigurable.java | 9 +++------ .../ui/breakpoints/MethodBreakpoint.java | 4 +--- .../impl/watch/DebuggerTreeNodeExpression.java | 11 ++++------- .../debugger/ui/tree/render/BatchEvaluator.java | 10 ++++------ .../render/EnumerationChildrenRenderer.java | 10 +++------- 10 files changed, 32 insertions(+), 51 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/EditSourceAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/EditSourceAction.java index 329c867c1b85..03475fdffdec 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/EditSourceAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/EditSourceAction.java @@ -51,10 +51,9 @@ public class EditSourceAction extends DebuggerAction{ } private SourcePosition getSourcePosition(DebuggerTreeNodeImpl selectedNode, DebuggerContextImpl debuggerContext) { - DebuggerTreeNodeImpl node = selectedNode; final DebuggerContextImpl context = debuggerContext; - if(node == null || context == null) { + if (selectedNode == null || context == null) { return null; } @@ -66,7 +65,7 @@ public class EditSourceAction extends DebuggerAction{ return null; } - NodeDescriptorImpl nodeDescriptor = node.getDescriptor(); + NodeDescriptorImpl nodeDescriptor = selectedNode.getDescriptor(); if(nodeDescriptor instanceof WatchItemDescriptor) { Modifier modifier = ((WatchItemDescriptor)nodeDescriptor).getModifier(); if(modifier == null) { diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/FieldEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/FieldEvaluator.java index 6b0b52f33ec7..7c72e154a24d 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/FieldEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/FieldEvaluator.java @@ -164,7 +164,7 @@ public class FieldEvaluator implements Evaluator { if (field == null) { throw EvaluateExceptionUtil.createEvaluateException(DebuggerBundle.message("evaluation.error.no.instance.field", myFieldName)); } - myEvaluatedQualifier = field.isStatic()? (Object)refType : (Object)objRef; + myEvaluatedQualifier = field.isStatic() ? refType : objRef; myEvaluatedField = field; return field.isStatic()? refType.getValue(field) : objRef.getValue(field); } diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/Bytecodes.java b/java/debugger/impl/src/com/intellij/debugger/jdi/Bytecodes.java index d6aa2372e720..85bf698a930c 100644 --- a/java/debugger/impl/src/com/intellij/debugger/jdi/Bytecodes.java +++ b/java/debugger/impl/src/com/intellij/debugger/jdi/Bytecodes.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -575,8 +575,8 @@ class Bytecodes { b[PUTFIELD_QUICK_W] = FIELDORMETH_INSN; // = 228; - for (int i = 0; i < b.length; ++i) { - System.err.print((char)('A' + b[i])); + for (int aB : b) { + System.err.print((char)('A' + aB)); } System.err.println(); diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadGroupReferenceProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadGroupReferenceProxyImpl.java index 560d5a7a8f32..a3664da65450 100644 --- a/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadGroupReferenceProxyImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadGroupReferenceProxyImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,6 @@ import com.sun.jdi.ThreadReference; import org.jetbrains.annotations.NonNls; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; public class ThreadGroupReferenceProxyImpl extends ObjectReferenceProxyImpl implements ThreadGroupReferenceProxy{ @@ -77,8 +76,7 @@ public class ThreadGroupReferenceProxyImpl extends ObjectReferenceProxyImpl impl List list = getThreadGroupReference().threads(); List proxies = new ArrayList(list.size()); - for (Iterator iterator = list.iterator(); iterator.hasNext();) { - ThreadReference threadReference = iterator.next(); + for (ThreadReference threadReference : list) { proxies.add(getVirtualMachineProxy().getThreadReferenceProxy(threadReference)); } return proxies; @@ -88,8 +86,7 @@ public class ThreadGroupReferenceProxyImpl extends ObjectReferenceProxyImpl impl List list = getThreadGroupReference().threadGroups(); List proxies = new ArrayList(list.size()); - for (Iterator iterator = list.iterator(); iterator.hasNext();) { - ThreadGroupReference threadGroupReference = iterator.next(); + for (ThreadGroupReference threadGroupReference : list) { proxies.add(getVirtualMachineProxy().getThreadGroupReferenceProxy(threadGroupReference)); } return proxies; diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/CompositeDataBinding.java b/java/debugger/impl/src/com/intellij/debugger/settings/CompositeDataBinding.java index 896fe54bc1ec..84c46e70f9bc 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/CompositeDataBinding.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/CompositeDataBinding.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,9 +15,8 @@ */ package com.intellij.debugger.settings; -import java.util.List; import java.util.ArrayList; -import java.util.Iterator; +import java.util.List; /** * @author Eugene Zhuravlev @@ -31,20 +30,20 @@ public class CompositeDataBinding implements DataBinding{ } public void loadData(Object from) { - for (Iterator it = myBindings.iterator(); it.hasNext();) { - it.next().loadData(from); + for (DataBinding myBinding : myBindings) { + myBinding.loadData(from); } } public void saveData(Object to) { - for (Iterator it = myBindings.iterator(); it.hasNext();) { - it.next().saveData(to); + for (DataBinding myBinding : myBindings) { + myBinding.saveData(to); } } public boolean isModified(Object obj) { - for (Iterator it = myBindings.iterator(); it.hasNext();) { - if (it.next().isModified(obj)) { + for (DataBinding myBinding : myBindings) { + if (myBinding.isModified(obj)) { return true; } } diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewConfigurable.java index 3dae116f22f3..d2f8956562a5 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewConfigurable.java @@ -24,7 +24,6 @@ import com.intellij.openapi.project.ProjectManager; import com.intellij.xdebugger.impl.XDebuggerUtilImpl; import javax.swing.*; -import java.util.Iterator; /** * @author Eugene Belyaev @@ -63,11 +62,9 @@ public class ThreadsViewConfigurable extends BaseConfigurable { public void apply() { myDataBinding.saveData(mySettings); - final Project[] openProjects = ProjectManager.getInstance().getOpenProjects(); - for (int i = 0; i < openProjects.length; i++) { - Project project = openProjects[i]; - for (Iterator iterator = (DebuggerManagerEx.getInstanceEx(project)).getSessions().iterator(); iterator.hasNext();) { - ((DebuggerSession)iterator.next()).refresh(false); + for (Project project : ProjectManager.getInstance().getOpenProjects()) { + for (DebuggerSession session : (DebuggerManagerEx.getInstanceEx(project)).getSessions()) { + (session).refresh(false); } XDebuggerUtilImpl.rebuildAllSessionsViews(project); } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java index 4f6440990c55..d7c87fc1f515 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java @@ -63,7 +63,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.java.debugger.breakpoints.properties.JavaMethodBreakpointProperties; import javax.swing.*; -import java.util.Iterator; import java.util.Set; public class MethodBreakpoint extends BreakpointWithHighlighter { @@ -127,8 +126,7 @@ public class MethodBreakpoint extends BreakpointWithHighlighter iterator = commands.iterator(); iterator.hasNext();) { - ToStringCommand toStringCommand = iterator.next(); + for (ToStringCommand toStringCommand : commands) { toStringCommand.action(); } } @@ -170,10 +169,9 @@ public class BatchEvaluator { try { DebugProcess debugProcess = evaluationContext.getDebugProcess(); List values = new ArrayList(); - for (Iterator iterator = requests.iterator(); iterator.hasNext();) { - ToStringCommand toStringCommand = iterator.next(); - final Value value = toStringCommand.getValue(); - values.add(value instanceof ObjectReference? ((ObjectReference)value) : value); + for (ToStringCommand toStringCommand : requests) { + Value value = toStringCommand.getValue(); + values.add(value instanceof ObjectReference ? ((ObjectReference)value) : value); } ArrayType objectArrayClass = (ArrayType)debugProcess.findClass( diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/EnumerationChildrenRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/EnumerationChildrenRenderer.java index ee6a7d754c3c..b6adde57e08e 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/EnumerationChildrenRenderer.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/EnumerationChildrenRenderer.java @@ -32,7 +32,6 @@ import org.jdom.Element; import org.jetbrains.annotations.NonNls; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; /** @@ -70,11 +69,9 @@ public final class EnumerationChildrenRenderer extends com.intellij.debugger.ui. myChildren.clear(); List children = element.getChildren(CHILDREN_EXPRESSION); - for (Iterator iterator = children.iterator(); iterator.hasNext();) { - Element item = iterator.next(); - + for (Element item : children) { String name = item.getAttributeValue(CHILD_NAME); - TextWithImports text = DebuggerUtils.getInstance().readTextWithImports((Element) item.getChildren().get(0)); + TextWithImports text = DebuggerUtils.getInstance().readTextWithImports(item.getChildren().get(0)); myChildren.add(Pair.create(name, text)); } @@ -83,8 +80,7 @@ public final class EnumerationChildrenRenderer extends com.intellij.debugger.ui. public void writeExternal(Element element) throws WriteExternalException { super.writeExternal(element); - for (Iterator> iterator = myChildren.iterator(); iterator.hasNext();) { - Pair pair = iterator.next(); + for (Pair pair : myChildren) { Element child = new Element(CHILDREN_EXPRESSION); child.setAttribute(CHILD_NAME, pair.getFirst()); child.addContent(DebuggerUtils.getInstance().writeTextWithImports(pair.getSecond()));