Author: acumiskey
Date: Wed Oct 29 04:21:32 2008
New Revision: 708877
URL: http://svn.apache.org/viewvc?rev=708877&view=rev
Log:
Renamed GenericGraphics2DImagePainter to a slightly more meaningful name of
BatikGraphics2DImagePainter.
Added:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/BatikGraphics2DImagePainter.java
(contents, props changed)
- copied, changed from r707630,
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/GenericGraphics2DImagePainter.java
Removed:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/GenericGraphics2DImagePainter.java
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageGraphics2DFactory.java
Copied:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/BatikGraphics2DImagePainter.java
(from r707630,
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/GenericGraphics2DImagePainter.java)
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/BatikGraphics2DImagePainter.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/BatikGraphics2DImagePainter.java&p1=xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/GenericGraphics2DImagePainter.java&r1=707630&r2=708877&rev=708877&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/GenericGraphics2DImagePainter.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/BatikGraphics2DImagePainter.java
Wed Oct 29 04:21:32 2008
@@ -12,7 +12,7 @@
/**
* A generic graphics 2D image painter implementation
*/
-public class GenericGraphics2DImagePainter implements Graphics2DImagePainter {
+public class BatikGraphics2DImagePainter implements Graphics2DImagePainter {
protected final ImageXMLDOM svg;
protected final BridgeContext ctx;
@@ -25,7 +25,7 @@
* @param ctx the bridge context
* @param root the graphics node root
*/
- public GenericGraphics2DImagePainter(ImageXMLDOM svg, BridgeContext ctx,
GraphicsNode root) {
+ public BatikGraphics2DImagePainter(ImageXMLDOM svg, BridgeContext ctx,
GraphicsNode root) {
this.svg = svg;
this.ctx = ctx;
this.root = root;
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/BatikGraphics2DImagePainter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/BatikGraphics2DImagePainter.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/BatikGraphics2DImagePainter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 29 04:21:32 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/image/loader/batik/GenericGraphics2DImagePainter.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/GenericGraphics2DImagePainter.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java?rev=708877&r1=708876&r2=708877&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
Wed Oct 29 04:21:32 2008
@@ -116,7 +116,7 @@
*/
protected Graphics2DImagePainter createPainter(
final ImageXMLDOM svg, final BridgeContext ctx, final GraphicsNode
root) {
- return new GenericGraphics2DImagePainter(svg, ctx, root);
+ return new BatikGraphics2DImagePainter(svg, ctx, root);
}
/** [EMAIL PROTECTED] */
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageGraphics2DFactory.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageGraphics2DFactory.java?rev=708877&r1=708876&r2=708877&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageGraphics2DFactory.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageGraphics2DFactory.java
Wed Oct 29 04:21:32 2008
@@ -36,7 +36,7 @@
import org.apache.fop.afp.AFPTextElementBridge;
import org.apache.fop.afp.AFPTextHandler;
import org.apache.fop.afp.AFPTextPainter;
-import org.apache.fop.image.loader.batik.GenericGraphics2DImagePainter;
+import org.apache.fop.image.loader.batik.BatikGraphics2DImagePainter;
import org.apache.fop.render.RendererContext;
import org.apache.fop.svg.SVGUserAgent;
import org.apache.xmlgraphics.image.loader.impl.ImageGraphics2D;
@@ -117,8 +117,8 @@
// set painter
ImageGraphics2D imageG2D =
(ImageGraphics2D)rendererImageInfo.getImage();
- GenericGraphics2DImagePainter painter
- =
(GenericGraphics2DImagePainter)imageG2D.getGraphics2DImagePainter();
+ BatikGraphics2DImagePainter painter
+ =
(BatikGraphics2DImagePainter)imageG2D.getGraphics2DImagePainter();
painter = new AFPGraphics2DImagePainter(painter);
imageG2D.setGraphics2DImagePainter(painter);
graphicsObjectInfo.setPainter(painter);
@@ -131,13 +131,13 @@
return graphicsObjectInfo;
}
- private class AFPGraphics2DImagePainter extends
GenericGraphics2DImagePainter {
+ private class AFPGraphics2DImagePainter extends
BatikGraphics2DImagePainter {
/**
* Copy constructor
*
* @param painter a graphics 2D image painter
*/
- public AFPGraphics2DImagePainter(GenericGraphics2DImagePainter
painter) {
+ public AFPGraphics2DImagePainter(BatikGraphics2DImagePainter painter) {
super(painter.getImageXMLDOM(), painter.getBridgeContext(),
painter.getRoot());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
