You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-dev@xmlgraphics.apache.org by vh...@apache.org on 2001/04/20 09:23:33 UTC
cvs commit: xml-batik/test-sources/org/apache/batik/test/xml XMLReflect.java
vhardy 01/04/20 00:23:32
Modified: . build.xml
test-resources/org/apache/batik/test regard.xml
test-sources/org/apache/batik/svggen SVGAccuracyTest.java
test-sources/org/apache/batik/test/xml XMLReflect.java
Added: test-sources/org/apache/batik/svggen BasicShapes.java
Log:
+ Added first Painter implementation for regsvggen.
+ Added default constructor for <arg> elements with not value
+ Modified build.xml to make directory for candidate reference
SVG files.
Revision Changes Path
1.57 +2 -1 xml-batik/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-batik/build.xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- build.xml 2001/04/19 17:30:57 1.56
+++ build.xml 2001/04/20 07:23:10 1.57
@@ -45,7 +45,7 @@
[win32] .\build.bat help
- $Id: build.xml,v 1.56 2001/04/19 17:30:57 deweese Exp $
+ $Id: build.xml,v 1.57 2001/04/20 07:23:10 vhardy Exp $
-->
@@ -586,6 +586,7 @@
<mkdir dir="${test-references}/samples/tests/candidate-variation"/>
<mkdir dir="${test-references}/svgbe/accepted-variation"/>
<mkdir dir="${test-references}/svgbe/candidate-variation"/>
+ <mkdir dir="${test-references}/org/apache/batik/svggen/candidate-ref" />
</target>
<target name="regard"
1.3 +2 -1 xml-batik/test-resources/org/apache/batik/test/regard.xml
Index: regard.xml
===================================================================
RCS file: /home/cvs/xml-batik/test-resources/org/apache/batik/test/regard.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- regard.xml 2001/04/20 06:36:17 1.2
+++ regard.xml 2001/04/20 07:23:17 1.3
@@ -11,7 +11,7 @@
<!-- regression testing. -->
<!-- -->
<!-- @author vincent.hardy@eng.sun.com -->
-<!-- @version $Id: regard.xml,v 1.2 2001/04/20 06:36:17 vhardy Exp $ -->
+<!-- @version $Id: regard.xml,v 1.3 2001/04/20 07:23:17 vhardy Exp $ -->
<!-- ========================================================================= -->
<testRun name="Batik Standard Regression Test Run">
<testRun name="REGARD">
@@ -29,6 +29,7 @@
</testReportProcessor>
<testSuite href="file:test-resources/org/apache/batik/test/samplesRendering.xml" />
+ <testSuite href="file:test-resources/org/apache/batik/svggen/regsvggen.xml" />
<testSuite href="file:test-resources/org/apache/batik/test/unitTesting.xml" />
</testRun>
1.2 +10 -1 xml-batik/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java
Index: SVGAccuracyTest.java
===================================================================
RCS file: /home/cvs/xml-batik/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGAccuracyTest.java 2001/04/20 06:36:14 1.1
+++ SVGAccuracyTest.java 2001/04/20 07:23:23 1.2
@@ -8,6 +8,8 @@
package org.apache.batik.svggen;
+import java.awt.Dimension;
+
import java.net.URL;
import java.io.BufferedInputStream;
@@ -38,7 +40,7 @@
* SVG reference.
*
* @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
- * @version $Id: SVGAccuracyTest.java,v 1.1 2001/04/20 06:36:14 vhardy Exp $
+ * @version $Id: SVGAccuracyTest.java,v 1.2 2001/04/20 07:23:23 vhardy Exp $
*/
public class SVGAccuracyTest extends AbstractTest
implements SVGConstants{
@@ -80,6 +82,12 @@
= "SVGAccuracyTest.entry.key.error.description";
/**
+ * Canvas size for all tests
+ */
+ public static final Dimension CANVAS_SIZE
+ = new Dimension(300, 400);
+
+ /**
* Painter which performs an arbitrary rendering
* sequence.
*/
@@ -126,6 +134,7 @@
= new DefaultTestReport(this);
SVGGraphics2D g2d = buildSVGGraphics2D();
+ g2d.setSVGCanvasSize(CANVAS_SIZE);
//
// Generate SVG content
1.1 xml-batik/test-sources/org/apache/batik/svggen/BasicShapes.java
Index: BasicShapes.java
===================================================================
/*****************************************************************************
* Copyright (C) The Apache Software Foundation. All rights reserved. *
* ------------------------------------------------------------------------- *
* This software is published under the terms of the Apache Software License *
* version 1.1, a copy of which has been included with this distribution in *
* the LICENSE file. *
*****************************************************************************/
package org.apache.batik.svggen;
import java.awt.*;
import java.awt.geom.*;
/**
* This test validates the convertion of Java 2D shapes into SVG
* Shapes.
*
* @author <a href="mailto:vhardy@eng.sun.com">Vincent Hardy</a>
* @version $Id: BasicShapes.java,v 1.1 2001/04/20 07:23:22 vhardy Exp $
*/
public class BasicShapes implements Painter {
public void paint(Graphics2D g){
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
g.setPaint(Color.black);
// Rectangle
g.drawString("Rectangle", 10, 20);
Rectangle rect = new Rectangle(10, 30, 50, 40);
g.draw(rect);
g.translate(0, 90);
// Round Rectangle
g.drawString("RoundRectangle", 10, 20);
RoundRectangle2D roundRect = new RoundRectangle2D.Double(10, 30, 50, 40, 10, 10);
g.draw(roundRect);
g.translate(0, 90);
// Circle
g.drawString("Circle", 10, 20);
Ellipse2D circle = new Ellipse2D.Float(10, 30, 50, 50);
g.draw(circle);
g.translate(0, 90);
// CubicCurve2D
g.drawString("CubicCurve2D", 10, 20);
CubicCurve2D curve = new CubicCurve2D.Float(10, 55, 22.5f, 00, 38.5f, 110, 60, 55);
g.draw(curve);
g.translate(150, -270);
// Polygon
g.drawString("Polygon", 10, 20);
Polygon polygon = new Polygon(new int[] { 30, 50, 10 },
new int[] { 30, 60, 60 },
3);
g.draw(polygon);
g.translate(0, 90);
// General Path
g.drawString("GeneralPath", 10, 20);
GeneralPath path = new GeneralPath();
path.moveTo(30, 30);
path.quadTo(30, 50, 50, 60);
path.quadTo(30, 50, 10, 60);
path.quadTo(30, 50, 30, 30);
path.closePath();
g.draw(path);
g.translate(0, 90);
// Area
g.drawString("Area", 10, 20);
Area area = new Area(new Rectangle(10, 30, 50, 50));
area.subtract(new Area(new Ellipse2D.Double(12, 32, 46, 46)));
g.fill(area);
g.translate(0, 90);
// QuadCurve 2D
g.drawString("QuadCurve2D", 10, 20);
QuadCurve2D quad = new QuadCurve2D.Float(10, 55, 35, 105, 60, 55);
g.draw(quad);
g.translate(-75, 70);
// Line
g.drawString("Line2D", 10, 20);
g.draw(new Line2D.Float(10, 30, 60, 30));
}
}
1.2 +16 -9 xml-batik/test-sources/org/apache/batik/test/xml/XMLReflect.java
Index: XMLReflect.java
===================================================================
RCS file: /home/cvs/xml-batik/test-sources/org/apache/batik/test/xml/XMLReflect.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLReflect.java 2001/04/20 06:36:15 1.1
+++ XMLReflect.java 2001/04/20 07:23:28 1.2
@@ -23,7 +23,7 @@
* XML description.
*
* @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
- * @version $Id: XMLReflect.java,v 1.1 2001/04/20 06:36:15 vhardy Exp $
+ * @version $Id: XMLReflect.java,v 1.2 2001/04/20 07:23:28 vhardy Exp $
*/
public class XMLReflect implements XMLReflectConstants{
/**
@@ -161,16 +161,23 @@
String classAttr = element.getAttributeNS(null,
XR_CLASS_ATTRIBUTE);
- String value = element.getAttributeNS(null,
- XR_VALUE_ATTRIBUTE);
-
// String based argument
Class cl = Class.forName(classAttr);
-
- Constructor constructor
- = cl.getDeclaredConstructor(new Class[] { String.class });
-
- return constructor.newInstance(new Object[] {value});
+
+ if(element.hasAttributeNS(null, XR_VALUE_ATTRIBUTE)){
+ String value = element.getAttributeNS(null,
+ XR_VALUE_ATTRIBUTE);
+
+
+ Constructor constructor
+ = cl.getDeclaredConstructor(new Class[] { String.class });
+
+ return constructor.newInstance(new Object[] {value});
+ }
+ else{
+ // Default constructor
+ return cl.newInstance();
+ }
}
else{
return buildObject(element);
---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org