MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

WI-23563 PHP Code Arrangement is not saved/applied

Browse Source
This commit is contained in:
Svetlana.Zemlyanskay
2014-09-10 16:34:25 +04:00
parent 71b08d0441
commit c35d8ceb1e
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingRulesControl.java
+12 -7
View File
@@ -38,6 +38,7 @@ import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* @author Denis Zhdanov
@@ -95,17 +96,21 @@ public class ArrangementGroupingRulesControl extends JBTable {
model.removeRow(model.getRowCount() - 1);
}
List<ArrangementSettingsToken> types = ContainerUtilRt.newArrayList(myComponents.keySet());
final Set<ArrangementSettingsToken> groupingTokens = ContainerUtilRt.newHashSet(myComponents.keySet());
for (ArrangementGroupingRule rule : rules) {
final ArrangementSettingsToken groupingType = rule.getGroupingType();
ArrangementGroupingComponent component = myComponents.get(groupingType);
component.setSelected(true);
component.setOrderType(rule.getOrderType());
model.addRow(new Object[]{component});
groupingTokens.remove(groupingType);
}
List<ArrangementSettingsToken> types = ContainerUtilRt.newArrayList(groupingTokens);
types = mySettingsManager.sort(types);
for (ArrangementSettingsToken type : types) {
model.addRow(new Object[]{myComponents.get(type)});
}
for (ArrangementGroupingRule rule : rules) {
ArrangementGroupingComponent component = myComponents.get(rule.getGroupingType());
component.setSelected(true);
ArrangementSettingsToken orderType = rule.getOrderType();
component.setOrderType(orderType);
}
}
@NotNull