diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java index 600d362a8094..0dafd39824e5 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java @@ -31,7 +31,6 @@ import com.intellij.debugger.jdi.StackFrameProxyImpl; import com.intellij.debugger.jdi.ThreadReferenceProxyImpl; import com.intellij.debugger.requests.ClassPrepareRequestor; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.*; import com.intellij.psi.PsiClass; @@ -41,14 +40,13 @@ import com.sun.jdi.ReferenceType; import com.sun.jdi.event.LocatableEvent; import org.jdom.Element; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.util.List; public abstract class Breakpoint extends FilteredRequestor implements ClassPrepareRequestor { - private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.Breakpoint"); - public boolean ENABLED = true; public boolean LOG_ENABLED = false; public boolean LOG_EXPRESSION_ENABLED = false; @@ -134,7 +132,7 @@ public abstract class Breakpoint extends FilteredRequestor implements ClassPrepa } protected void createOrWaitPrepare(final DebugProcessImpl debugProcess, final SourcePosition classPosition) { - debugProcess.getRequestsManager().callbackOnPrepareClasses(Breakpoint.this, classPosition); + debugProcess.getRequestsManager().callbackOnPrepareClasses(this, classPosition); List list = debugProcess.getPositionManager().getAllClasses(classPosition); for (final Object aList : list) { @@ -163,7 +161,7 @@ public abstract class Breakpoint extends FilteredRequestor implements ClassPrepa return false; } - final String[] title = new String[] {DebuggerBundle.message("title.error.evaluating.breakpoint.condition") }; + final String[] title = {DebuggerBundle.message("title.error.evaluating.breakpoint.condition") }; try { final StackFrameProxyImpl frameProxy = context.getThread().frame(0); @@ -245,7 +243,7 @@ public abstract class Breakpoint extends FilteredRequestor implements ClassPrepa updateUI(EmptyRunnable.getInstance()); } - public void updateUI(final Runnable afterUpdate) { + public void updateUI(@NotNull Runnable afterUpdate) { } public void delete() { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java index 48527a7e4c76..4eff6bc5adcf 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java @@ -36,6 +36,7 @@ import com.intellij.openapi.ui.ComboBox; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.FixedSizeButton; import com.intellij.openapi.util.Key; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.ui.FieldPanel; @@ -90,7 +91,7 @@ public abstract class BreakpointPropertiesPanel { private JButton myMakeDefaultButton; ButtonGroup mySuspendPolicyGroup; - public static final @NonNls String CONTROL_LOG_MESSAGE = "logMessage"; + @NonNls public static final String CONTROL_LOG_MESSAGE = "logMessage"; private BreakpointComboboxHandler myBreakpointComboboxHandler; private static final int MAX_COMBO_WIDTH = 300; private final FixedSizeButton myConditionMagnifierButton; @@ -220,8 +221,7 @@ public abstract class BreakpointPropertiesPanel { public void actionPerformed(ActionEvent e) { reloadClassFilters(); - ClassFilter classFilter; - classFilter = createClassConditionFilter(); + ClassFilter classFilter = createClassConditionFilter(); EditClassFiltersDialog _dialog = new EditClassFiltersDialog(myProject, classFilter); _dialog.setFilters(myClassFilters, myClassExclusionFilters); @@ -321,7 +321,7 @@ public abstract class BreakpointPropertiesPanel { */ public void initFrom(Breakpoint breakpoint) { myBreakpointComboboxHandler.initFrom(breakpoint); - myPassCountField.setText((breakpoint.COUNT_FILTER > 0)? Integer.toString(breakpoint.COUNT_FILTER) : ""); + myPassCountField.setText(breakpoint.COUNT_FILTER > 0 ? Integer.toString(breakpoint.COUNT_FILTER) : ""); PsiElement context = breakpoint.getEvaluationElement(); myPassCountCheckbox.setSelected(breakpoint.COUNT_FILTER_ENABLED); @@ -367,7 +367,7 @@ public abstract class BreakpointPropertiesPanel { /** * Save values in the UI components to the breakpoint object */ - public void saveTo(Breakpoint breakpoint, Runnable afterUpdate) { + public void saveTo(Breakpoint breakpoint, @NotNull Runnable afterUpdate) { myBreakpointComboboxHandler.saveTo(breakpoint, myLeaveEnabledRadioButton.isSelected()); try { String text = myPassCountField.getText().trim(); @@ -379,11 +379,11 @@ public abstract class BreakpointPropertiesPanel { } catch (Exception e) { } - breakpoint.COUNT_FILTER_ENABLED = breakpoint.COUNT_FILTER > 0? myPassCountCheckbox.isSelected() : false; + breakpoint.COUNT_FILTER_ENABLED = breakpoint.COUNT_FILTER > 0 && myPassCountCheckbox.isSelected(); breakpoint.setCondition(myConditionCombo.getText()); - breakpoint.CONDITION_ENABLED = !breakpoint.getCondition().isEmpty() ? myConditionCheckbox.isSelected() : false; + breakpoint.CONDITION_ENABLED = !breakpoint.getCondition().isEmpty() && myConditionCheckbox.isSelected(); breakpoint.setLogMessage(myLogExpressionCombo.getText()); - breakpoint.LOG_EXPRESSION_ENABLED = !breakpoint.getLogMessage().isEmpty()? myLogExpressionCheckBox.isSelected() : false; + breakpoint.LOG_EXPRESSION_ENABLED = !breakpoint.getLogMessage().isEmpty() && myLogExpressionCheckBox.isSelected(); breakpoint.LOG_ENABLED = myLogMessageCheckBox.isSelected(); breakpoint.SUSPEND_POLICY = getSelectedSuspendPolicy(); reloadInstanceFilters(); @@ -391,8 +391,8 @@ public abstract class BreakpointPropertiesPanel { updateInstanceFilterEditor(true); updateClassFilterEditor(true); - breakpoint.INSTANCE_FILTERS_ENABLED = myInstanceFiltersField.getText().length() > 0 ? myInstanceFiltersCheckBox.isSelected() : false; - breakpoint.CLASS_FILTERS_ENABLED = myClassFiltersField.getText().length() > 0 ? myClassFiltersCheckBox.isSelected() : false; + breakpoint.INSTANCE_FILTERS_ENABLED = myInstanceFiltersField.getText().length() > 0 && myInstanceFiltersCheckBox.isSelected(); + breakpoint.CLASS_FILTERS_ENABLED = myClassFiltersField.getText().length() > 0 && myClassFiltersCheckBox.isSelected(); breakpoint.setClassFilters(myClassFilters); breakpoint.setClassExclusionFilters(myClassExclusionFilters); breakpoint.setInstanceFilters(myInstanceFilters); @@ -402,21 +402,11 @@ public abstract class BreakpointPropertiesPanel { breakpoint.updateUI(afterUpdate); } - private String concatWith(List s, String concator) { - String result = ""; - for (Iterator iterator = s.iterator(); iterator.hasNext();) { - String str = (String) iterator.next(); - result += str + concator; - } - if (result.length() > 0) { - return result.substring(0, result.length() - concator.length()); - } - else { - return ""; - } + private static String concatWith(List s, String concator) { + return StringUtil.join(s, concator); } - private String concatWithEx(List s, String concator, int N, String NthConcator) { + private static String concatWithEx(List s, String concator, int N, String NthConcator) { String result = ""; int i = 1; for (Iterator iterator = s.iterator(); iterator.hasNext(); i++) { @@ -435,9 +425,8 @@ public abstract class BreakpointPropertiesPanel { private void updateInstanceFilterEditor(boolean updateText) { List filters = new ArrayList(); - for (int i = 0; i < myInstanceFilters.length; i++) { - InstanceFilter instanceFilter = myInstanceFilters[i]; - if(instanceFilter.isEnabled()) { + for (InstanceFilter instanceFilter : myInstanceFilters) { + if (instanceFilter.isEnabled()) { filters.add(Long.toString(instanceFilter.getId())); } } @@ -465,38 +454,35 @@ public abstract class BreakpointPropertiesPanel { } } } - for (int i = 0; i < myInstanceFilters.length; i++) { - InstanceFilter instanceFilter = myInstanceFilters[i]; - if(!instanceFilter.isEnabled()) idxs.add(instanceFilter); + for (InstanceFilter instanceFilter : myInstanceFilters) { + if (!instanceFilter.isEnabled()) idxs.add(instanceFilter); } myInstanceFilters = idxs.toArray(new InstanceFilter[idxs.size()]); } private void updateClassFilterEditor(boolean updateText) { List filters = new ArrayList(); - for (int i = 0; i < myClassFilters.length; i++) { - com.intellij.ui.classFilter.ClassFilter classFilter = myClassFilters[i]; - if(classFilter.isEnabled()) { + for (com.intellij.ui.classFilter.ClassFilter classFilter : myClassFilters) { + if (classFilter.isEnabled()) { filters.add(classFilter.getPattern()); } } List excludeFilters = new ArrayList(); - for (int i = 0; i < myClassExclusionFilters.length; i++) { - com.intellij.ui.classFilter.ClassFilter classFilter = myClassExclusionFilters[i]; - if(classFilter.isEnabled()) { + for (com.intellij.ui.classFilter.ClassFilter classFilter : myClassExclusionFilters) { + if (classFilter.isEnabled()) { excludeFilters.add("-" + classFilter.getPattern()); } } if (updateText) { String editorText = concatWith(filters, " "); - if(filters.size() > 0) editorText += " "; + if(!filters.isEmpty()) editorText += " "; editorText += concatWith(excludeFilters, " "); myClassFiltersField.setText(editorText); } int width = (int)Math.sqrt(myClassExclusionFilters.length + myClassFilters.length) + 1; String tipText = concatWithEx(filters, " ", width, "\n"); - if(filters.size() > 0) tipText += "\n"; + if(!filters.isEmpty()) tipText += "\n"; tipText += concatWithEx(excludeFilters, " ", width, "\n"); myClassFiltersField.getTextField().setToolTipText(tipText); @@ -522,13 +508,11 @@ public abstract class BreakpointPropertiesPanel { } } } - for (int i = 0; i < myClassFilters.length; i++) { - com.intellij.ui.classFilter.ClassFilter classFilter = myClassFilters[i]; - if(!classFilter.isEnabled()) classFilters.add(classFilter); + for (com.intellij.ui.classFilter.ClassFilter classFilter : myClassFilters) { + if (!classFilter.isEnabled()) classFilters.add(classFilter); } - for (int i = 0; i < myClassExclusionFilters.length; i++) { - com.intellij.ui.classFilter.ClassFilter classFilter = myClassExclusionFilters[i]; - if(!classFilter.isEnabled()) exclusionFilters.add(classFilter); + for (com.intellij.ui.classFilter.ClassFilter classFilter : myClassExclusionFilters) { + if (!classFilter.isEnabled()) exclusionFilters.add(classFilter); } myClassFilters = classFilters .toArray(new com.intellij.ui.classFilter.ClassFilter[classFilters .size()]); myClassExclusionFilters = exclusionFilters.toArray(new com.intellij.ui.classFilter.ClassFilter[exclusionFilters.size()]); @@ -537,18 +521,17 @@ public abstract class BreakpointPropertiesPanel { public void setEnabled(boolean enabled) { myPanel.setEnabled(enabled); Component[] components = myPanel.getComponents(); - for (int i = 0; i < components.length; i++) { - Component component = components[i]; + for (Component component : components) { component.setEnabled(enabled); } } protected void updateCheckboxes() { - JCheckBox [] checkBoxes = new JCheckBox[] { myConditionCheckbox, myInstanceFiltersCheckBox, myClassFiltersCheckBox}; + JCheckBox [] checkBoxes = { myConditionCheckbox, myInstanceFiltersCheckBox, myClassFiltersCheckBox }; JCheckBox selected = null; - for(int i =0; i < checkBoxes.length; i++) { - if(checkBoxes[i].isSelected()) { - selected = checkBoxes[i]; + for (JCheckBox checkBoxe : checkBoxes) { + if (checkBoxe.isSelected()) { + selected = checkBoxe; break; } } @@ -559,8 +542,8 @@ public abstract class BreakpointPropertiesPanel { myPassCountCheckbox.setEnabled(true); } - for(int i =0; i < checkBoxes.length; i++) { - checkBoxes[i].setEnabled (!myPassCountCheckbox.isSelected()); + for (JCheckBox checkBoxe : checkBoxes) { + checkBoxe.setEnabled(!myPassCountCheckbox.isSelected()); } myPassCountField.setEditable(myPassCountCheckbox.isSelected()); @@ -597,9 +580,8 @@ public abstract class BreakpointPropertiesPanel { } public void selectBreakpoint(Breakpoint breakpoint) { - for (int idx = 0; idx < myItems.length; idx++) { - final ComboboxItem item = myItems[idx]; - if (breakpoint == null? item.getBreakpoint() == null : breakpoint.equals(item.getBreakpoint())) { + for (final ComboboxItem item : myItems) { + if (breakpoint == null ? item.getBreakpoint() == null : breakpoint.equals(item.getBreakpoint())) { if (!item.equals(getSelectedItem())) { setSelectedItem(item); } @@ -636,7 +618,7 @@ public abstract class BreakpointPropertiesPanel { } public int hashCode() { - return (breakpoint != null ? breakpoint.hashCode() : 0); + return breakpoint != null ? breakpoint.hashCode() : 0; } } @@ -705,8 +687,9 @@ public abstract class BreakpointPropertiesPanel { setText(text); final Icon icon; if (breakpoint != null) { - icon = (breakpoint instanceof BreakpointWithHighlighter)? - breakpoint.ENABLED? ((BreakpointWithHighlighter)breakpoint).getSetIcon(false) : ((BreakpointWithHighlighter)breakpoint).getDisabledIcon(false) : breakpoint.getIcon(); + icon = breakpoint instanceof BreakpointWithHighlighter ? + breakpoint.ENABLED? ((BreakpointWithHighlighter)breakpoint).getSetIcon(false) : ((BreakpointWithHighlighter)breakpoint) + .getDisabledIcon(false) : breakpoint.getIcon(); } else { icon = null; diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpointPropertiesPanel.java index 9de67e05caa9..5f55eb9c5ea6 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpointPropertiesPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpointPropertiesPanel.java @@ -23,6 +23,7 @@ package com.intellij.debugger.ui.breakpoints; import com.intellij.debugger.DebuggerBundle; import com.intellij.ide.util.ClassFilter; import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -99,7 +100,7 @@ public class ExceptionBreakpointPropertiesPanel extends BreakpointPropertiesPane myNotifyUncaughtCheckBox.setSelected(exceptionBreakpoint.NOTIFY_UNCAUGHT); } - public void saveTo(Breakpoint breakpoint, Runnable afterUpdate) { + public void saveTo(Breakpoint breakpoint, @NotNull Runnable afterUpdate) { ExceptionBreakpoint exceptionBreakpoint = (ExceptionBreakpoint)breakpoint; exceptionBreakpoint.NOTIFY_CAUGHT = myNotifyCaughtCheckBox.isSelected(); exceptionBreakpoint.NOTIFY_UNCAUGHT = myNotifyUncaughtCheckBox.isSelected(); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java index 4627d9317a32..476b47988e99 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java @@ -22,6 +22,7 @@ package com.intellij.debugger.ui.breakpoints; import com.intellij.debugger.DebuggerBundle; import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -90,7 +91,7 @@ public class FieldBreakpointPropertiesPanel extends BreakpointPropertiesPanel { myWatchModificationCheckBox.setSelected(fieldBreakpoint.WATCH_MODIFICATION); } - public void saveTo(Breakpoint breakpoint, Runnable afterUpdate) { + public void saveTo(Breakpoint breakpoint, @NotNull Runnable afterUpdate) { FieldBreakpoint fieldBreakpoint = (FieldBreakpoint)breakpoint; fieldBreakpoint.WATCH_ACCESS = myWatchAccessCheckBox.isSelected(); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java index 65b0541cb3c7..d09bcd2443a8 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java @@ -22,6 +22,7 @@ package com.intellij.debugger.ui.breakpoints; import com.intellij.debugger.DebuggerBundle; import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -95,7 +96,7 @@ public class MethodBreakpointPropertiesPanel extends BreakpointPropertiesPanel { } } - public void saveTo(Breakpoint breakpoint, Runnable afterUpdate) { + public void saveTo(Breakpoint breakpoint, @NotNull Runnable afterUpdate) { if (breakpoint instanceof MethodBreakpoint) { MethodBreakpoint methodBreakpoint = (MethodBreakpoint)breakpoint; methodBreakpoint.WATCH_ENTRY = myWatchEntryCheckBox.isSelected(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java index 8b670d4abea0..0a1a558886b4 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java @@ -37,6 +37,7 @@ import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.colors.CodeInsightColors; import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.colors.TextAttributesKey; +import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.keymap.Keymap; import com.intellij.openapi.keymap.KeymapManager; import com.intellij.openapi.keymap.KeymapUtil; @@ -106,6 +107,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass InspectionProfileWrapper customProfile = file.getUserData(InspectionProfileWrapper.KEY); myProfileWrapper = customProfile == null ? InspectionProjectProfileManager.getInstance(myProject).getProfileWrapper() : customProfile; mySeverityRegistrar = ((SeverityProvider)myProfileWrapper.getInspectionProfile().getProfileManager()).getSeverityRegistrar(); + LOG.assertTrue(mySeverityRegistrar != null); // initial guess setProgressLimit(300 * 2); @@ -391,7 +393,9 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass boolean isFileLevel = element instanceof PsiFile && textRange.equals(element.getTextRange()); final HighlightSeverity severity = highlightInfoType.getSeverity(element); - return new HighlightInfo(mySeverityRegistrar.getTextAttributesBySeverity(severity), highlightInfoType, textRange.getStartOffset(), textRange.getEndOffset(), message, toolTip, + TextAttributes attributes = mySeverityRegistrar.getTextAttributesBySeverity(severity); + return new HighlightInfo(attributes, highlightInfoType, textRange.getStartOffset(), + textRange.getEndOffset(), message, toolTip, severity, problemDescriptor.isAfterEndOfLine(), null, isFileLevel); } @@ -547,7 +551,8 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass List editables = ilManager.intersectWithAllEditableFragments(file, new TextRange(info.startOffset, info.endOffset)); for (TextRange editable : editables) { TextRange hostRange = ((DocumentWindow)documentRange).injectedToHost(editable); - HighlightInfo patched = HighlightInfo.createHighlightInfo(info.type, psiElement, hostRange.getStartOffset(), hostRange.getEndOffset(), info.description, info.toolTip); + HighlightInfo patched = HighlightInfo.createHighlightInfo(info.type, psiElement, hostRange.getStartOffset(), + hostRange.getEndOffset(), info.description, info.toolTip); if (patched != null) { registerQuickFixes(tool, descriptor, patched, emptyActionRegistered); outInfos.add(patched); diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java index 043258a01e1c..7c1e4fa0aa63 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java @@ -38,6 +38,7 @@ import org.jetbrains.annotations.NotNull; import java.awt.*; import java.util.ArrayList; +import java.util.Arrays; public class DiffManagerImpl extends DiffManager implements JDOMExternalizable { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.external.DiffManagerImpl"); @@ -86,7 +87,7 @@ public class DiffManagerImpl extends DiffManager implements JDOMExternalizable { public DiffTool getIdeaDiffTool() { return INTERNAL_DIFF; } public DiffTool getDiffTool() { - DiffTool[] standardTools = new DiffTool[]{ + DiffTool[] standardTools = { ExtCompareFolders.INSTANCE, ExtCompareFiles.INSTANCE, INTERNAL_DIFF, @@ -94,10 +95,7 @@ public class DiffManagerImpl extends DiffManager implements JDOMExternalizable { BinaryDiffTool.INSTANCE }; ArrayList allTools = new ArrayList(myAdditionTools); - for (int i = 0; i < standardTools.length; i++) { - DiffTool standardTool = standardTools[i]; - allTools.add(standardTool); - } + allTools.addAll(Arrays.asList(standardTools)); return new CompositeDiffTool(allTools); } @@ -133,8 +131,7 @@ public class DiffManagerImpl extends DiffManager implements JDOMExternalizable { final String policyName = element.getAttributeValue(COMPARISON_POLICY_ATTR_NAME); if (policyName != null) { ComparisonPolicy[] policies = ComparisonPolicy.getAllInstances(); - for (int i = 0; i < policies.length; i++) { - ComparisonPolicy policy = policies[i]; + for (ComparisonPolicy policy : policies) { if (policy.getName().equals(policyName)) { myComparisonPolicy = policy; break;