# HG changeset patch
# User ShoshiTAMAKI
# Date 1287764085 -32400
# Node ID 92637ef791b725d8c31746bd592da9c61a01225f
# Parent  cce963b8a4fda48e3d9d426c1d60cd30b162850d
added MergedTreeBuilder.java

diff -r cce963b8a4fd -r 92637ef791b7 src/treecms/proto/merge/MergedTreeBuilder.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/treecms/proto/merge/MergedTreeBuilder.java	Sat Oct 23 01:14:45 2010 +0900
@@ -0,0 +1,30 @@
+package treecms.proto.merge;
+
+import treecms.proto.api.Node;
+import treecms.proto.api.TreeBuilder;
+
+public class MergedTreeBuilder implements TreeBuilder
+{
+	private TreeBuilder m_target1;
+	private TreeBuilder m_target2;
+	
+	public MergedTreeBuilder(TreeBuilder _target1,TreeBuilder _target2)
+	{
+		m_target1 = _target1;
+		m_target2 = _target2;
+	}
+	
+	@Override
+	public Node getContents()
+	{
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Node createNode()
+	{
+		// TODO Auto-generated method stub
+		return null;
+	}
+}
diff -r cce963b8a4fd -r 92637ef791b7 src/treecms/proto/test/EditableTreeBuilderTest1.java
--- a/src/treecms/proto/test/EditableTreeBuilderTest1.java	Sun Oct 17 13:56:47 2010 +0900
+++ b/src/treecms/proto/test/EditableTreeBuilderTest1.java	Sat Oct 23 01:14:45 2010 +0900
@@ -8,7 +8,7 @@
 
 public class EditableTreeBuilderTest1 
 {
-	public static void main(String _arg[])
+	public static void main(String _args[])
 	{
 		TreeBuilder builder = new SimpleTreeBuilder();
 		Node root = builder.getContents();