You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@locus.apache.org on 2000/07/18 07:37:11 UTC
cvs commit: xml-fop/src/org/apache/fop/svg Circle.java Ellipse.java Line.java LinearGradient.java RadialGradient.java Rect.java SVGElementMapping.java Stop.java
keiron 00/07/17 22:37:11
Modified: src/org/apache/fop/svg Circle.java Ellipse.java Line.java
LinearGradient.java RadialGradient.java Rect.java
SVGElementMapping.java Stop.java
Log:
changes for new java bindings
Revision Changes Path
1.2 +4 -4 xml-fop/src/org/apache/fop/svg/Circle.java
Index: Circle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/Circle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Circle.java 2000/07/11 05:09:28 1.1
+++ Circle.java 2000/07/18 05:37:09 1.2
@@ -1,4 +1,4 @@
-/*-- $Id: Circle.java,v 1.1 2000/07/11 05:09:28 keiron Exp $ --
+/*-- $Id: Circle.java,v 1.2 2000/07/18 05:37:09 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -115,9 +115,9 @@
SVGLength cy = ((SVGLengthProperty)this.properties.get("cy")).getSVGLength();
SVGLength r = ((SVGLengthProperty)this.properties.get("r")).getSVGLength();
SVGCircleElementImpl graph = new SVGCircleElementImpl();
- graph.setCx(cx);
- graph.setCy(cy);
- graph.setR(r);
+ graph.setCx(new SVGAnimatedLengthImpl(cx));
+ graph.setCy(new SVGAnimatedLengthImpl(cy));
+ graph.setR(new SVGAnimatedLengthImpl(r));
graph.setStyle(((SVGStyle)this.properties.get("style")).getStyle());
graph.setTransform(((SVGTransform)this.properties.get("transform")).oldgetTransform());
graph.setId(this.properties.get("id").getString());
1.2 +5 -5 xml-fop/src/org/apache/fop/svg/Ellipse.java
Index: Ellipse.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/Ellipse.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ellipse.java 2000/07/11 05:09:29 1.1
+++ Ellipse.java 2000/07/18 05:37:10 1.2
@@ -1,4 +1,4 @@
-/*-- $Id: Ellipse.java,v 1.1 2000/07/11 05:09:29 keiron Exp $ --
+/*-- $Id: Ellipse.java,v 1.2 2000/07/18 05:37:10 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -114,10 +114,10 @@
SVGLength rx = ((SVGLengthProperty)this.properties.get("rx")).getSVGLength();
SVGLength ry = ((SVGLengthProperty)this.properties.get("ry")).getSVGLength();
SVGEllipseElementImpl graph = new SVGEllipseElementImpl();
- graph.setCx(cx);
- graph.setCy(cy);
- graph.setRx(rx);
- graph.setRy(ry);
+ graph.setCx(new SVGAnimatedLengthImpl(cx));
+ graph.setCy(new SVGAnimatedLengthImpl(cy));
+ graph.setRx(new SVGAnimatedLengthImpl(rx));
+ graph.setRy(new SVGAnimatedLengthImpl(ry));
graph.setStyle(((SVGStyle)this.properties.get("style")).getStyle());
graph.setTransform(((SVGTransform)this.properties.get("transform")).oldgetTransform());
graph.setId(this.properties.get("id").getString());
1.9 +5 -6 xml-fop/src/org/apache/fop/svg/Line.java
Index: Line.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/Line.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Line.java 2000/07/11 05:09:30 1.8
+++ Line.java 2000/07/18 05:37:10 1.9
@@ -1,4 +1,4 @@
-/*-- $Id: Line.java,v 1.8 2000/07/11 05:09:30 keiron Exp $ --
+/*-- $Id: Line.java,v 1.9 2000/07/18 05:37:10 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -54,7 +54,6 @@
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.messaging.MessageHandler;
-//import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.FontState;
import org.apache.fop.apps.FOPException;
@@ -117,10 +116,10 @@
SVGLength y1 = ((SVGLengthProperty)this.properties.get("y1")).getSVGLength();
SVGLength y2 = ((SVGLengthProperty)this.properties.get("y2")).getSVGLength();
SVGLineElementImpl graph = new SVGLineElementImpl();
- graph.setX1(x1);
- graph.setY1(y1);
- graph.setX2(x2);
- graph.setY2(y2);
+ graph.setX1(new SVGAnimatedLengthImpl(x1));
+ graph.setY1(new SVGAnimatedLengthImpl(y1));
+ graph.setX2(new SVGAnimatedLengthImpl(x2));
+ graph.setY2(new SVGAnimatedLengthImpl(y2));
graph.setStyle(((SVGStyle)this.properties.get("style")).getStyle());
graph.setTransform(((SVGTransform)this.properties.get("transform")).oldgetTransform());
graph.setId(this.properties.get("id").getString());
1.2 +5 -5 xml-fop/src/org/apache/fop/svg/LinearGradient.java
Index: LinearGradient.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/LinearGradient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LinearGradient.java 2000/07/11 05:09:33 1.1
+++ LinearGradient.java 2000/07/18 05:37:10 1.2
@@ -1,4 +1,4 @@
-/*-- $Id: LinearGradient.java,v 1.1 2000/07/11 05:09:33 keiron Exp $ --
+/*-- $Id: LinearGradient.java,v 1.2 2000/07/18 05:37:10 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -123,10 +123,10 @@
linear.setTransform(((SVGTransform)this.properties.get("transform")).oldgetTransform());
linear.setId(this.properties.get("id").getString());
- linear.setX1(((SVGLengthProperty)this.properties.get("x1")).getSVGLength());
- linear.setX2(((SVGLengthProperty)this.properties.get("x2")).getSVGLength());
- linear.setY1(((SVGLengthProperty)this.properties.get("y1")).getSVGLength());
- linear.setY2(((SVGLengthProperty)this.properties.get("y2")).getSVGLength());
+ linear.setX1(new SVGAnimatedLengthImpl(((SVGLengthProperty)this.properties.get("x1")).getSVGLength()));
+ linear.setX2(new SVGAnimatedLengthImpl(((SVGLengthProperty)this.properties.get("x2")).getSVGLength()));
+ linear.setY1(new SVGAnimatedLengthImpl(((SVGLengthProperty)this.properties.get("y1")).getSVGLength()));
+ linear.setY2(new SVGAnimatedLengthImpl(((SVGLengthProperty)this.properties.get("y2")).getSVGLength()));
// linear.setSpreadMethod(?);
return linear;
}
1.2 +6 -6 xml-fop/src/org/apache/fop/svg/RadialGradient.java
Index: RadialGradient.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/RadialGradient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RadialGradient.java 2000/07/11 05:09:35 1.1
+++ RadialGradient.java 2000/07/18 05:37:10 1.2
@@ -1,4 +1,4 @@
-/*-- $Id: RadialGradient.java,v 1.1 2000/07/11 05:09:35 keiron Exp $ --
+/*-- $Id: RadialGradient.java,v 1.2 2000/07/18 05:37:10 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -123,11 +123,11 @@
radial.setTransform(((SVGTransform)this.properties.get("transform")).oldgetTransform());
radial.setId(this.properties.get("id").getString());
- radial.setCx(((SVGLengthProperty)this.properties.get("cx")).getSVGLength());
- radial.setCy(((SVGLengthProperty)this.properties.get("cy")).getSVGLength());
- radial.setR(((SVGLengthProperty)this.properties.get("r")).getSVGLength());
- radial.setFx(((SVGLengthProperty)this.properties.get("fx")).getSVGLength());
- radial.setFy(((SVGLengthProperty)this.properties.get("fy")).getSVGLength());
+ radial.setCx(new SVGAnimatedLengthImpl(((SVGLengthProperty)this.properties.get("cx")).getSVGLength()));
+ radial.setCy(new SVGAnimatedLengthImpl(((SVGLengthProperty)this.properties.get("cy")).getSVGLength()));
+ radial.setR(new SVGAnimatedLengthImpl(((SVGLengthProperty)this.properties.get("r")).getSVGLength()));
+ radial.setFx(new SVGAnimatedLengthImpl(((SVGLengthProperty)this.properties.get("fx")).getSVGLength()));
+ radial.setFy(new SVGAnimatedLengthImpl(((SVGLengthProperty)this.properties.get("fy")).getSVGLength()));
return radial;
}
1.9 +5 -5 xml-fop/src/org/apache/fop/svg/Rect.java
Index: Rect.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/Rect.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Rect.java 2000/07/11 05:09:35 1.8
+++ Rect.java 2000/07/18 05:37:10 1.9
@@ -1,4 +1,4 @@
-/*-- $Id: Rect.java,v 1.8 2000/07/11 05:09:35 keiron Exp $ --
+/*-- $Id: Rect.java,v 1.9 2000/07/18 05:37:10 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -118,10 +118,10 @@
SVGLength x = ((SVGLengthProperty)this.properties.get("x")).getSVGLength();
SVGLength y = ((SVGLengthProperty)this.properties.get("y")).getSVGLength();
SVGRectElementImpl graph = new SVGRectElementImpl();
- graph.setX(x);
- graph.setY(y);
- graph.setWidth(width);
- graph.setHeight(height);
+ graph.setX(new SVGAnimatedLengthImpl(x));
+ graph.setY(new SVGAnimatedLengthImpl(y));
+ graph.setWidth(new SVGAnimatedLengthImpl(width));
+ graph.setHeight(new SVGAnimatedLengthImpl(height));
graph.setStyle(((SVGStyle)this.properties.get("style")).getStyle());
graph.setTransform(((SVGTransform)this.properties.get("transform")).oldgetTransform());
graph.setId(this.properties.get("id").getString());
1.7 +2 -2 xml-fop/src/org/apache/fop/svg/SVGElementMapping.java
Index: SVGElementMapping.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGElementMapping.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGElementMapping.java 2000/07/11 05:09:38 1.6
+++ SVGElementMapping.java 2000/07/18 05:37:10 1.7
@@ -1,4 +1,4 @@
-/*-- $Id: SVGElementMapping.java,v 1.6 2000/07/11 05:09:38 keiron Exp $ --
+/*-- $Id: SVGElementMapping.java,v 1.7 2000/07/18 05:37:10 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -56,7 +56,7 @@
public class SVGElementMapping implements ElementMapping {
public void addToBuilder(FOTreeBuilder builder) {
- String uri = "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd";
+ String uri = "http://www.w3.org/TR/2000/WD-SVG-20000629/DTD/svg-20000629.dtd";
builder.addMapping(uri, "svg", SVG.maker());
builder.addMapping(uri, "rect", Rect.maker());
builder.addMapping(uri, "line", Line.maker());
1.2 +2 -2 xml-fop/src/org/apache/fop/svg/Stop.java
Index: Stop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/Stop.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Stop.java 2000/07/11 05:09:39 1.1
+++ Stop.java 2000/07/18 05:37:10 1.2
@@ -1,4 +1,4 @@
-/*-- $Id: Stop.java,v 1.1 2000/07/11 05:09:39 keiron Exp $ --
+/*-- $Id: Stop.java,v 1.2 2000/07/18 05:37:10 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -113,7 +113,7 @@
SVGStopElementImpl sse = new SVGStopElementImpl();
sse.setStyle(((SVGStyle)this.properties.get("style")).getStyle());
SVGLength offset = ((SVGLengthProperty)this.properties.get("offset")).getSVGLength();
- sse.setOffset(offset.getValue()); // what about percentages
+ sse.setOffset(new SVGAnimatedNumberImpl(offset.getValue())); // what about percentages
sse.setId(this.properties.get("id").getString());
return sse;
}