Thread: [Exmmt-commit] SF.net SVN: exmmt: [73] net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/b
Status: Inactive
Brought to you by:
lgrammel
Menu
▾
▴
exmmt-commit
|
From: <lgr...@us...> - 2006-06-05 23:36:00
|
Revision: 73 Author: lgrammel Date: 2006-06-05 04:06:20 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=73&view=rev Log Message: ----------- #1500774 scenario "shopping list" Added Paths: ----------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java Removed Paths: ------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java Copied: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java (from rev 71, net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java) =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java 2006-06-05 11:06:20 UTC (rev 73) @@ -0,0 +1,42 @@ +/* $HeadURL$ + * ----------------------------------------------------------------------------- + * + * Copyright (C) Lars Grammel and others. + * + * All rights reserved. This program and the accompanying materials are made + * available under the terms of the Common Public License v1.0 which accompanies + * this distribution, and is available at + * + * http://www.eclipse.org/legal/cpl-v10.html + * + */ +package net.sourceforge.exmmt.builder; + +import java.util.List; + +import org.jdom.Attribute; +import org.jdom.Element; + +public class ControllerTreeBuilder { + + public Controller build(Element element) { + Controller composite = new Controller(element); + + List<Element> childElements = element.getChildren(); + for (Element childElement : childElements) { + composite.addChild(build(childElement)); + } + + List<Attribute> attributes = element.getAttributes(); + for (Attribute attribute : attributes) { + composite.addChild(build(attribute)); + } + + return composite; + } + + private Controller build(Attribute attribute) { + return new Controller(attribute); + } + +} Deleted: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 11:06:10 UTC (rev 72) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 11:06:20 UTC (rev 73) @@ -1,42 +0,0 @@ -/* $HeadURL$ - * ----------------------------------------------------------------------------- - * - * Copyright (C) Lars Grammel and others. - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Common Public License v1.0 which accompanies - * this distribution, and is available at - * - * http://www.eclipse.org/legal/cpl-v10.html - * - */ -package net.sourceforge.exmmt.builder; - -import java.util.List; - -import org.jdom.Attribute; -import org.jdom.Element; - -public class TreeBuilder { - - public Controller build(Element element) { - Controller composite = new Controller(element); - - List<Element> childElements = element.getChildren(); - for (Element childElement : childElements) { - composite.addChild(build(childElement)); - } - - List<Attribute> attributes = element.getAttributes(); - for (Attribute attribute : attributes) { - composite.addChild(build(attribute)); - } - - return composite; - } - - private Controller build(Attribute attribute) { - return new Controller(attribute); - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-05 23:36:02
|
Revision: 79 Author: lgrammel Date: 2006-06-05 04:28:51 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=79&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java Added Paths: ----------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.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 11:28:42 UTC (rev 78) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java 2006-06-05 11:28:51 UTC (rev 79) @@ -15,6 +15,9 @@ import java.util.ArrayList; import java.util.List; +import net.sourceforge.exmmt.renderer.IRenderer; +import net.sourceforge.exmmt.renderer.NullRenderer; + public class Controller { private final Object model; @@ -63,5 +66,9 @@ public boolean hasChildren() { return !children.isEmpty(); } + + public IRenderer getRenderer() { + return new NullRenderer(); + } } \ No newline at end of file Added: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java 2006-06-05 11:28:51 UTC (rev 79) @@ -0,0 +1,22 @@ +/* $HeadURL$ + * ----------------------------------------------------------------------------- + * + * Copyright (C) Lars Grammel and others. + * + * All rights reserved. This program and the accompanying materials are made + * available under the terms of the Common Public License v1.0 which accompanies + * this distribution, and is available at + * + * http://www.eclipse.org/legal/cpl-v10.html + * + */ +package net.sourceforge.exmmt.renderer; + +import net.sourceforge.exmmt.graphics.IOutputArea; + +public class NullRenderer implements IRenderer { + + public void render(IOutputArea outputArea) { + } + +} Property changes on: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java ___________________________________________________________________ Name: svn:keywords + HeadURL Id LastChangedBy LastChangedDate LastChangedRevision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-05 23:42:11
|
Revision: 109 Author: lgrammel Date: 2006-06-05 09:10:27 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=109&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SubRendererProxy.java 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 16:10:19 UTC (rev 108) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java 2006-06-05 16:10:27 UTC (rev 109) @@ -16,6 +16,7 @@ import net.sourceforge.exmmt.renderer.AttributeRenderer; import net.sourceforge.exmmt.renderer.HorizontalSequenceRenderer; +import net.sourceforge.exmmt.renderer.SubRendererProxy; import org.jdom.Attribute; import org.jdom.Element; @@ -24,7 +25,6 @@ public Controller build(Element element) { Controller controller = new Controller(element); - controller.setRenderer(new HorizontalSequenceRenderer()); List<Element> childElements = element.getChildren(); for (Element childElement : childElements) { @@ -36,15 +36,21 @@ controller.addChild(build(attribute)); } + HorizontalSequenceRenderer renderer = new HorizontalSequenceRenderer(); + for (int i = 0; i < controller.getChildren().size(); i++) { + renderer.add(new SubRendererProxy(controller, i)); + } + controller.setRenderer(renderer); + return controller; } private Controller build(Attribute attribute) { Controller controller = new Controller(attribute); - + controller.setRenderer(new AttributeRenderer(attribute)); - - return controller; + + return controller; } } Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java 2006-06-05 16:10:19 UTC (rev 108) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java 2006-06-05 16:10:27 UTC (rev 109) @@ -63,4 +63,8 @@ subRenderers.add(subRenderer); } + public List<IRenderer> getSubRenderers() { + return subRenderers; + } + } \ No newline at end of file Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SubRendererProxy.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SubRendererProxy.java 2006-06-05 16:10:19 UTC (rev 108) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SubRendererProxy.java 2006-06-05 16:10:27 UTC (rev 109) @@ -29,7 +29,7 @@ } @Override - protected IRenderer getDelegate() { + public IRenderer getDelegate() { return controller.getChildren().get(childIndex).getRenderer(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-05 23:42:12
|
Revision: 105 Author: lgrammel Date: 2006-06-05 08:34:11 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=105&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 15:34:03 UTC (rev 104) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java 2006-06-05 15:34:11 UTC (rev 105) @@ -26,22 +26,21 @@ private final List<Controller> children = new ArrayList<Controller>(); - private final IRenderer renderer; + private IRenderer renderer = new NullRenderer(); 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() { - return model; + public void addChild(Controller child) { + assert child != null; + + child.setParent(this); + children.add(child); + + assert child.getParent() == this; + assert children.contains(child); } // TODO result should be immutable or a copy @@ -49,36 +48,36 @@ return children; } + public Object getModel() { + return model; + } + public Controller getParent() { return parent; } - private void setParent(Controller parent) { - this.parent = parent; + public IRenderer getRenderer() { + assert renderer != null; + + return renderer; } - public void addChild(Controller child) { - assert child != null; - - child.setParent(this); - children.add(child); - - assert child.getParent() == this; - assert children.contains(child); + public boolean hasChildren() { + return !children.isEmpty(); } public boolean isRoot() { return parent == null; } - public boolean hasChildren() { - return !children.isEmpty(); + private void setParent(Controller parent) { + this.parent = parent; } - public IRenderer getRenderer() { + public void setRenderer(IRenderer renderer) { assert renderer != null; - return renderer; + this.renderer = 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 15:34:03 UTC (rev 104) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ControllerTreeBuilder.java 2006-06-05 15:34:11 UTC (rev 105) @@ -23,23 +23,28 @@ public class ControllerTreeBuilder { public Controller build(Element element) { - Controller composite = new Controller(element, new HorizontalSequenceRenderer()); + Controller controller = new Controller(element); + controller.setRenderer(new HorizontalSequenceRenderer()); List<Element> childElements = element.getChildren(); for (Element childElement : childElements) { - composite.addChild(build(childElement)); + controller.addChild(build(childElement)); } List<Attribute> attributes = element.getAttributes(); for (Attribute attribute : attributes) { - composite.addChild(build(attribute)); + controller.addChild(build(attribute)); } - return composite; + return controller; } private Controller build(Attribute attribute) { - return new Controller(attribute, new AttributeRenderer(attribute)); + Controller controller = new Controller(attribute); + + controller.setRenderer(new AttributeRenderer(attribute)); + + return controller; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-05 23:44:14
|
Revision: 71 Author: lgrammel Date: 2006-06-05 04:04:09 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=71&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java Added Paths: ----------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java Removed Paths: ------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java Deleted: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 11:04:00 UTC (rev 70) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 11:04:09 UTC (rev 71) @@ -1,67 +0,0 @@ -/* $HeadURL$ - * ----------------------------------------------------------------------------- - * - * Copyright (C) Lars Grammel and others. - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Common Public License v1.0 which accompanies - * this distribution, and is available at - * - * http://www.eclipse.org/legal/cpl-v10.html - * - */ -package net.sourceforge.exmmt.builder; - -import java.util.ArrayList; -import java.util.List; - -public class Composite { - - private final Object model; - - private Composite parent; - - private final List<Composite> children = new ArrayList<Composite>(); - - public Composite(final Object model) { - assert model != null; - - this.model = model; - } - - public Object getModel() { - return model; - } - - // TODO result should be immutable or a copy - public List<Composite> getChildren() { - return children; - } - - public Composite getParent() { - return parent; - } - - private void setParent(Composite parent) { - this.parent = parent; - } - - public void addChild(Composite child) { - assert child != null; - - child.setParent(this); - children.add(child); - - assert child.getParent() == this; - assert children.contains(child); - } - - public boolean isRoot() { - return parent == null; - } - - public boolean hasChildren() { - return !children.isEmpty(); - } - -} \ No newline at end of file Copied: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java (from rev 65, net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java) =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Controller.java 2006-06-05 11:04:09 UTC (rev 71) @@ -0,0 +1,67 @@ +/* $HeadURL$ + * ----------------------------------------------------------------------------- + * + * Copyright (C) Lars Grammel and others. + * + * All rights reserved. This program and the accompanying materials are made + * available under the terms of the Common Public License v1.0 which accompanies + * this distribution, and is available at + * + * http://www.eclipse.org/legal/cpl-v10.html + * + */ +package net.sourceforge.exmmt.builder; + +import java.util.ArrayList; +import java.util.List; + +public class Controller { + + private final Object model; + + private Controller parent; + + private final List<Controller> children = new ArrayList<Controller>(); + + public Controller(final Object model) { + assert model != null; + + this.model = model; + } + + public Object getModel() { + return model; + } + + // TODO result should be immutable or a copy + public List<Controller> getChildren() { + return children; + } + + public Controller getParent() { + return parent; + } + + private void setParent(Controller parent) { + this.parent = parent; + } + + public void addChild(Controller child) { + assert child != null; + + child.setParent(this); + children.add(child); + + assert child.getParent() == this; + assert children.contains(child); + } + + public boolean isRoot() { + return parent == null; + } + + public boolean hasChildren() { + return !children.isEmpty(); + } + +} \ No newline at end of file Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 11:04:00 UTC (rev 70) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 11:04:09 UTC (rev 71) @@ -19,8 +19,8 @@ public class TreeBuilder { - public Composite build(Element element) { - Composite composite = new Composite(element); + public Controller build(Element element) { + Controller composite = new Controller(element); List<Element> childElements = element.getChildren(); for (Element childElement : childElements) { @@ -35,8 +35,8 @@ return composite; } - private Composite build(Attribute attribute) { - return new Composite(attribute); + private Controller build(Attribute attribute) { + return new Controller(attribute); } } Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 11:04:00 UTC (rev 70) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 11:04:09 UTC (rev 71) @@ -14,19 +14,19 @@ import java.util.List; -import net.sourceforge.exmmt.builder.Composite; +import net.sourceforge.exmmt.builder.Controller; public class Focus { - private Composite focusedElement; + private Controller focusedElement; - public Focus(Composite root) { + public Focus(Controller root) { assert root != null; this.focusedElement = root; } - public Composite getFocusedElement() { + public Controller getFocusedElement() { return focusedElement; } @@ -47,7 +47,7 @@ return; } - List<Composite> siblings = focusedElement.getParent().getChildren(); + List<Controller> siblings = focusedElement.getParent().getChildren(); int currentIndex = siblings.indexOf(focusedElement); @@ -74,7 +74,7 @@ return; } - List<Composite> siblings = focusedElement.getParent().getChildren(); + List<Controller> siblings = focusedElement.getParent().getChildren(); int currentIndex = siblings.indexOf(focusedElement); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-05 23:44:46
|
Revision: 51 Author: lgrammel Date: 2006-06-05 02:34:28 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=51&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 09:32:00 UTC (rev 50) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 09:34:28 UTC (rev 51) @@ -49,4 +49,8 @@ return parent == null; } + public boolean hasChildren() { + return !children.isEmpty(); + } + } \ No newline at end of file Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:32:00 UTC (rev 50) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:34:28 UTC (rev 51) @@ -12,8 +12,6 @@ */ package net.sourceforge.exmmt.navigation; -import java.util.List; - import net.sourceforge.exmmt.builder.Composite; public class Focus { @@ -31,13 +29,9 @@ } public void moveToChild() { - List<Composite> children = focusedElement.getChildren(); - - if (children.isEmpty()) { - return; + if (focusedElement.hasChildren()) { + focusedElement = focusedElement.getChildren().get(0); } - - focusedElement = children.get(0); } public void moveToParent() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-05 23:45:22
|
Revision: 33 Author: lgrammel Date: 2006-06-05 01:34:40 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=33&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 07:40:55 UTC (rev 32) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 08:34:40 UTC (rev 33) @@ -12,20 +12,27 @@ */ package net.sourceforge.exmmt.builder; -import org.jdom.Content; +import java.util.ArrayList; +import java.util.List; public class Composite { - private final Content model; + private final Object model; - public Composite(final Content model) { + private final List<Composite> children = new ArrayList<Composite>(); + + public Composite(final Object model) { assert model != null; this.model = model; } - public Content getModel() { + public Object getModel() { return model; } + public List<Composite> getChildren() { + return children; + } + } Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 07:40:55 UTC (rev 32) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 08:34:40 UTC (rev 33) @@ -12,12 +12,28 @@ */ package net.sourceforge.exmmt.builder; +import java.util.List; + +import org.jdom.Attribute; import org.jdom.Element; public class TreeBuilder { public Composite build(Element element) { - return new Composite(element); + Composite composite = new Composite(element); + + List<Attribute> attributes = element.getAttributes(); + for (Attribute attribute : attributes) { + // TODO getChildren should return immutable, create add method in + // Composite + composite.getChildren().add(build(attribute)); + } + + return composite; } + private Composite build(Attribute attribute) { + return new Composite(attribute); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-05 23:51:59
|
Revision: 52 Author: lgrammel Date: 2006-06-05 02:37:43 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=52&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 09:34:28 UTC (rev 51) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 09:37:43 UTC (rev 52) @@ -41,9 +41,16 @@ return parent; } - public void setParent(Composite parent) { + private void setParent(Composite parent) { this.parent = parent; } + + public void add(Composite child) { + assert child != null; + + child.setParent(this); + children.add(child); + } public boolean isRoot() { return parent == null; Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 09:34:28 UTC (rev 51) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 09:37:43 UTC (rev 52) @@ -24,20 +24,16 @@ List<Element> childElements = element.getChildren(); for (Element childElement : childElements) { - // TODO getChildren should return immutable, create add method in - // Composite + // TODO getChildren should return immutable Composite child = build(childElement); - child.setParent(composite); - composite.getChildren().add(child); + composite.add(child); } List<Attribute> attributes = element.getAttributes(); for (Attribute attribute : attributes) { - // TODO getChildren should return immutable, create add method in - // Composite + // TODO getChildren should return immutable Composite child = build(attribute); - child.setParent(composite); - composite.getChildren().add(child); + composite.add(child); } return composite; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:55:44
|
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. |
|
From: <lgr...@us...> - 2006-06-06 00:55:48
|
Revision: 54 Author: lgrammel Date: 2006-06-05 02:39:28 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=54&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 09:37:54 UTC (rev 53) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 09:39:28 UTC (rev 54) @@ -33,6 +33,7 @@ return model; } + // TODO result should be immutable or a copy public List<Composite> getChildren() { return children; } @@ -45,7 +46,7 @@ this.parent = parent; } - public void add(Composite child) { + public void addChild(Composite child) { assert child != null; child.setParent(this); Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 09:37:54 UTC (rev 53) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 09:39:28 UTC (rev 54) @@ -24,16 +24,12 @@ List<Element> childElements = element.getChildren(); for (Element childElement : childElements) { - // TODO getChildren should return immutable - Composite child = build(childElement); - composite.add(child); + composite.addChild(build(childElement)); } List<Attribute> attributes = element.getAttributes(); for (Attribute attribute : attributes) { - // TODO getChildren should return immutable - Composite child = build(attribute); - composite.add(child); + composite.addChild(build(attribute)); } return composite; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 01:28:58
|
Revision: 37 Author: lgrammel Date: 2006-06-05 01:46:35 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=37&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 08:40:32 UTC (rev 36) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 08:46:35 UTC (rev 37) @@ -19,6 +19,8 @@ private final Object model; + private Composite parent; + private final List<Composite> children = new ArrayList<Composite>(); public Composite(final Object model) { @@ -35,4 +37,12 @@ return children; } + public Composite getParent() { + return parent; + } + + void setParent(Composite parent) { + this.parent = parent; + } + } Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 08:40:32 UTC (rev 36) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 08:46:35 UTC (rev 37) @@ -26,14 +26,18 @@ for (Element childElement : childElements) { // TODO getChildren should return immutable, create add method in // Composite - composite.getChildren().add(build(childElement)); + Composite child = build(childElement); + child.setParent(composite); + composite.getChildren().add(child); } List<Attribute> attributes = element.getAttributes(); for (Attribute attribute : attributes) { // TODO getChildren should return immutable, create add method in // Composite - composite.getChildren().add(build(attribute)); + Composite child = build(attribute); + child.setParent(composite); + composite.getChildren().add(child); } return composite; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 03:08:56
|
Revision: 50 Author: lgrammel Date: 2006-06-05 02:32:00 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=50&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 09:29:53 UTC (rev 49) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 09:32:00 UTC (rev 50) @@ -45,4 +45,8 @@ this.parent = parent; } -} + public boolean isRoot() { + return parent == null; + } + +} \ No newline at end of file Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:29:53 UTC (rev 49) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:32:00 UTC (rev 50) @@ -41,14 +41,9 @@ } public void moveToParent() { - Composite parent = focusedElement.getParent(); - - // TODO extract isRoot() method - if (parent == null) { - return; + if (!focusedElement.isRoot()) { + focusedElement = focusedElement.getParent(); } - - focusedElement = parent; } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X