Basic tree factory

git-svn-id: https://develop.sub.uni-goettingen.de/repos/textgrid/trunk/services/aggregator@14088 7c539038-3410-0410-b1ec-0f2a7bf1c452

src/main/java/info/textgrid/services/aggregator/tree/Aggregation.java

@@ -2,10 +2,25 @@
 
 import info.textgrid.namespaces.metadata.core._2010.ObjectType;
 
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
 public class Aggregation extends AggregationEntry {
 
+	private final List<AggregationEntry> children = Lists.newArrayList();
+
 	public Aggregation(final ObjectType metadata) {
 		super(metadata);
 	}
 
+	public Aggregation(final ObjectType metadata, final Aggregation parent) {
+		super(metadata, parent);
+	}
+
+	protected Aggregation add(final AggregationEntry child) {
+		children.add(child);
+		return this;
+	}
+
 }

src/main/java/info/textgrid/services/aggregator/tree/AggregationEntry.java

@@ -2,13 +2,25 @@
 
 import info.textgrid.namespaces.metadata.core._2010.ObjectType;
 
+import com.google.common.collect.ImmutableList;
 
 public class AggregationEntry {
 
 	private final ObjectType metadata;
 
-	public AggregationEntry(final ObjectType metadata) {
+	protected final ImmutableList<Aggregation> path;
+
+	protected AggregationEntry(final ObjectType metadata) {
+		this.metadata = metadata;
+		path = ImmutableList.of();
+	}
+
+	protected AggregationEntry(final ObjectType metadata,
+			final Aggregation parent) {
+		path = ImmutableList.<Aggregation> builder().addAll(parent.path)
+				.add(parent).build();
 		this.metadata = metadata;
+		parent.add(this);
 	}
 
 	public ObjectType getMetadata() {

src/main/java/info/textgrid/services/aggregator/tree/AggregationTreeFactory.java

@@ -9,7 +9,7 @@
 
 public class AggregationTreeFactory extends AggregationTreeWalker {
 
-	private final Deque<AggregationEntry> stack = Lists.newLinkedList();
+	private final Deque<Aggregation> stack = Lists.newLinkedList();
 	private final Aggregation root;
 
 	protected AggregationTreeFactory(final ObjectType root) {
@@ -21,15 +21,20 @@ protected AggregationTreeFactory(final ObjectType root) {
 
 	@Override
 	protected boolean walk(final ObjectType object, final boolean again) {
-		// TODO Auto-generated method stub
-		return super.walk(object, again);
+		if (super.walk(object, again))
+			return true; // Aggregation already handled via #walkAggregation
+		else {
+			new AggregationEntry(object, stack.peek());
+			return true;
+		}
 	}
 
 	@Override
 	protected void walkAggregation(final ObjectType aggregation,
 			final boolean again) {
-		// TODO Auto-generated method stub
+		stack.push(new Aggregation(aggregation, stack.peek()));
 		super.walkAggregation(aggregation, again);
+		stack.pop();
 	}
 
 }