Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

merge with master and fixes after comments

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-09-27 23:34:00 +02:00
parent 33795e7046
commit 92f2e7b0fc
10 changed files with 186 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
briar-core/src/org/briarproject/clients/MessageTreeImpl.java
View File

@@ -77,10 +77,13 @@ public class MessageTreeImpl<T extends MessageTree.MessageNode>
}
private void traverse(List<T> list, T node) {
private void traverse(List<T> list, T node, int level) {
list.add(node);
for (T child : nodeMap.get(node.getId())) {
traverse(list, child);
List<T> children = nodeMap.get(node.getId());
node.setLevel(level);
node.setDescendantCount(children.size());
for (T child : children) {
traverse(list, child, level+1);
}
}
@@ -98,7 +101,7 @@ public class MessageTreeImpl<T extends MessageTree.MessageNode>
public synchronized Collection<T> depthFirstOrder() {
List<T> orderedList = new ArrayList<T>();
for (T root : roots) {
traverse(orderedList, root);
traverse(orderedList, root, 0);
}
return Collections.unmodifiableList(orderedList);
}