diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/newui/ArrangementMatchingRulesList.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/newui/ArrangementMatchingRulesList.java index e46795b98f3e..f61b5160557e 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/newui/ArrangementMatchingRulesList.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/newui/ArrangementMatchingRulesList.java @@ -33,6 +33,7 @@ import javax.swing.event.ListSelectionListener; import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -169,8 +170,17 @@ public class ArrangementMatchingRulesList extends JBList { @NotNull public List getRules() { - // TODO den implement - return Collections.emptyList(); + if (myModel.isEmpty()) { + return Collections.emptyList(); + } + List result = new ArrayList(); + for (int i = 0; i < myModel.size(); i++) { + Object element = myModel.get(i); + if (element instanceof StdArrangementMatchRule) { + result.add((StdArrangementMatchRule)element); + } + } + return result; } public void repaintRows(int first, int last) { diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/newui/ArrangementSettingsPanel2.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/newui/ArrangementSettingsPanel2.java index 2848c631fb8d..5ea4ad590402 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/newui/ArrangementSettingsPanel2.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/newui/ArrangementSettingsPanel2.java @@ -112,8 +112,9 @@ public abstract class ArrangementSettingsPanel2 extends CodeStyleAbstractPanel { @Override public boolean isModified(CodeStyleSettings settings) { StdArrangementSettings s = new StdArrangementSettings(myMatchingRulesPanel.getRules()); + return false; // TODO den add grouping rules support - return !Comparing.equal(getSettings(settings), s); + //return !Comparing.equal(getSettings(settings), s); } @Override