[Exmmt-commit] SF.net SVN: exmmt: [112] net.sourceforge.exmmt/trunk/src/java/net/ sourceforge/exmmt

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

Revision: 112
          http://svn.sourceforge.net/exmmt/?rev=112&view=rev
Author:   lgrammel
Date:     2006-10-12 09:32:39 -0700 (Thu, 12 Oct 2006)

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

Modified Paths:
--------------
    net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/NewModelText.java

Added Paths:
-----------
    net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/DefaultSizeCalculator.java

Added: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/DefaultSizeCalculator.java
===================================================================
--- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/DefaultSizeCalculator.java	                        (rev 0)
+++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/DefaultSizeCalculator.java	2006-10-12 16:32:39 UTC (rev 112)
@@ -0,0 +1,27 @@
+/**
+ * 
+ */
+package net.sourceforge.exmmt;
+
+import net.sourceforge.exmmt.graphics.ISizeCalculator;
+
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.graphics.TextLayout;
+
+public final class DefaultSizeCalculator implements ISizeCalculator {
+	
+	private final GC gc;
+
+	public DefaultSizeCalculator(GC gc) {
+		this.gc = gc;
+	}
+
+	public Rectangle calculateSize(String text) {
+		TextLayout textLayout = new TextLayout(gc.getDevice());
+		
+		textLayout.setText(text);
+		
+		return textLayout.getBounds();
+	}
+}
\ No newline at end of file

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 16:30:12 UTC (rev 111)
+++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/NewModelText.java	2006-10-12 16:32:39 UTC (rev 112)
@@ -15,14 +15,11 @@
 import net.sourceforge.exmmt.builder.Controller;
 import net.sourceforge.exmmt.builder.ControllerTreeBuilder;
 import net.sourceforge.exmmt.graphics.IDrawArea;
-import net.sourceforge.exmmt.graphics.ISizeCalculator;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.graphics.TextLayout;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Caret;
 import org.eclipse.swt.widgets.Composite;
@@ -86,17 +83,7 @@
 		Element root = getDocumentRoot();
 		Controller controller = builder.build(root);
 
-		controller.getRenderer().calculateSize(new ISizeCalculator() {
-		
-			public Rectangle calculateSize(String text) {
-				TextLayout textLayout = new TextLayout(gc.getDevice());
-				
-				textLayout.setText(text);
-				
-				return textLayout.getBounds();
-			}
-		
-		});
+		controller.getRenderer().calculateSize(new DefaultSizeCalculator(gc));
 		controller.getRenderer().render(area);
 
 		color.dispose();


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