[Exmmt-commit] SF.net SVN: exmmt: [118] net.sourceforge.exmmt

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

Revision: 118
          http://svn.sourceforge.net/exmmt/?rev=118&view=rev
Author:   lgrammel
Date:     2006-10-12 11:17:30 -0700 (Thu, 12 Oct 2006)

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

Modified Paths:
--------------
    net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java
    net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java

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-10-12 18:03:10 UTC (rev 117)
+++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java	2006-10-12 18:17:30 UTC (rev 118)
@@ -45,8 +45,16 @@
 	public List<Point> getLocations(IRenderer renderer) {
 		List<Point> list = super.getLocations(renderer);
 		
+		int currentY = 0;
+		
 		for (IRenderer subRenderer : subRenderers) {
-			list.addAll(subRenderer.getLocations(renderer));
+			List<Point> subLocations = subRenderer.getLocations(renderer);
+			
+			for (Point location : subLocations) {
+				list.add(new Point(currentY + location.x, location.y));
+			}
+			
+			currentY += subRenderer.getSize().width;
 		}
 
 		return list;

Modified: net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java
===================================================================
--- net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java	2006-10-12 18:03:10 UTC (rev 117)
+++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java	2006-10-12 18:17:30 UTC (rev 118)
@@ -76,10 +76,14 @@
 
 	@Override
 	public void getSelfLocation() {
+		Rectangle size = new Rectangle(2, 3, 4, 5);
+
 		expect(childRenderer1.getLocations(renderer)).andReturn(
 				new ArrayList<Point>());
+		expect(childRenderer1.getSize()).andReturn(size);
 		expect(childRenderer2.getLocations(renderer)).andReturn(
 				new ArrayList<Point>());
+		expect(childRenderer2.getSize()).andReturn(size);
 		replay(childRenderer1, childRenderer2);
 
 		super.getSelfLocation();
@@ -90,19 +94,23 @@
 	@Test
 	public void getSubLocations() {
 		Point point = new Point(2, 2);
+		Rectangle child1Size = new Rectangle(2, 3, 4, 5);
 
 		List<Point> list = new ArrayList<Point>();
 		list.add(point);
 
-		expect(childRenderer1.getLocations(childRenderer1)).andReturn(list);
-		expect(childRenderer2.getLocations(childRenderer1)).andReturn(
+		expect(childRenderer1.getLocations(childRenderer2)).andReturn(
 				new ArrayList<Point>());
+		expect(childRenderer1.getSize()).andReturn(child1Size);
+		expect(childRenderer2.getLocations(childRenderer2)).andReturn(list);
+		expect(childRenderer2.getSize()).andReturn(child1Size);
 		replay(childRenderer1, childRenderer2);
 
-		List<Point> locations = renderer.getLocations(childRenderer1);
+		List<Point> locations = renderer.getLocations(childRenderer2);
 
 		assertEquals(1, locations.size());
-		assertEquals(point, locations.get(0));
+		assertEquals(new Point(point.x + child1Size.width, point.y), locations
+				.get(0));
 
 		verify(childRenderer1, childRenderer2);
 	}


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