Thread: [Exmmt-commit] SF.net SVN: exmmt: [81] net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/r
Status: Inactive
Brought to you by:
lgrammel
|
From: <lgr...@us...> - 2006-06-05 23:36:03
|
Revision: 81 Author: lgrammel Date: 2006-06-05 05:00:27 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=81&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/graphics/ISizeCalculator.java Added: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/ISizeCalculator.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/ISizeCalculator.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/ISizeCalculator.java 2006-06-05 12:00:27 UTC (rev 81) @@ -0,0 +1,21 @@ +/* $HeadURL: https://svn.sourceforge.net/svnroot/exmmt/net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/graphics/IOutputArea.java $ + * ----------------------------------------------------------------------------- + * + * 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; + +import org.eclipse.swt.graphics.Rectangle; + +public interface ISizeCalculator { + + Rectangle calculateSize(String text); + +} \ 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:00:19 UTC (rev 80) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java 2006-06-05 12:00:27 UTC (rev 81) @@ -12,10 +12,12 @@ */ package net.sourceforge.exmmt.renderer; +import net.sourceforge.exmmt.graphics.IOutputArea; +import net.sourceforge.exmmt.graphics.ISizeCalculator; + +import org.eclipse.swt.graphics.Rectangle; import org.jdom.Attribute; -import net.sourceforge.exmmt.graphics.IOutputArea; - public class AttributeRenderer implements IRenderer { private final Attribute attribute; @@ -31,5 +33,11 @@ outputArea.drawText(attribute.getValue(), 0, 0); } + + public Rectangle calculateSize(ISizeCalculator sizeCalculator) { + assert sizeCalculator != null; + + return sizeCalculator.calculateSize(attribute.getValue()); + } } 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:36:03
|
Revision: 83 Author: lgrammel Date: 2006-06-05 05:09:03 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=83&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- 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/renderer/IRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java 2006-06-05 12:08:53 UTC (rev 82) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/IRenderer.java 2006-06-05 12:09:03 UTC (rev 83) @@ -12,10 +12,15 @@ */ package net.sourceforge.exmmt.renderer; +import org.eclipse.swt.graphics.Rectangle; + import net.sourceforge.exmmt.graphics.IOutputArea; +import net.sourceforge.exmmt.graphics.ISizeCalculator; public interface IRenderer { void render(IOutputArea 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:08:53 UTC (rev 82) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java 2006-06-05 12:09:03 UTC (rev 83) @@ -12,10 +12,19 @@ */ package net.sourceforge.exmmt.renderer; +import org.eclipse.swt.graphics.Rectangle; + import net.sourceforge.exmmt.graphics.IOutputArea; +import net.sourceforge.exmmt.graphics.ISizeCalculator; public class NullRenderer implements IRenderer { + private final Rectangle bounds = new Rectangle(0, 0, 0, 0); + + public Rectangle calculateSize(ISizeCalculator sizeCalculator) { + return bounds; + } + public void render(IOutputArea 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:35
|
Revision: 97 Author: lgrammel Date: 2006-06-05 07:01:28 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=97&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/NullRenderer.java Added Paths: ----------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AbstractRenderer.java Added: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AbstractRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AbstractRenderer.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AbstractRenderer.java 2006-06-05 14:01:28 UTC (rev 97) @@ -0,0 +1,29 @@ +/* $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 org.eclipse.swt.graphics.Rectangle; + +public abstract class AbstractRenderer implements IRenderer { + + private Rectangle size; + + public Rectangle getSize() { + return size; + } + + protected void setSize(Rectangle size) { + this.size = size; + } + +} \ No newline at end of file Property changes on: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AbstractRenderer.java ___________________________________________________________________ Name: svn:keywords + HeadURL Id LastChangedBy LastChangedDate LastChangedRevision 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 13:10:18 UTC (rev 96) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java 2006-06-05 14:01:28 UTC (rev 97) @@ -15,15 +15,12 @@ import net.sourceforge.exmmt.graphics.IDrawArea; import net.sourceforge.exmmt.graphics.ISizeCalculator; -import org.eclipse.swt.graphics.Rectangle; import org.jdom.Attribute; -public class AttributeRenderer implements IRenderer { +public class AttributeRenderer extends AbstractRenderer { private final Attribute attribute; - private Rectangle size; - public AttributeRenderer(Attribute attribute) { assert attribute != null; @@ -39,11 +36,7 @@ public void calculateSize(ISizeCalculator sizeCalculator) { assert sizeCalculator != null; - this.size = sizeCalculator.calculateSize(attribute.getValue()); + setSize(sizeCalculator.calculateSize(attribute.getValue())); } - public Rectangle getSize() { - return size; - } - -} +} \ No newline at end of file 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 13:10:18 UTC (rev 96) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/HorizontalSequenceRenderer.java 2006-06-05 14:01:28 UTC (rev 97) @@ -20,12 +20,10 @@ import org.eclipse.swt.graphics.Rectangle; -public class HorizontalSequenceRenderer implements IRenderer { +public class HorizontalSequenceRenderer extends AbstractRenderer { private final List<IRenderer> subRenderers = new ArrayList<IRenderer>(); - private Rectangle size; - public void calculateSize(ISizeCalculator sizeCalculator) { int height = 0; int width = 0; @@ -41,7 +39,7 @@ width += bounds.width; } - this.size = new Rectangle(0, 0, width, height); + setSize(new Rectangle(0, 0, width, height)); } public void render(IDrawArea drawArea) { @@ -65,8 +63,4 @@ 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/NullRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java 2006-06-05 13:10:18 UTC (rev 96) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/NullRenderer.java 2006-06-05 14:01:28 UTC (rev 97) @@ -17,17 +17,15 @@ import net.sourceforge.exmmt.graphics.IDrawArea; import net.sourceforge.exmmt.graphics.ISizeCalculator; -public class NullRenderer implements IRenderer { +public class NullRenderer extends AbstractRenderer { - private final Rectangle bounds = new Rectangle(0, 0, 0, 0); + public NullRenderer() { + setSize(new Rectangle(0, 0, 0, 0)); + } public void calculateSize(ISizeCalculator sizeCalculator) { } - public Rectangle getSize() { - return bounds; - } - 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. |
|
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-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 02:08:46
|
Revision: 67 Author: lgrammel Date: 2006-06-05 03:33:51 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=67&view=rev Log Message: ----------- #1500774 scenario "shopping list" Added Paths: ----------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java Removed Paths: ------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java Copied: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java (from rev 29, net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java) =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java (rev 0) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/AttributeRenderer.java 2006-06-05 10:33:51 UTC (rev 67) @@ -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 AttributeRenderer { + + public void render(IOutputArea outputArea, String text) { + assert outputArea != null; + + outputArea.drawText(text, 0, 0); + } + +} Deleted: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java 2006-06-05 10:33:40 UTC (rev 66) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/renderer/SimpleTextRenderer.java 2006-06-05 10:33:51 UTC (rev 67) @@ -1,25 +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 net.sourceforge.exmmt.graphics.IOutputArea; - -public class SimpleTextRenderer { - - public void render(IOutputArea outputArea, String text) { - assert outputArea != null; - - outputArea.drawText(text, 0, 0); - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |