[Exmmt-commit] SF.net SVN: exmmt: [71] net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/b
Status: Inactive
Brought to you by:
lgrammel
Menu
▾
▴
[Exmmt-commit] SF.net SVN: exmmt: [71] net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder
|
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. |
