[Exmmt-commit] SF.net SVN: exmmt: [85] net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder

[<lgr...@us...>]

Revision: 85
Author:   lgrammel
Date:     2006-06-05 05:25:16 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/exmmt/?rev=85&view=rev

Log Message:
-----------
#1500774 scenario "shopping list"

Modified Paths:
--------------
    net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java
    net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java
Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java
===================================================================
--- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java	2006-06-05 12:25:07 UTC (rev 84)
+++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java	2006-06-05 12:25:16 UTC (rev 85)
@@ -25,11 +25,19 @@
 	private Controller parent;
 	
 	private final List<Controller> children = new ArrayList<Controller>();
+
+	private final IRenderer renderer;
 	
-	public Controller(final Object model) {
-		assert model != null;
+	public Controller(Object model) {
+		this(model, new NullRenderer());
+	}
+
+	public Controller(Object model, IRenderer renderer) {
+		assert model != null;	
+		assert renderer != null;
 		
 		this.model = model;
+		this.renderer = renderer;
 	}
 
 	public Object getModel() {
@@ -68,7 +76,9 @@
 	}
 
 	public IRenderer getRenderer() {
-		return new NullRenderer();
+		assert renderer != null;
+		
+		return renderer;
 	}
 	
 }
\ No newline at end of file

Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java
===================================================================
--- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java	2006-06-05 12:25:07 UTC (rev 84)
+++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java	2006-06-05 12:25:16 UTC (rev 85)
@@ -14,6 +14,9 @@
 
 import java.util.List;
 
+import net.sourceforge.exmmt.renderer.AttributeRenderer;
+import net.sourceforge.exmmt.renderer.NullRenderer;
+
 import org.jdom.Attribute;
 import org.jdom.Element;
 
@@ -36,7 +39,7 @@
 	}
 
 	private Controller build(Attribute attribute) {
-		return new Controller(attribute);
+		return new Controller(attribute, new AttributeRenderer(attribute));
 	}
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.