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

TreeState: prefer matched user objects over ids

Browse Source
This commit is contained in:
Gregory.Shrago
2017-04-27 17:03:59 +03:00
parent a213de7657
commit 386d52a6af
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/ide/util/treeView/TreeState.java
+22 -6
View File
@@ -32,6 +32,7 @@ import com.intellij.util.ui.tree.TreeUtil;
import com.intellij.util.xmlb.XmlSerializer;
import com.intellij.util.xmlb.annotations.Attribute;
import com.intellij.util.xmlb.annotations.Tag;
import org.intellij.lang.annotations.MagicConstant;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -61,6 +62,10 @@ public class TreeState implements JDOMExternalizable {
private static final String SELECT_TAG = "select";
private static final String PATH_TAG = "path";
private static final int NOT_MATCHED = 0;
private static final int ID_MATCHED = 1;
private static final int OBJECT_MATCHED = 2;
@Tag("item")
static class PathElement {
@Attribute("name")
@@ -246,7 +251,7 @@ public class TreeState implements JDOMExternalizable {
for (List<PathElement> path : myExpandedPaths) {
if (path.isEmpty()) continue;
int index = rootPath.getPathCount() - 1;
if (!pathMatches(path.get(index), rootPath.getPathComponent(index))) continue;
if (pathMatches(path.get(index), rootPath.getPathComponent(index)) == NOT_MATCHED) continue;
expandImpl(0, path, rootPath, tree, indicator);
}
}
@@ -275,11 +280,21 @@ public class TreeState implements JDOMExternalizable {
private static TreePath findMatchedChild(@NotNull TreeModel model, @NotNull TreePath treePath, @NotNull PathElement pathElement) {
Object parent = treePath.getLastPathComponent();
int childCount = model.getChildCount(parent);
boolean idMatchedFound = false;
Object idMatchedChild = null;
for (int j = 0; j < childCount; j++) {
Object child = model.getChild(parent, j);
if (pathMatches(pathElement, child)) {
int match = pathMatches(pathElement, child);
if (match == OBJECT_MATCHED) {
return treePath.pathByAddingChild(child);
}
else if (match == ID_MATCHED && !idMatchedFound) {
idMatchedChild = child;
idMatchedFound = true;
}
}
if (idMatchedFound) {
return treePath.pathByAddingChild(idMatchedChild);
}
if (childCount > 0) {
@@ -291,11 +306,12 @@ public class TreeState implements JDOMExternalizable {
return null;
}
private static boolean pathMatches(@NotNull PathElement pe, Object child) {
@MagicConstant(intValues = {NOT_MATCHED, ID_MATCHED, OBJECT_MATCHED})
private static int pathMatches(@NotNull PathElement pe, Object child) {
Object userObject = TreeUtil.getUserObject(child);
if (pe.userObject != null && pe.userObject.equals(userObject)) return true;
if (pe.userObject != null && pe.userObject.equals(userObject)) return OBJECT_MATCHED;
return Comparing.equal(pe.id, calcId(userObject)) &&
Comparing.equal(pe.type, calcType(userObject));
Comparing.equal(pe.type, calcType(userObject)) ? ID_MATCHED : NOT_MATCHED;
}
private static void expandImpl(int positionInPath,
@@ -316,7 +332,7 @@ public class TreeState implements JDOMExternalizable {
int childCount = model.getChildCount(parent);
for (int j = 0; j < childCount; j++) {
Object child = tree.tree.getModel().getChild(parent, j);
if (pathMatches(next, child)) {
if (pathMatches(next, child) != NOT_MATCHED) {
expandImpl(positionInPath + 1, path, treePath.pathByAddingChild(child), tree, indicator);
break;
}