exmmt-commit Mailing List for Eclipse XML Meta-Modeling Tools (Page 3)
Status: Inactive
Brought to you by:
lgrammel
Menu
▾
▴
exmmt-commit — svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(28) |
Jun
(81) |
Jul
|
Aug
|
Sep
|
Oct
(15) |
Nov
|
Dec
|
|---|
|
From: <lgr...@us...> - 2006-06-06 00:52:54
|
Revision: 66 Author: lgrammel Date: 2006-06-05 03:33:40 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=66&view=rev Log Message: ----------- #1500774 scenario "shopping list" Added Paths: ----------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java Removed Paths: ------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java Copied: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java (from rev 30, net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java) =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java (rev 0) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java 2006-06-05 10:33:40 UTC (rev 66) @@ -0,0 +1,44 @@ +/* $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 static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import junit.framework.JUnit4TestAdapter; +import net.sourceforge.exmmt.graphics.IOutputArea; + +import org.junit.Test; + +public class AttributeRendererTest { + + @Test public void render() { + String text = "test"; + + AttributeRenderer renderer = new AttributeRenderer(); + IOutputArea outputArea = createMock(IOutputArea.class); + + outputArea.drawText(text, 0, 0); + + replay(outputArea); + + renderer.render(outputArea, text); + + verify(outputArea); + } + + // Junit 3.8.1 backward compability + public static junit.framework.Test suite() { + return new JUnit4TestAdapter(AttributeRendererTest.class); + } +} Deleted: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java 2006-06-05 09:58:40 UTC (rev 65) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SimpleTextRendererTest.java 2006-06-05 10:33:40 UTC (rev 66) @@ -1,44 +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.renderer; - -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; -import junit.framework.JUnit4TestAdapter; -import net.sourceforge.exmmt.graphics.IOutputArea; - -import org.junit.Test; - -public class SimpleTextRendererTest { - - @Test public void render() { - String text = "test"; - - SimpleTextRenderer renderer = new SimpleTextRenderer(); - IOutputArea outputArea = createMock(IOutputArea.class); - - outputArea.drawText(text, 0, 0); - - replay(outputArea); - - renderer.render(outputArea, text); - - verify(outputArea); - } - - // Junit 3.8.1 backward compability - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(SimpleTextRendererTest.class); - } -} 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:52:49
|
Revision: 104 Author: lgrammel Date: 2006-06-05 08:34:03 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=104&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SubRendererProxyTest.java Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SubRendererProxyTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SubRendererProxyTest.java 2006-06-05 15:18:51 UTC (rev 103) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/SubRendererProxyTest.java 2006-06-05 15:34:03 UTC (rev 104) @@ -14,18 +14,30 @@ import junit.framework.JUnit4TestAdapter; +import net.sourceforge.exmmt.builder.Controller; + +import org.jdom.Element; import org.junit.Test; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; public class SubRendererProxyTest { - @Test - public void getRenderer() { - - } - - // Junit 3.8.1 backward compability - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(SubRendererProxyTest.class); - } - +// @Test +// public void getRenderer() { +// IRenderer mockRenderer = createMock(IRenderer.class); +// +// Controller controller = new Controller(new Element("test"), mockRenderer); +// new SubRendererProxy(controller, 0); +// // 1. Feldindex +// // 2. +// } +// +// // Junit 3.8.1 backward compability +// public static junit.framework.Test suite() { +// return new JUnit4TestAdapter(SubRendererProxyTest.class); +// } +// } 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:52:40
|
Revision: 58 Author: lgrammel Date: 2006-06-05 02:48:40 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=58&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 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:45:18 UTC (rev 57) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:48:40 UTC (rev 58) @@ -12,6 +12,8 @@ */ package net.sourceforge.exmmt.navigation; +import java.util.List; + import net.sourceforge.exmmt.builder.Composite; public class Focus { @@ -41,6 +43,17 @@ } public void moveToNextSibling() { + if (focusedElement.isRoot()) { + return; + } + + List<Composite> siblings = focusedElement.getParent().getChildren(); + + int currentIndex = siblings.indexOf(focusedElement); + + assert currentIndex != -1; + + focusedElement = siblings.get(currentIndex + 1); } } \ No newline at end of file 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:52:27
|
Revision: 77 Author: lgrammel Date: 2006-06-05 04:14:35 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=77&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java Added Paths: ----------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java 2006-06-05 11:14:27 UTC (rev 76) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java 2006-06-05 11:14:35 UTC (rev 77) @@ -16,7 +16,7 @@ import net.sourceforge.exmmt.graphics.IOutputArea; -public class AttributeRenderer { +public class AttributeRenderer implements IRenderer { private final Attribute attribute; Added: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java 2006-06-05 11:14:35 UTC (rev 77) @@ -0,0 +1,21 @@ +/* $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 interface IRenderer { + + void render(IOutputArea outputArea); + +} Property changes on: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.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-06 00:51:22
|
Revision: 64 Author: lgrammel Date: 2006-06-05 02:55:54 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=64&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java 2006-06-05 09:55:47 UTC (rev 63) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java 2006-06-05 09:55:54 UTC (rev 64) @@ -92,6 +92,30 @@ assertEquals(composite, focus.getFocusedElement()); } + @Test + public void moveToNextToPreviousSibling() { + focus.moveToChild(); + focus.moveToNextSibling(); + focus.moveToPreviousSibling(); + + assertEquals(childComposite1, focus.getFocusedElement()); + } + + @Test + public void moveToPreviousSiblingRoundtrip() { + focus.moveToChild(); + focus.moveToPreviousSibling(); + + assertEquals(childComposite3, focus.getFocusedElement()); + } + + @Test + public void moveToPreviousSiblingAsRoot() { + focus.moveToPreviousSibling(); + + assertEquals(composite, focus.getFocusedElement()); + } + @Before public void setUp() { composite = new Composite(new Element("test")); 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:51:21
|
Revision: 53 Author: lgrammel Date: 2006-06-05 02:37:54 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=53&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java 2006-06-05 09:37:43 UTC (rev 52) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java 2006-06-05 09:37:54 UTC (rev 53) @@ -67,10 +67,7 @@ public void setUp() { composite = new Composite(new Element("test")); childComposite = new Composite(new Element("child")); - // TODO define some standard method that does both adding a child and - // setting the parent - composite.getChildren().add(childComposite); - childComposite.setParent(composite); + composite.add(childComposite); focus = new Focus(composite); } 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:52:29
|
Revision: 107 Author: lgrammel Date: 2006-06-05 08:42:28 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=107&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SubRendererProxy.java 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 15:42:20 UTC (rev 106) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SubRendererProxy.java 2006-06-05 15:42:28 UTC (rev 107) @@ -12,11 +12,25 @@ */ package net.sourceforge.exmmt.renderer; +import net.sourceforge.exmmt.builder.Controller; + public class SubRendererProxy extends DelegatingRenderer { + private Controller controller; + + private int childIndex; + + public SubRendererProxy(Controller controller, int childIndex) { + assert controller != null; + assert childIndex >= 0; + + this.childIndex = childIndex; + this.controller = controller; + } + @Override protected IRenderer getDelegate() { - return null; + return controller.getChildren().get(childIndex).getRenderer(); } } \ No newline at end of file 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: 62 Author: lgrammel Date: 2006-06-05 02:53:13 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=62&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java 2006-06-05 09:51:57 UTC (rev 61) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java 2006-06-05 09:53:13 UTC (rev 62) @@ -30,6 +30,8 @@ private Composite childComposite2; + private Composite childComposite3; + @Test public void getInitialFocus() { assertEquals(composite, focus.getFocusedElement()); @@ -78,6 +80,7 @@ focus.moveToChild(); focus.moveToNextSibling(); focus.moveToNextSibling(); + focus.moveToNextSibling(); assertEquals(childComposite1, focus.getFocusedElement()); } @@ -88,7 +91,7 @@ assertEquals(composite, focus.getFocusedElement()); } - + @Before public void setUp() { composite = new Composite(new Element("test")); @@ -96,6 +99,8 @@ composite.addChild(childComposite1); childComposite2 = new Composite(new Element("child2")); composite.addChild(childComposite2); + childComposite3 = new Composite(new Element("child3")); + composite.addChild(childComposite3); focus = new Focus(composite); } 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-05 23:51:58
|
Revision: 63 Author: lgrammel Date: 2006-06-05 02:55:47 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=63&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 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:53:13 UTC (rev 62) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:55:47 UTC (rev 63) @@ -17,12 +17,12 @@ import net.sourceforge.exmmt.builder.Composite; public class Focus { - + private Composite focusedElement; public Focus(Composite root) { assert root != null; - + this.focusedElement = root; } @@ -46,16 +46,16 @@ if (focusedElement.isRoot()) { return; } - + List<Composite> siblings = focusedElement.getParent().getChildren(); - + int currentIndex = siblings.indexOf(focusedElement); - + assert currentIndex >= 0; assert currentIndex <= siblings.size() - 1; - + int newIndex = currentIndex + 1; - + assert newIndex >= 1; assert newIndex <= siblings.size(); @@ -65,8 +65,35 @@ assert newIndex >= 0; assert newIndex <= siblings.size() - 1; - + focusedElement = siblings.get(newIndex); } + public void moveToPreviousSibling() { + if (focusedElement.isRoot()) { + return; + } + + List<Composite> siblings = focusedElement.getParent().getChildren(); + + int currentIndex = siblings.indexOf(focusedElement); + + assert currentIndex >= 0; + assert currentIndex <= siblings.size() - 1; + + int newIndex = currentIndex - 1; + + assert newIndex >= -1; + assert newIndex <= siblings.size() - 2; + + if (newIndex == -1) { + newIndex = siblings.size() - 1; + } + + assert newIndex >= 0; + assert newIndex <= siblings.size() - 1; + + focusedElement = siblings.get(newIndex); + } + } \ No newline at end of file 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:32
|
Revision: 29 Author: lgrammel Date: 2006-06-04 23:37:13 -0700 (Sun, 04 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=29&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/META-INF/MANIFEST.MF Added Paths: ----------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IOutputArea.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java Modified: net.sourceforge.exmmt/trunk/META-INF/MANIFEST.MF =================================================================== --- net.sourceforge.exmmt/trunk/META-INF/MANIFEST.MF 2006-05-17 15:25:55 UTC (rev 28) +++ net.sourceforge.exmmt/trunk/META-INF/MANIFEST.MF 2006-06-05 06:37:13 UTC (rev 29) @@ -17,4 +17,6 @@ org.eclipse.ui.editors, org.eclipse.ui.ide, org.eclipse.core.resources -Export-Package: net.sourceforge.exmmt +Export-Package: net.sourceforge.exmmt, + net.sourceforge.exmmt.graphics, + net.sourceforge.exmmt.renderer Added: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IOutputArea.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IOutputArea.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IOutputArea.java 2006-06-05 06:37:13 UTC (rev 29) @@ -0,0 +1,19 @@ +/* $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.graphics; + +public interface IOutputArea { + + void drawText(String text, int x, int y); + +} Property changes on: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IOutputArea.java ___________________________________________________________________ Name: svn:keywords + HeadURL Id LastChangedBy LastChangedDate LastChangedRevision Added: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java 2006-06-05 06:37:13 UTC (rev 29) @@ -0,0 +1,25 @@ +/* $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 SimpleTextRenderer { + + public void render(IOutputArea outputArea, String text) { + assert outputArea != null; + + outputArea.drawText(text, 0, 0); + } + +} Property changes on: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.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:45:26
|
Revision: 31 Author: lgrammel Date: 2006-06-05 00:40:41 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=31&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/META-INF/MANIFEST.MF Added Paths: ----------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/ 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/META-INF/MANIFEST.MF =================================================================== --- net.sourceforge.exmmt/trunk/META-INF/MANIFEST.MF 2006-06-05 06:37:27 UTC (rev 30) +++ net.sourceforge.exmmt/trunk/META-INF/MANIFEST.MF 2006-06-05 07:40:41 UTC (rev 31) @@ -17,6 +17,26 @@ org.eclipse.ui.editors, org.eclipse.ui.ide, org.eclipse.core.resources -Export-Package: net.sourceforge.exmmt, +Export-Package: com.werken.saxpath;x-friends:="net.sourceforge.exmmt.test", + net.sourceforge.exmmt, + net.sourceforge.exmmt.builder, net.sourceforge.exmmt.graphics, - net.sourceforge.exmmt.renderer + net.sourceforge.exmmt.renderer, + org.jaxen;x-friends:="net.sourceforge.exmmt.test", + org.jaxen.expr;x-friends:="net.sourceforge.exmmt.test", + org.jaxen.expr.iter;x-friends:="net.sourceforge.exmmt.test", + org.jaxen.function;x-friends:="net.sourceforge.exmmt.test", + org.jaxen.function.ext;x-friends:="net.sourceforge.exmmt.test", + org.jaxen.jdom;x-friends:="net.sourceforge.exmmt.test", + org.jaxen.pattern;x-friends:="net.sourceforge.exmmt.test", + org.jaxen.util;x-friends:="net.sourceforge.exmmt.test", + org.jdom, + org.jdom.adapters;x-friends:="net.sourceforge.exmmt.test", + org.jdom.filter;x-friends:="net.sourceforge.exmmt.test", + org.jdom.input;x-friends:="net.sourceforge.exmmt.test", + org.jdom.output;x-friends:="net.sourceforge.exmmt.test", + org.jdom.transform;x-friends:="net.sourceforge.exmmt.test", + org.jdom.xpath;x-friends:="net.sourceforge.exmmt.test", + org.saxpath;x-friends:="net.sourceforge.exmmt.test", + org.saxpath.conformance;x-friends:="net.sourceforge.exmmt.test", + org.saxpath.helpers;x-friends:="net.sourceforge.exmmt.test" Added: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java 2006-06-05 07:40:41 UTC (rev 31) @@ -0,0 +1,31 @@ +/* $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 org.jdom.Content; + +public class Composite { + + private final Content model; + + public Composite(final Content model) { + assert model != null; + + this.model = model; + } + + public Content getModel() { + return model; + } + +} Property changes on: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/Composite.java ___________________________________________________________________ Name: svn:keywords + HeadURL Id LastChangedBy LastChangedDate LastChangedRevision Added: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.java 2006-06-05 07:40:41 UTC (rev 31) @@ -0,0 +1,23 @@ +/* $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 org.jdom.Element; + +public class TreeBuilder { + + public Composite build(Element element) { + return new Composite(element); + } + +} Property changes on: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/builder/TreeBuilder.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: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:45:14
|
Revision: 42 Author: lgrammel Date: 2006-06-05 02:21:16 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=42&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 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:06:08 UTC (rev 41) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:21:16 UTC (rev 42) @@ -28,4 +28,8 @@ return focusedElement; } + public void moveToChild() { + focusedElement = focusedElement.getChildren().get(0); + } + } \ No newline at end of file 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:13
|
Revision: 48 Author: lgrammel Date: 2006-06-05 02:29:45 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=48&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 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:25:36 UTC (rev 47) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:29:45 UTC (rev 48) @@ -41,7 +41,14 @@ } public void moveToParent() { - focusedElement = focusedElement.getParent(); + Composite parent = focusedElement.getParent(); + + // TODO extract isRoot() method + if (parent == null) { + return; + } + + 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. |
|
From: <lgr...@us...> - 2006-06-05 23:45:13
|
Revision: 49 Author: lgrammel Date: 2006-06-05 02:29:53 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=49&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java 2006-06-05 09:29:45 UTC (rev 48) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/navigation/FocusTest.java 2006-06-05 09:29:53 UTC (rev 49) @@ -56,6 +56,13 @@ assertEquals(composite, focus.getFocusedElement()); } + @Test + public void moveToParentAsRoot() { + focus.moveToParent(); + + assertEquals(composite, focus.getFocusedElement()); + } + @Before public void setUp() { composite = new Composite(new Element("test")); 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:44:43
|
Revision: 60 Author: lgrammel Date: 2006-06-05 02:51:50 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=60&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 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:48:47 UTC (rev 59) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:51:50 UTC (rev 60) @@ -51,9 +51,22 @@ int currentIndex = siblings.indexOf(focusedElement); - assert currentIndex != -1; + assert currentIndex >= 0; + assert currentIndex <= siblings.size() - 1; - focusedElement = siblings.get(currentIndex + 1); + int newIndex = currentIndex + 1; + + assert newIndex >= 1; + assert newIndex <= siblings.size(); + + if (newIndex == siblings.size()) { + newIndex = 0; + } + + assert newIndex >= 0; + assert newIndex <= siblings.size() - 1; + + focusedElement = siblings.get(newIndex); } } \ No newline at end of file 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:12
|
Revision: 72 Author: lgrammel Date: 2006-06-05 04:06:10 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=72&view=rev Log Message: ----------- #1500774 scenario "shopping list" Added Paths: ----------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java Removed Paths: ------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java Copied: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java (from rev 70, net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java) =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java (rev 0) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java 2006-06-05 11:06:10 UTC (rev 72) @@ -0,0 +1,97 @@ +/* $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 static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import junit.framework.JUnit4TestAdapter; + +import org.jdom.Element; +import org.junit.Test; + +public class ControllerTreeBuilderTest { + + @Test public void buildOneElement() { + ControllerTreeBuilder builder = new ControllerTreeBuilder(); + + Element element = new Element("entry"); + + Controller composite = builder.build(element); + + assertEquals(element, composite.getModel()); + assertNotNull(composite.getChildren()); + assertEquals(0, composite.getChildren().size()); + assertNull(composite.getParent()); + } + + @Test public void buildOneElementWithAttributes() { + String nameOfAttribute1 = "item"; + String nameOfAttribute2 = "count"; + + ControllerTreeBuilder builder = new ControllerTreeBuilder(); + + Element element = new Element("entry"); + element.setAttribute(nameOfAttribute1, "testItem"); + element.setAttribute(nameOfAttribute2, "2"); + + Controller composite = builder.build(element); + + assertEquals(element, composite.getModel()); + assertNotNull(composite.getChildren()); + assertEquals(2, composite.getChildren().size()); + assertNull(composite.getParent()); + + Controller childComposite1 = composite.getChildren().get(0); + + assertEquals(element.getAttribute(nameOfAttribute1), childComposite1.getModel()); + assertNotNull(childComposite1.getChildren()); + assertEquals(0, childComposite1.getChildren().size()); + assertEquals(composite, childComposite1.getParent()); + + Controller childComposite2 = composite.getChildren().get(1); + + assertEquals(element.getAttribute(nameOfAttribute2), childComposite2.getModel()); + assertNotNull(childComposite2.getChildren()); + assertEquals(0, childComposite2.getChildren().size()); + assertEquals(composite, childComposite2.getParent()); + } + + @Test public void buildElementWithChildElement() { + ControllerTreeBuilder builder = new ControllerTreeBuilder(); + + Element listElement = new Element("list"); + Element entryElement = new Element("entry"); + listElement.addContent(entryElement); + + Controller composite = builder.build(listElement); + + assertEquals(listElement, composite.getModel()); + assertNotNull(composite.getChildren()); + assertEquals(1, composite.getChildren().size()); + assertNull(composite.getParent()); + + Controller childComposite = composite.getChildren().get(0); + + assertEquals(entryElement, childComposite.getModel()); + assertNotNull(childComposite.getChildren()); + assertEquals(0, childComposite.getChildren().size()); + assertEquals(composite, childComposite.getParent()); + } + + // Junit 3.8.1 backward compability + public static junit.framework.Test suite() { + return new JUnit4TestAdapter(ControllerTreeBuilderTest.class); + } + +} Deleted: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java 2006-06-05 11:04:09 UTC (rev 71) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/TreeBuilderTest.java 2006-06-05 11:06:10 UTC (rev 72) @@ -1,97 +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 static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import junit.framework.JUnit4TestAdapter; - -import org.jdom.Element; -import org.junit.Test; - -public class TreeBuilderTest { - - @Test public void buildOneElement() { - TreeBuilder builder = new TreeBuilder(); - - Element element = new Element("entry"); - - Controller composite = builder.build(element); - - assertEquals(element, composite.getModel()); - assertNotNull(composite.getChildren()); - assertEquals(0, composite.getChildren().size()); - assertNull(composite.getParent()); - } - - @Test public void buildOneElementWithAttributes() { - String nameOfAttribute1 = "item"; - String nameOfAttribute2 = "count"; - - TreeBuilder builder = new TreeBuilder(); - - Element element = new Element("entry"); - element.setAttribute(nameOfAttribute1, "testItem"); - element.setAttribute(nameOfAttribute2, "2"); - - Controller composite = builder.build(element); - - assertEquals(element, composite.getModel()); - assertNotNull(composite.getChildren()); - assertEquals(2, composite.getChildren().size()); - assertNull(composite.getParent()); - - Controller childComposite1 = composite.getChildren().get(0); - - assertEquals(element.getAttribute(nameOfAttribute1), childComposite1.getModel()); - assertNotNull(childComposite1.getChildren()); - assertEquals(0, childComposite1.getChildren().size()); - assertEquals(composite, childComposite1.getParent()); - - Controller childComposite2 = composite.getChildren().get(1); - - assertEquals(element.getAttribute(nameOfAttribute2), childComposite2.getModel()); - assertNotNull(childComposite2.getChildren()); - assertEquals(0, childComposite2.getChildren().size()); - assertEquals(composite, childComposite2.getParent()); - } - - @Test public void buildElementWithChildElement() { - TreeBuilder builder = new TreeBuilder(); - - Element listElement = new Element("list"); - Element entryElement = new Element("entry"); - listElement.addContent(entryElement); - - Controller composite = builder.build(listElement); - - assertEquals(listElement, composite.getModel()); - assertNotNull(composite.getChildren()); - assertEquals(1, composite.getChildren().size()); - assertNull(composite.getParent()); - - Controller childComposite = composite.getChildren().get(0); - - assertEquals(entryElement, childComposite.getModel()); - assertNotNull(childComposite.getChildren()); - assertEquals(0, childComposite.getChildren().size()); - assertEquals(composite, childComposite.getParent()); - } - - // Junit 3.8.1 backward compability - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(TreeBuilderTest.class); - } - -} 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:10
|
Revision: 76 Author: lgrammel Date: 2006-06-05 04:14:27 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=76&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java 2006-06-05 11:09:52 UTC (rev 75) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/AttributeRendererTest.java 2006-06-05 11:14:27 UTC (rev 76) @@ -12,6 +12,7 @@ */ package net.sourceforge.exmmt.renderer; +import static org.junit.Assert.*; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @@ -23,6 +24,10 @@ public class AttributeRendererTest { + @Test public void isRenderer() { + assertTrue(IRenderer.class.isAssignableFrom(AttributeRenderer.class)); + } + @Test public void render() { String value = "value"; Attribute attribute = new Attribute("name", value); 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:07
|
Revision: 78 Author: lgrammel Date: 2006-06-05 04:28:42 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=78&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java Added Paths: ----------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTest.java Added: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTest.java (rev 0) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTest.java 2006-06-05 11:28:42 UTC (rev 78) @@ -0,0 +1,38 @@ +/* $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 static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import junit.framework.JUnit4TestAdapter; +import net.sourceforge.exmmt.renderer.NullRenderer; + +import org.jdom.Element; +import org.junit.Test; + +public class ControllerTest { + + @Test + public void getDefaultRenderer() { + Controller controller = new Controller(new Element("test")); + + assertNotNull(controller.getRenderer()); + assertTrue(controller.getRenderer() instanceof NullRenderer); + } + + // Junit 3.8.1 backward compability + public static junit.framework.Test suite() { + return new JUnit4TestAdapter(ControllerTest.class); + } + +} Property changes on: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTest.java ___________________________________________________________________ Name: svn:keywords + HeadURL Id LastChangedBy LastChangedDate LastChangedRevision Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java 2006-06-05 11:14:35 UTC (rev 77) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/builder/ControllerTreeBuilderTest.java 2006-06-05 11:28:42 UTC (rev 78) @@ -22,67 +22,72 @@ public class ControllerTreeBuilderTest { - @Test public void buildOneElement() { + @Test + public void buildOneElement() { ControllerTreeBuilder builder = new ControllerTreeBuilder(); Element element = new Element("entry"); - + Controller composite = builder.build(element); - + assertEquals(element, composite.getModel()); assertNotNull(composite.getChildren()); assertEquals(0, composite.getChildren().size()); assertNull(composite.getParent()); } - - @Test public void buildOneElementWithAttributes() { + + @Test + public void buildOneElementWithAttributes() { String nameOfAttribute1 = "item"; String nameOfAttribute2 = "count"; - + ControllerTreeBuilder builder = new ControllerTreeBuilder(); Element element = new Element("entry"); element.setAttribute(nameOfAttribute1, "testItem"); element.setAttribute(nameOfAttribute2, "2"); - + Controller composite = builder.build(element); - + assertEquals(element, composite.getModel()); assertNotNull(composite.getChildren()); assertEquals(2, composite.getChildren().size()); assertNull(composite.getParent()); - + Controller childComposite1 = composite.getChildren().get(0); - - assertEquals(element.getAttribute(nameOfAttribute1), childComposite1.getModel()); + + assertEquals(element.getAttribute(nameOfAttribute1), childComposite1 + .getModel()); assertNotNull(childComposite1.getChildren()); assertEquals(0, childComposite1.getChildren().size()); assertEquals(composite, childComposite1.getParent()); Controller childComposite2 = composite.getChildren().get(1); - - assertEquals(element.getAttribute(nameOfAttribute2), childComposite2.getModel()); + + assertEquals(element.getAttribute(nameOfAttribute2), childComposite2 + .getModel()); assertNotNull(childComposite2.getChildren()); assertEquals(0, childComposite2.getChildren().size()); assertEquals(composite, childComposite2.getParent()); } - - @Test public void buildElementWithChildElement() { + + @Test + public void buildElementWithChildElement() { ControllerTreeBuilder builder = new ControllerTreeBuilder(); Element listElement = new Element("list"); Element entryElement = new Element("entry"); listElement.addContent(entryElement); - + Controller composite = builder.build(listElement); - + assertEquals(listElement, composite.getModel()); assertNotNull(composite.getChildren()); assertEquals(1, composite.getChildren().size()); assertNull(composite.getParent()); - + Controller childComposite = composite.getChildren().get(0); - + assertEquals(entryElement, childComposite.getModel()); assertNotNull(childComposite.getChildren()); assertEquals(0, childComposite.getChildren().size()); 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:04
|
Revision: 82 Author: lgrammel Date: 2006-06-05 05:08:53 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=82&view=rev Log Message: ----------- #1500774 scenario "shopping list" Added Paths: ----------- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/NullRendererTest.java Added: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/NullRendererTest.java =================================================================== --- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/NullRendererTest.java (rev 0) +++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/NullRendererTest.java 2006-06-05 12:08:53 UTC (rev 82) @@ -0,0 +1,52 @@ +/* $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 static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import junit.framework.JUnit4TestAdapter; +import net.sourceforge.exmmt.graphics.ISizeCalculator; + +import org.eclipse.swt.graphics.Rectangle; +import org.junit.Test; + +public class NullRendererTest { + + @Test + public void isRenderer() { + assertTrue(IRenderer.class.isAssignableFrom(NullRenderer.class)); + } + + @Test + public void computeSize() { + IRenderer renderer = new NullRenderer(); + + ISizeCalculator sizeCalculator = createMock(ISizeCalculator.class); + + replay(sizeCalculator); + + assertEquals(new Rectangle(0, 0, 0, 0), renderer + .calculateSize(sizeCalculator)); + + verify(sizeCalculator); + } + + + // Junit 3.8.1 backward compability + public static junit.framework.Test suite() { + return new JUnit4TestAdapter(NullRendererTest.class); + } +} Property changes on: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/NullRendererTest.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:43:51
|
Revision: 90 Author: lgrammel Date: 2006-06-05 05:46:03 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=90&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java Added Paths: ----------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java Removed Paths: ------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IOutputArea.java Copied: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java (from rev 29, net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IOutputArea.java) =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java 2006-06-05 12:46:03 UTC (rev 90) @@ -0,0 +1,23 @@ +/* $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.graphics; + +public interface IDrawArea { + + void drawText(String text); + + void setPosition(int x, int y); + + void changePosition(int deltaX, int deltaY); + +} \ No newline at end of file Deleted: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IOutputArea.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IOutputArea.java 2006-06-05 12:45:55 UTC (rev 89) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IOutputArea.java 2006-06-05 12:46:03 UTC (rev 90) @@ -1,19 +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.graphics; - -public interface IOutputArea { - - void drawText(String text, int x, int y); - -} Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java 2006-06-05 12:45:55 UTC (rev 89) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java 2006-06-05 12:46:03 UTC (rev 90) @@ -12,7 +12,7 @@ */ package net.sourceforge.exmmt.renderer; -import net.sourceforge.exmmt.graphics.IOutputArea; +import net.sourceforge.exmmt.graphics.IDrawArea; import net.sourceforge.exmmt.graphics.ISizeCalculator; import org.eclipse.swt.graphics.Rectangle; @@ -28,10 +28,10 @@ this.attribute = attribute; } - public void render(IOutputArea outputArea) { + public void render(IDrawArea outputArea) { assert outputArea != null; - outputArea.drawText(attribute.getValue(), 0, 0); + outputArea.drawText(attribute.getValue()); } public Rectangle calculateSize(ISizeCalculator sizeCalculator) { 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 12:45:55 UTC (rev 89) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java 2006-06-05 12:46:03 UTC (rev 90) @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; -import net.sourceforge.exmmt.graphics.IOutputArea; +import net.sourceforge.exmmt.graphics.IDrawArea; import net.sourceforge.exmmt.graphics.ISizeCalculator; import org.eclipse.swt.graphics.Rectangle; @@ -41,7 +41,7 @@ return new Rectangle(0, 0, width, height); } - public void render(IOutputArea outputArea) { + public void render(IDrawArea outputArea) { } public void add(IRenderer subRenderer) { Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java 2006-06-05 12:45:55 UTC (rev 89) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java 2006-06-05 12:46:03 UTC (rev 90) @@ -14,12 +14,12 @@ import org.eclipse.swt.graphics.Rectangle; -import net.sourceforge.exmmt.graphics.IOutputArea; +import net.sourceforge.exmmt.graphics.IDrawArea; import net.sourceforge.exmmt.graphics.ISizeCalculator; public interface IRenderer { - void render(IOutputArea outputArea); + void render(IDrawArea outputArea); Rectangle calculateSize(ISizeCalculator sizeCalculator); Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java 2006-06-05 12:45:55 UTC (rev 89) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java 2006-06-05 12:46:03 UTC (rev 90) @@ -14,7 +14,7 @@ import org.eclipse.swt.graphics.Rectangle; -import net.sourceforge.exmmt.graphics.IOutputArea; +import net.sourceforge.exmmt.graphics.IDrawArea; import net.sourceforge.exmmt.graphics.ISizeCalculator; public class NullRenderer implements IRenderer { @@ -25,7 +25,7 @@ return bounds; } - public void render(IOutputArea outputArea) { + public void render(IDrawArea outputArea) { } } 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:43:47
|
Revision: 93 Author: lgrammel Date: 2006-06-05 06:04:57 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=93&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java 2006-06-05 12:50:43 UTC (rev 92) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java 2006-06-05 13:04:57 UTC (rev 93) @@ -24,4 +24,5 @@ int getX(); int getY(); + } \ No newline at end of file Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java 2006-06-05 12:50:43 UTC (rev 92) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java 2006-06-05 13:04:57 UTC (rev 93) @@ -21,23 +21,29 @@ public class AttributeRenderer implements IRenderer { private final Attribute attribute; - + + private Rectangle size; + public AttributeRenderer(Attribute attribute) { assert attribute != null; - + this.attribute = attribute; } public void render(IDrawArea outputArea) { assert outputArea != null; - + outputArea.drawText(attribute.getValue()); } - public Rectangle calculateSize(ISizeCalculator sizeCalculator) { + public void calculateSize(ISizeCalculator sizeCalculator) { assert sizeCalculator != null; - - return sizeCalculator.calculateSize(attribute.getValue()); + + this.size = sizeCalculator.calculateSize(attribute.getValue()); } - + + public Rectangle getSize() { + return size; + } + } 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 12:50:43 UTC (rev 92) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java 2006-06-05 13:04:57 UTC (rev 93) @@ -24,12 +24,15 @@ private final List<IRenderer> subRenderers = new ArrayList<IRenderer>(); - public Rectangle calculateSize(ISizeCalculator sizeCalculator) { + private Rectangle size; + + public void calculateSize(ISizeCalculator sizeCalculator) { int height = 0; int width = 0; for (IRenderer renderer : subRenderers) { - Rectangle bounds = renderer.calculateSize(sizeCalculator); + renderer.calculateSize(sizeCalculator); + Rectangle bounds = renderer.getSize(); if (bounds.height > height) { height = bounds.height; @@ -38,10 +41,22 @@ width += bounds.width; } - return new Rectangle(0, 0, width, height); + this.size = new Rectangle(0, 0, width, height); } - public void render(IDrawArea outputArea) { + public void render(IDrawArea drawArea) { + int oldX = drawArea.getX(); + int oldY = drawArea.getY(); + + for (IRenderer renderer : subRenderers) { + renderer.render(drawArea); + + Rectangle bounds = renderer.getSize(); + + drawArea.changePosition(bounds.width, 0); + } + + drawArea.setPosition(oldX, oldY); } public void add(IRenderer subRenderer) { @@ -50,4 +65,8 @@ subRenderers.add(subRenderer); } + public Rectangle getSize() { + return size; + } + } \ No newline at end of file Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java 2006-06-05 12:50:43 UTC (rev 92) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java 2006-06-05 13:04:57 UTC (rev 93) @@ -12,15 +12,17 @@ */ package net.sourceforge.exmmt.renderer; -import org.eclipse.swt.graphics.Rectangle; - import net.sourceforge.exmmt.graphics.IDrawArea; import net.sourceforge.exmmt.graphics.ISizeCalculator; +import org.eclipse.swt.graphics.Rectangle; + public interface IRenderer { - void render(IDrawArea outputArea); + void render(IDrawArea drawArea); - Rectangle calculateSize(ISizeCalculator sizeCalculator); + void calculateSize(ISizeCalculator sizeCalculator); + Rectangle getSize(); + } Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java 2006-06-05 12:50:43 UTC (rev 92) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java 2006-06-05 13:04:57 UTC (rev 93) @@ -21,7 +21,10 @@ private final Rectangle bounds = new Rectangle(0, 0, 0, 0); - public Rectangle calculateSize(ISizeCalculator sizeCalculator) { + public void calculateSize(ISizeCalculator sizeCalculator) { + } + + public Rectangle getSize() { return bounds; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
