Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Introduce client layer events for forums

Browse Source 
The forum UI depended on sync layer events such as MessageStateChangedEvent.
Now, the forum client broadcasts its own high-level event (`ForumPostReceivedEvent`)
with the information the UI needs (`ForumPostHeader`).

Closes #310
This commit is contained in:
Torsten Grote
2016-07-08 16:12:52 -03:00
parent 9ff4758683
commit e1bdede4f5
12 changed files with 229 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,8 +14,9 @@ import java.util.Map;
public class MessageTreeImpl<T extends MessageTree.MessageNode>
implements MessageTree<T> {
Map<MessageId, List<T>> nodeMap = new HashMap<MessageId, List<T>>();
List<T> roots = new ArrayList<T>();
private final Map<MessageId, List<T>> nodeMap = new HashMap<MessageId, List<T>>();
private final List<T> roots = new ArrayList<T>();
private final List<List<T>> unsortedLists = new ArrayList<List<T>>();
private Comparator<T> comparator = new Comparator<T>() {
@Override
@@ -38,26 +39,44 @@ public class MessageTreeImpl<T extends MessageTree.MessageNode>
}
// parse the nodes for dependencies
for (T node : nodes) {
if (node.getParentId() == null) {
roots.add(node);
}
else {
// retrieve the parent's children
List<T> pChildren = nodeMap.get(node.getParentId());
pChildren.add(node);
}
parseNode(node);
}
sortAll();
sortUnsorted();
}
private void sortAll() {
Collections.sort(roots, comparator);
// Sort all the sub-lists
for (Map.Entry<MessageId, List<T>> entry: nodeMap.entrySet()) {
Collections.sort(entry.getValue(), comparator);
@Override
public void add(T node) {
add(Collections.singletonList(node));
}
private void markAsUnsorted(List<T> list) {
if (!unsortedLists.contains(list))
unsortedLists.add(list);
}
private void parseNode(T node) {
if (node.getParentId() == null) {
roots.add(node);
markAsUnsorted(roots);
} else {
// retrieve the parent's children
List<T> pChildren = nodeMap.get(node.getParentId());
pChildren.add(node);
markAsUnsorted(pChildren);
}
}
private void sortUnsorted() {
// leave unsorted if there is no comparator
if (comparator != null) {
for (List<T> list : unsortedLists) {
Collections.sort(list, comparator);
}
unsortedLists.clear();
}
}
private void traverse(List<T> list, T node) {
list.add(node);
for (T child : nodeMap.get(node.getId())) {
@@ -65,6 +84,16 @@ public class MessageTreeImpl<T extends MessageTree.MessageNode>
}
}
@Override
public void setComparator(Comparator<T> comparator) {
this.comparator = comparator;
// Sort all lists with the new comparator
Collections.sort(roots, comparator);
for (Map.Entry<MessageId, List<T>> entry: nodeMap.entrySet()) {
Collections.sort(entry.getValue(), comparator);
}
}
@Override
public Collection<T> depthFirstOrder() {
List<T> orderedList = new ArrayList<T>();
@@ -74,9 +103,4 @@ public class MessageTreeImpl<T extends MessageTree.MessageNode>
return Collections.unmodifiableList(orderedList);
}
@Override
public void setComparator(Comparator<T> comparator) {
this.comparator = comparator;
}
}