From 9500bbcde75d9ca1da5b56eeacac84dbeb41a401 Mon Sep 17 00:00:00 2001
From: Adrian Cumiskey <acumiskey@apache.org>
Date: Mon, 27 Oct 2008 11:23:53 +0000
Subject: [PATCH] Moved AFPTextElementBridge and AFPTextPainter to
 org.apache.fop.afp since they have no org.apache.fop.renderer.afp package
 dependencies.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@708140 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/fop/{render => }/afp/AFPTextElementBridge.java | 2 +-
 src/java/org/apache/fop/{render => }/afp/AFPTextPainter.java  | 4 +---
 .../org/apache/fop/render/afp/AFPImageGraphics2DFactory.java  | 2 ++
 src/java/org/apache/fop/render/afp/AFPSVGHandler.java         | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename src/java/org/apache/fop/{render => }/afp/AFPTextElementBridge.java (99%)
 rename src/java/org/apache/fop/{render => }/afp/AFPTextPainter.java (99%)

diff --git a/src/java/org/apache/fop/render/afp/AFPTextElementBridge.java b/src/java/org/apache/fop/afp/AFPTextElementBridge.java
similarity index 99%
rename from src/java/org/apache/fop/render/afp/AFPTextElementBridge.java
rename to src/java/org/apache/fop/afp/AFPTextElementBridge.java
index fc26801ec..2bfccf47d 100644
--- a/src/java/org/apache/fop/render/afp/AFPTextElementBridge.java
+++ b/src/java/org/apache/fop/afp/AFPTextElementBridge.java
@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
 
 import org.apache.batik.bridge.SVGTextElementBridge;
 import org.apache.batik.bridge.BridgeContext;
diff --git a/src/java/org/apache/fop/render/afp/AFPTextPainter.java b/src/java/org/apache/fop/afp/AFPTextPainter.java
similarity index 99%
rename from src/java/org/apache/fop/render/afp/AFPTextPainter.java
rename to src/java/org/apache/fop/afp/AFPTextPainter.java
index 7cc96d0cc..d0d54fd75 100644
--- a/src/java/org/apache/fop/render/afp/AFPTextPainter.java
+++ b/src/java/org/apache/fop/afp/AFPTextPainter.java
@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
 
 import java.awt.Graphics2D;
 import java.awt.geom.Point2D;
@@ -34,8 +34,6 @@ import java.util.Iterator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.fop.afp.AFPGraphics2D;
-import org.apache.fop.afp.AFPTextHandler;
 import org.apache.fop.fonts.Font;
 import org.apache.fop.fonts.FontInfo;
 import org.apache.fop.fonts.FontTriplet;
diff --git a/src/java/org/apache/fop/render/afp/AFPImageGraphics2DFactory.java b/src/java/org/apache/fop/render/afp/AFPImageGraphics2DFactory.java
index d76e26d57..81d00bd10 100644
--- a/src/java/org/apache/fop/render/afp/AFPImageGraphics2DFactory.java
+++ b/src/java/org/apache/fop/render/afp/AFPImageGraphics2DFactory.java
@@ -33,7 +33,9 @@ import org.apache.fop.afp.AFPObjectAreaInfo;
 import org.apache.fop.afp.AFPResourceInfo;
 import org.apache.fop.afp.AFPResourceLevel;
 import org.apache.fop.afp.AFPState;
+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.render.RendererContext;
 import org.apache.fop.svg.SVGUserAgent;
diff --git a/src/java/org/apache/fop/render/afp/AFPSVGHandler.java b/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
index 57837fb4f..de2786215 100644
--- a/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
+++ b/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
@@ -39,7 +39,9 @@ import org.apache.fop.afp.AFPObjectAreaInfo;
 import org.apache.fop.afp.AFPResourceInfo;
 import org.apache.fop.afp.AFPResourceManager;
 import org.apache.fop.afp.AFPState;
+import org.apache.fop.afp.AFPTextElementBridge;
 import org.apache.fop.afp.AFPTextHandler;
+import org.apache.fop.afp.AFPTextPainter;
 import org.apache.fop.afp.AFPUnitConverter;
 import org.apache.fop.fo.extensions.ExtensionElementMapping;
 import org.apache.fop.render.AbstractGenericSVGHandler;
-- 
2.39.5