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

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

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

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

Modified Paths:
--------------
    net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/DefaultDrawArea.java
    net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/NewModelText.java
    net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java
    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/DefaultDrawArea.java
===================================================================
--- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/DefaultDrawArea.java	2006-10-12 18:47:48 UTC (rev 120)
+++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/DefaultDrawArea.java	2006-10-12 18:54:59 UTC (rev 121)
@@ -4,6 +4,7 @@
 
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Rectangle;
 
@@ -11,42 +12,35 @@
 	
 	private final GC gc;
 
-	private int x;
+	private Point position;
 
-	private int y;
-
 	public DefaultDrawArea(GC gc) {
 		this.gc = gc;
 	}
 
-	public void setPosition(int x, int y) {
-		this.x = x;
-		this.y = y;
+	public void setPosition(Point position) {
+		this.position = position;
 	}
 
-	public int getY() {
-		return y;
+	public Point getPosition() {
+		return position;
 	}
 
-	public int getX() {
-		return x;
-	}
-
 	public void drawText(String text) {
-		gc.drawText(text, x, y);
+		gc.drawText(text, position.x, position.y);
 	}
 
 	public void changePosition(int deltaX, int deltaY) {
-		x += deltaX;
-		y += deltaY;
+		position.x += deltaX;
+		position.y += deltaY;
 	}
 	
 	public void drawFocusRectangle(Rectangle size) {
 		Color color = new Color(gc.getDevice(), new RGB(128, 128, 255));
 		Color oldBackground = gc.getBackground();
 		gc.setBackground(color);
-		gc.fillRectangle(x, y, size.width, size.height);
-		gc.drawRectangle(x, y, size.width, size.height);
+		gc.fillRectangle(position.x, position.y, size.width, size.height);
+		gc.drawRectangle(position.x, position.y, size.width, size.height);
 		gc.setBackground(oldBackground);
 	}
 	

Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/NewModelText.java
===================================================================
--- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/NewModelText.java	2006-10-12 18:47:48 UTC (rev 120)
+++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/NewModelText.java	2006-10-12 18:54:59 UTC (rev 121)
@@ -127,11 +127,10 @@
 		List<Point> locations = renderer.getLocations(focusedElementRenderer);
 		Rectangle size = focusedElementRenderer.getSize();
 		for (Point point : locations) {
-			int x = area.getX();
-			int y = area.getY();
-			area.setPosition(point.x, point.y);
+			Point originalPoint = area.getPosition();
+			area.setPosition(point);
 			area.drawFocusRectangle(size);
-			area.setPosition(x, y);			
+			area.setPosition(originalPoint);
 		}
 	}
 

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-10-12 18:47:48 UTC (rev 120)
+++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IDrawArea.java	2006-10-12 18:54:59 UTC (rev 121)
@@ -12,20 +12,18 @@
  */
 package net.sourceforge.exmmt.graphics;
 
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 
-// @tag todo.introduce: Point class
 public interface IDrawArea {
 
 	void drawText(String text);
 	
-	void setPosition(int x, int y);
+	void setPosition(Point position);
 	
 	void changePosition(int deltaX, int deltaY);
 
-	int getX();
-	
-	int getY();
+	Point getPosition();
 
 	void drawFocusRectangle(Rectangle 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-10-12 18:47:48 UTC (rev 120)
+++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java	2006-10-12 18:54:59 UTC (rev 121)
@@ -64,15 +64,14 @@
 	// drawarea with point stack, start and finish methods
 	// extract render as template method to superclass afterwards
 	public void render(IDrawArea drawArea) {
-		int originalX = drawArea.getX();
-		int originalY = drawArea.getY();
+		Point position = drawArea.getPosition();
 
 		for (IRenderer renderer : subRenderers) {
 			renderer.render(drawArea);
 			drawArea.changePosition(renderer.getSize().width, 0);
 		}
 
-		drawArea.setPosition(originalX, originalY);
+		drawArea.setPosition(position);
 	}
 
 	public void add(IRenderer subRenderer) {

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:47:48 UTC (rev 120)
+++ net.sourceforge.exmmt.test/trunk/src/net/sourceforge/exmmt/renderer/HorizontalSequenceRendererTest.java	2006-10-12 18:54:59 UTC (rev 121)
@@ -139,13 +139,11 @@
 	public void render() {
 		IDrawArea drawArea = createMock(IDrawArea.class);
 
-		int startingX = 1;
-		int startingY = 2;
+		Point position = new Point(1,2);
 
-		expect(drawArea.getX()).andReturn(startingX);
-		expect(drawArea.getY()).andReturn(startingY);
+		expect(drawArea.getPosition()).andReturn(position);
 
-		drawArea.setPosition(startingX, startingY);
+		drawArea.setPosition(position);
 
 		expectRendering(drawArea, childRenderer1, new Rectangle(0, 0, 10, 10));
 		expectRendering(drawArea, childRenderer2, new Rectangle(0, 0, 11, 11));


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