diff options
| author |  Laurent Le Brun <laurentlb@google.com> | 2015-09-03 13:59:44 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-09-03 14:42:33 +0000 |
| commit | 54733f93471af0cbe63e9f32a522971dbd193a3e (patch) | |
| tree | d7ae030fd727d129f80dd137cf6df3f5ba4fba41 /src/main/java/com/google/devtools/build/lib/graph | |
| parent | 31d6bba4ec2041926063d26c7b53befcb647e8d5 (diff) | |
Code cleanup
--
MOS_MIGRATED_REVID=102239051
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/graph')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/graph/DFS.java | 5 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/graph/Node.java | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/graph/DFS.java b/src/main/java/com/google/devtools/build/lib/graph/DFS.java index 7930a2faa4..77ad5d9a94 100644 --- a/src/main/java/com/google/devtools/build/lib/graph/DFS.java +++ b/src/main/java/com/google/devtools/build/lib/graph/DFS.java @@ -14,7 +14,7 @@ package com.google.devtools.build.lib.graph; -import com.google.common.collect.Lists; +import com.google.common.collect.Ordering; import java.util.Collection; import java.util.Collections; @@ -102,8 +102,7 @@ public class DFS<T> { Collection<Node<T>> edgeTargets = transpose ? node.getPredecessors() : node.getSuccessors(); if (edgeOrder != null) { - List<Node<T>> mutableNodeList = Lists.newArrayList(edgeTargets); - Collections.sort(mutableNodeList, edgeOrder); + List<Node<T>> mutableNodeList = Ordering.from(edgeOrder).sortedCopy(edgeTargets); edgeTargets = mutableNodeList; } diff --git a/src/main/java/com/google/devtools/build/lib/graph/Node.java b/src/main/java/com/google/devtools/build/lib/graph/Node.java index d271ca0f78..b873b52262 100644 --- a/src/main/java/com/google/devtools/build/lib/graph/Node.java +++ b/src/main/java/com/google/devtools/build/lib/graph/Node.java @@ -13,10 +13,11 @@ // limitations under the License. package com.google.devtools.build.lib.graph; +import com.google.common.collect.Sets; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.List; /** @@ -173,8 +174,8 @@ public final class Node<T> { return true; } else if (previousSize == ARRAYLIST_THRESHOLD) { // ArrayList -> HashSet - Collection<Node<T>> newSet = new HashSet<>(INITIAL_HASHSET_CAPACITY); - newSet.addAll(set); + Collection<Node<T>> newSet = Sets.newHashSetWithExpectedSize(INITIAL_HASHSET_CAPACITY); + newSet.addAll(set); newSet.add(value); return updateField(predecessorSet, newSet); } else { |