You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2017/05/04 12:09:25 UTC
svn commit: r1793791 -
/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
Author: desruisseaux
Date: Thu May 4 12:09:25 2017
New Revision: 1793791
URL: http://svn.apache.org/viewvc?rev=1793791&view=rev
Log:
Avoid constructing the list of children nodes if not needed.
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java?rev=1793791&r1=1793790&r2=1793791&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java [UTF-8] Thu May 4 12:09:25 2017
@@ -794,13 +794,26 @@ class TreeNode implements Node {
}
/**
+ * Returns the children if the value policy is {@link ValueExistencePolicy#COMPACT}, or {@code null} otherwise.
+ */
+ private TreeNodeChildren getCompactChildren() {
+ if (table.valuePolicy == ValueExistencePolicy.COMPACT) {
+ final Collection<Node> children = getChildren();
+ if (children instanceof TreeNodeChildren) {
+ return (TreeNodeChildren) children;
+ }
+ }
+ return null;
+ }
+
+ /**
* Returns the value of this node in the given column, or {@code null} if none. This method verifies
* the {@code column} argument, then delegates to {@link #getName()}, {@link #getUserObject()} or
* other properties.
*/
@Override
public final <V> V getValue(final TableColumn<V> column) {
- Object value;
+ Object value = null;
ArgumentChecks.ensureNonNull("column", column);
if (column == TableColumn.IDENTIFIER) {
value = getIdentifier();
@@ -812,23 +825,23 @@ class TreeNode implements Node {
}
value = name;
} else if (column == TableColumn.TYPE) {
- final Collection<Node> children = getChildren();
- if (children == LEAF || (value = ((TreeNodeChildren) children).getParentType()) == null) {
+ final TreeNodeChildren children = getCompactChildren();
+ if (children == null || (value = children.getParentType()) == null) {
value = baseType;
}
} else if (column == TableColumn.VALUE) {
- final Collection<Node> children = getChildren();
- if (children == LEAF) {
+ if (isLeaf()) {
value = cachedValue;
cachedValue = null; // Use the cached value only once after iteration.
if (value == null) {
value = getUserObject();
}
} else {
- value = ((TreeNodeChildren) children).getParentTitle();
+ final TreeNodeChildren children = getCompactChildren();
+ if (children != null) {
+ value = children.getParentTitle();
+ }
}
- } else {
- return null;
}
return column.getElementType().cast(value);
}
@@ -848,8 +861,8 @@ class TreeNode implements Node {
if (column == TableColumn.VALUE) {
ArgumentChecks.ensureNonNull("value", value); // See javadoc.
cachedValue = null;
- final Collection<Node> children = getChildren();
- if (children == LEAF || !(((TreeNodeChildren) children).setParentTitle(value))) {
+ final TreeNodeChildren children = getCompactChildren();
+ if (children == null || !(children.setParentTitle(value))) {
setUserObject(value);
}
} else if (TreeTableView.COLUMNS.contains(column)) {