IDEA-19061 Integrate the Rearranger-plugin into core-IDEA

1. Changed arrangement rules are correctly persistet and restored at the code style settings xml now;
2. Refactoring;
This commit is contained in:
Denis.Zhdanov
2012-08-28 15:43:59 +04:00
parent fe67ea17dc
commit 8df3da1cd3
16 changed files with 131 additions and 83 deletions
@@ -16,8 +16,8 @@
package com.intellij.application.options.codeStyle.arrangement;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.codeStyle.arrangement.ArrangementRule;
import com.intellij.psi.codeStyle.arrangement.JavaRearranger;
import com.intellij.psi.codeStyle.arrangement.StdArrangementRule;
import com.intellij.psi.codeStyle.arrangement.match.ArrangementEntryType;
import com.intellij.psi.codeStyle.arrangement.match.ArrangementModifier;
import com.intellij.psi.codeStyle.arrangement.match.StdArrangementEntryMatcher;
@@ -60,7 +60,7 @@ public abstract class AbstractArrangementRuleEditingModelTest {
protected void configure(@NotNull ArrangementMatchCondition matchCondition) {
Pair<ArrangementRuleEditingModelImpl,TIntIntHashMap> pair = myBuilder.build(
new ArrangementRule<StdArrangementEntryMatcher>(new StdArrangementEntryMatcher(matchCondition)), myTree, myRoot, null, myGrouper
new StdArrangementRule(new StdArrangementEntryMatcher(matchCondition)), myTree, myRoot, null, myGrouper
);
myRowMappings.put(pair.first.getRow(), pair.first);
}