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

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

Browse Source 
Corrected arrangement node user data comparison for tree root case (no settings node is available)
This commit is contained in:
Denis.Zhdanov
2012-08-22 23:52:02 +04:00
parent e4c4ad1643
commit d2cb3f70ed
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtil.java
+6 -4
View File
@@ -339,7 +339,7 @@ public class ArrangementConfigUtil {
//region Insert nodes.
int insertionIndex = root.getChildCount() < childCountBefore ? childCountBefore - 1 : childCountBefore;
boolean merged = insert(root, insertionIndex, replacement, treeModel);
insert(root, insertionIndex, replacement, treeModel);
if (cutHierarchy != null) {
List<ArrangementTreeNode> toInsert = new ArrayList<ArrangementTreeNode>();
if (hasEqualSetting(root, cutHierarchy)) {
@@ -529,9 +529,11 @@ public class ArrangementConfigUtil {
private static boolean hasEqualSetting(@NotNull ArrangementTreeNode node1, @NotNull ArrangementTreeNode node2) {
ArrangementSettingsNode setting1 = node1.getBackingSetting();
ArrangementSettingsNode setting2 = node2.getBackingSetting();
if (setting1 == null || setting2 == null) {
return false;
if (setting1 == null) {
return setting2 == null;
}
else {
return setting1.equals(setting2);
}
return setting1.equals(setting2);
}
}