From 9ccd2289699eef89824fc09fea28c1703e8790ad Mon Sep 17 00:00:00 2001 From: "Svetlana.Zemlyanskay" Date: Thu, 11 Sep 2014 12:29:27 +0400 Subject: [PATCH] IDEA-95372 Arrangement: Provide visual indication for duplicate rules --- .../match/ArrangementMatchingRulesControl.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java index 08ba7df1c637..a77e5cce28f0 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java @@ -540,18 +540,12 @@ public class ArrangementMatchingRulesControl extends JBTable { final Object target = getModel().getElementAt(index); if (target instanceof StdArrangementMatchRule) { - final Set rules = ContainerUtil.newHashSet(); for (int i = 0; i < index; i++) { final Object element = getModel().getElementAt(i); - if (element instanceof StdArrangementMatchRule) { - final StdArrangementMatchRule rule = (StdArrangementMatchRule)element; - rules.add(rule.toString()); + if (element instanceof StdArrangementMatchRule && target.equals(element)) { + return ApplicationBundle.message("arrangement.settings.validation.duplicate.matching.rule"); } } - - if (rules.contains(target.toString())) { - return ApplicationBundle.message("arrangement.settings.validation.duplicate.matching.rule"); - } } return null; }