[prev in list] [next in list] [prev in thread] [next in thread]
List: fop-cvs
Subject: svn commit: r708134 [2/6] - in
From: acumiskey () apache ! org
Date: 2008-10-27 11:11:38
Message-ID: 20081027111150.30E67238896D () eris ! apache ! org
[Download RAW message or body]
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPImageObjectInfo.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageObjectInfo.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AFPImageObjectInfo.java?p2=xmlgraphics/fop/branches/Temp_AFPGOC \
AResources/src/java/org/apache/fop/afp/AFPImageObjectInfo.java&p1=xmlgraphics/fop/bran \
ches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageObjectInfo.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageObjectInfo.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPImageObjectInfo.java \
Mon Oct 27 04:11:31 2008 @@ -17,8 +17,7 @@
/* $Id: $ */
-package org.apache.fop.render.afp;
-
+package org.apache.fop.afp;
/**
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPImageObjectInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPImageObjectInfo.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageObjectInfo.java:69 \
3433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPLineDataInfo.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPLineDataInfo.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AFPLineDataInfo.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCARe \
sources/src/java/org/apache/fop/afp/AFPLineDataInfo.java&p1=xmlgraphics/fop/branches/T \
emp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPLineDataInfo.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPLineDataInfo.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPLineDataInfo.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
import java.awt.Color;
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPLineDataInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPLineDataInfo.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPLineDataInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPLineDataInfo.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPLineDataInfo.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPObjectAreaInfo.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPObjectAreaInfo.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AFPObjectAreaInfo.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCA \
Resources/src/java/org/apache/fop/afp/AFPObjectAreaInfo.java&p1=xmlgraphics/fop/branch \
es/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPObjectAreaInfo.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPObjectAreaInfo.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPObjectAreaInfo.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
/**
* A common class used to convey locations,
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPObjectAreaInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPObjectAreaInfo.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPObjectAreaInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPObjectAreaInfo.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPObjectAreaInfo.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPPageFonts.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPPageFonts.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AFPPageFonts.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCAResou \
rces/src/java/org/apache/fop/afp/AFPPageFonts.java&p1=xmlgraphics/fop/branches/Temp_AF \
PGOCAResources/src/java/org/apache/fop/render/afp/AFPPageFonts.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPPageFonts.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPPageFonts.java \
Mon Oct 27 04:11:31 2008 @@ -17,9 +17,11 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
+
+import org.apache.fop.afp.fonts.AFPFont;
+import org.apache.fop.afp.fonts.AFPFontAttributes;
-import org.apache.fop.render.afp.fonts.AFPFont;
/**
* Holds the current page fonts
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPPageFonts.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPPageFonts.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPPageFonts.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPPageFonts.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPPageFonts.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPRectanglePainter.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRectanglePainter.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AFPRectanglePainter.java?p2=xmlgraphics/fop/branches/Temp_AFPGO \
CAResources/src/java/org/apache/fop/afp/AFPRectanglePainter.java&p1=xmlgraphics/fop/br \
anches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRectanglePainter.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRectanglePainter.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPRectanglePainter.java \
Mon Oct 27 04:11:31 2008 @@ -17,11 +17,11 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
import java.awt.geom.AffineTransform;
-import org.apache.fop.render.afp.modca.DataStream;
+import org.apache.fop.afp.modca.DataStream;
public class AFPRectanglePainter extends AbstractAFPPainter {
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPRectanglePainter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPRectanglePainter.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPRectanglePainter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPRectanglePainter.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRectanglePainter.java:6 \
93433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceInfo.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPResourceInfo.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AFPResourceInfo.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCARe \
sources/src/java/org/apache/fop/afp/AFPResourceInfo.java&p1=xmlgraphics/fop/branches/T \
emp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPResourceInfo.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPResourceInfo.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceInfo.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,8 @@
/* $Id: $ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
+
/**
* The level at which a resource is to reside in the AFP output
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPResourceInfo.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPResourceInfo.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceLevel.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPResourceLevel.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AFPResourceLevel.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCAR \
esources/src/java/org/apache/fop/afp/AFPResourceLevel.java&p1=xmlgraphics/fop/branches \
/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPResourceLevel.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPResourceLevel.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceLevel.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
/**
* A resource level
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceLevel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceLevel.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceLevel.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPResourceLevel.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPResourceLevel.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceManager.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPResourceManager.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AFPResourceManager.java?p2=xmlgraphics/fop/branches/Temp_AFPGOC \
AResources/src/java/org/apache/fop/afp/AFPResourceManager.java&p1=xmlgraphics/fop/bran \
ches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPResourceManager.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPResourceManager.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceManager.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
import java.io.IOException;
import java.io.OutputStream;
@@ -25,13 +25,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.render.afp.modca.AbstractDataObject;
-import org.apache.fop.render.afp.modca.AbstractNamedAFPObject;
-import org.apache.fop.render.afp.modca.DataStream;
-import org.apache.fop.render.afp.modca.Factory;
-import org.apache.fop.render.afp.modca.IncludeObject;
-import org.apache.fop.render.afp.modca.Registry;
-import org.apache.fop.render.afp.modca.ResourceGroup;
+import org.apache.fop.afp.modca.AbstractDataObject;
+import org.apache.fop.afp.modca.AbstractNamedAFPObject;
+import org.apache.fop.afp.modca.DataStream;
+import org.apache.fop.afp.modca.IncludeObject;
+import org.apache.fop.afp.modca.Registry;
+import org.apache.fop.afp.modca.ResourceGroup;
/**
* Manages the creation and storage of document resources
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceManager.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPResourceManager.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPResourceManager.java:69 \
3433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPState.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPState.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AFPState.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCAResources \
/src/java/org/apache/fop/afp/AFPState.java&p1=xmlgraphics/fop/branches/Temp_AFPGOCARes \
ources/src/java/org/apache/fop/render/afp/AFPState.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPState.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPState.java \
Mon Oct 27 04:11:31 2008 @@ -17,20 +17,20 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.render.AbstractState;
+import org.apache.fop.AbstractState;
/**
* This keeps information about the current state when writing to an AFP datastream.
*/
-public class AFPState extends org.apache.fop.render.AbstractState implements \
Cloneable { +public class AFPState extends org.apache.fop.AbstractState implements \
Cloneable {
private static final long serialVersionUID = 8206711712452344473L;
- private static Log log = \
LogFactory.getLog("org.apache.fop.render.afp.AFPState"); + private static Log log \
= LogFactory.getLog("org.apache.xmlgraphics.afp");
/** the portrait rotation */
private int portraitRotation = 0;
@@ -66,7 +66,7 @@
* @param rotation
* The rotation in degrees.
*/
- protected void setPortraitRotation(int rotation) {
+ public void setPortraitRotation(int rotation) {
if (rotation == 0 || rotation == 90 || rotation == 180
|| rotation == 270) {
portraitRotation = rotation;
@@ -94,7 +94,7 @@
* @param rotation
* The rotation in degrees.
*/
- protected void setLandscapeRotation(int rotation) {
+ public void setLandscapeRotation(int rotation) {
if (rotation == 0 || rotation == 90 || rotation == 180
|| rotation == 270) {
landscapeRotation = rotation;
@@ -158,7 +158,7 @@
*
* @return true if color images are to be used
*/
- protected boolean isColorImages() {
+ public boolean isColorImages() {
return this.colorImages;
}
@@ -176,7 +176,7 @@
*
* @return true if images are supported natively in this AFP environment
*/
- protected boolean isNativeImages() {
+ public boolean isNativeImages() {
return this.nativeImages;
}
@@ -198,7 +198,7 @@
*
* @return the resolution in dpi
*/
- protected int getResolution() {
+ public int getResolution() {
return this.resolution;
}
@@ -240,7 +240,7 @@
*
* @return the current page fonts
*/
- protected AFPPageFonts getPageFonts() {
+ public AFPPageFonts getPageFonts() {
return pageState.getFonts();
}
@@ -303,7 +303,7 @@
*
* @param uri the uri of the current image
*/
- protected void setImageUri(String uri) {
+ public void setImageUri(String uri) {
((AFPData)getData()).imageUri = uri;
}
@@ -483,7 +483,7 @@
/**
* Block level state data
*/
- private class AFPData extends org.apache.fop.render.AbstractState.AbstractData {
+ private class AFPData extends org.apache.fop.AbstractState.AbstractData {
private static final long serialVersionUID = -1789481244175275686L;
/** The current fill status */
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPState.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPState.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPState.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPState.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPState.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPStreamer.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPStreamer.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AFPStreamer.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCAResour \
ces/src/java/org/apache/fop/afp/AFPStreamer.java&p1=xmlgraphics/fop/branches/Temp_AFPG \
OCAResources/src/java/org/apache/fop/render/afp/AFPStreamer.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPStreamer.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPStreamer.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -31,10 +31,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.render.afp.modca.DataStream;
-import org.apache.fop.render.afp.modca.Factory;
-import org.apache.fop.render.afp.modca.ResourceGroup;
-import org.apache.fop.render.afp.modca.StreamedResourceGroup;
+import org.apache.fop.afp.modca.DataStream;
+import org.apache.fop.afp.modca.ResourceGroup;
+import org.apache.fop.afp.modca.StreamedResourceGroup;
/**
* Manages the streaming of the AFP output
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPStreamer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPStreamer.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPStreamer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPStreamer.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPStreamer.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPTextDataInfo.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AFPTextDataInfo.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCARe \
sources/src/java/org/apache/fop/afp/AFPTextDataInfo.java&p1=xmlgraphics/fop/branches/T \
emp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPTextDataInfo.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
import java.awt.Color;
@@ -56,7 +56,7 @@
*
* @param fontReference the font reference
*/
- protected void setFontReference(int fontReference) {
+ public void setFontReference(int fontReference) {
this.fontReference = fontReference;
}
@@ -110,7 +110,7 @@
*
* @param color the color
*/
- protected void setColor(Color color) {
+ public void setColor(Color color) {
this.color = color;
}
@@ -128,7 +128,7 @@
*
* @param variableSpaceCharacterIncrement the variable space character increment
*/
- protected void setVariableSpaceCharacterIncrement(
+ public void setVariableSpaceCharacterIncrement(
int variableSpaceCharacterIncrement) {
this.variableSpaceCharacterIncrement = variableSpaceCharacterIncrement;
}
@@ -147,7 +147,7 @@
*
* @param interCharacterAdjustment the inter character adjustment
*/
- protected void setInterCharacterAdjustment(int interCharacterAdjustment) {
+ public void setInterCharacterAdjustment(int interCharacterAdjustment) {
this.interCharacterAdjustment = interCharacterAdjustment;
}
@@ -165,7 +165,7 @@
*
* @param data the text orientation
*/
- protected void setData(byte[] data) {
+ public void setData(byte[] data) {
this.data = data;
}
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPTextDataInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPTextDataInfo.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPTextDataInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPTextHandler.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AFPTextHandler.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCARes \
ources/src/java/org/apache/fop/afp/AFPTextHandler.java&p1=xmlgraphics/fop/branches/Tem \
p_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPTextHandler.java \
Mon Oct 27 04:11:31 2008 @@ -17,17 +17,18 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
import java.awt.Color;
import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fop.afp.fonts.AFPFont;
+import org.apache.fop.afp.fonts.AFPFontAttributes;
+import org.apache.fop.afp.modca.GraphicsObject;
import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontInfo;
-import org.apache.fop.render.afp.fonts.AFPFont;
-import org.apache.fop.render.afp.modca.GraphicsObject;
import org.apache.xmlgraphics.java2d.TextHandler;
/**
@@ -44,16 +45,12 @@
/** Overriding FontState */
protected Font overrideFont = null;
- /** current state */
- private AFPState state = null;
-
/**
* Main constructor.
* @param g2d the PSGraphics2D instance this instances is used by
*/
public AFPTextHandler(AFPGraphics2D g2d) {
this.g2d = g2d;
- this.state = g2d.getAFPInfo().getState();
}
/**
@@ -61,7 +58,7 @@
* @return the FontInfo object
*/
public FontInfo getFontInfo() {
- return g2d.getAFPInfo().getFontInfo();
+ return g2d.getFontInfo();
}
/**
@@ -73,6 +70,8 @@
log.debug("drawString() str=" + str + ", x=" + x + ", y=" + y);
GraphicsObject graphicsObj = g2d.getGraphicsObject();
Color col = g2d.getColor();
+
+ AFPState state = g2d.getState();
if (state.setColor(col)) {
graphicsObj.setColor(col);
}
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPTextHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPTextHandler.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPTextHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPTextHandler.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPTextHandler.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPUnitConverter.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPUnitConverter.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AFPUnitConverter.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCAR \
esources/src/java/org/apache/fop/afp/AFPUnitConverter.java&p1=xmlgraphics/fop/branches \
/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPUnitConverter.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPUnitConverter.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPUnitConverter.java \
Mon Oct 27 04:11:31 2008 @@ -15,13 +15,14 @@
* limitations under the License.
*/
-/* $Id: $ */
+/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
import java.awt.geom.AffineTransform;
+
/**
* AFP Unit converter
*/
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPUnitConverter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPUnitConverter.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPUnitConverter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPUnitConverter.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPUnitConverter.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AbstractAFPPainter.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AbstractAFPPainter.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/AbstractAFPPainter.java?p2=xmlgraphics/fop/branches/Temp_AFPGOC \
AResources/src/java/org/apache/fop/afp/AbstractAFPPainter.java&p1=xmlgraphics/fop/bran \
ches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AbstractAFPPainter.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AbstractAFPPainter.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AbstractAFPPainter.java \
Mon Oct 27 04:11:31 2008 @@ -17,16 +17,16 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.render.afp.modca.DataStream;
+import org.apache.fop.afp.modca.DataStream;
public abstract class AbstractAFPPainter {
/** Static logging instance */
- protected static Log log = LogFactory.getLog("org.apache.fop.render.afp");
+ protected static Log log = LogFactory.getLog("org.apache.xmlgraphics.afp");
protected final DataStream dataStream;
protected final AFPState state;
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AbstractAFPPainter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AbstractAFPPainter.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AbstractAFPPainter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AbstractAFPPainter.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AbstractAFPPainter.java:69 \
3433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/BorderPaintInfo.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/BorderPaintInfo.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/BorderPaintInfo.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCARe \
sources/src/java/org/apache/fop/afp/BorderPaintInfo.java&p1=xmlgraphics/fop/branches/T \
emp_AFPGOCAResources/src/java/org/apache/fop/render/afp/BorderPaintInfo.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/BorderPaintInfo.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/BorderPaintInfo.java \
Mon Oct 27 04:11:31 2008 @@ -17,10 +17,11 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
import java.awt.Color;
+
/**
* Border painting information
*/
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/BorderPaintInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/BorderPaintInfo.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/BorderPaintInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/BorderPaintInfo.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/BorderPaintInfo.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Factory.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/Factory.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/Factory.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCAResources/ \
src/java/org/apache/fop/afp/Factory.java&p1=xmlgraphics/fop/branches/Temp_AFPGOCAResou \
rces/src/java/org/apache/fop/render/afp/modca/Factory.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/Factory.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Factory.java \
Mon Oct 27 04:11:31 2008 @@ -17,19 +17,49 @@
/* $Id$ */
-package org.apache.fop.render.afp.modca;
+package org.apache.fop.afp;
import java.io.OutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.render.afp.AFPState;
-import org.apache.fop.render.afp.goca.GraphicsData;
-import org.apache.fop.render.afp.ioca.ImageContent;
-import org.apache.fop.render.afp.ioca.ImageRasterData;
-import org.apache.fop.render.afp.ioca.ImageSegment;
-import org.apache.fop.render.afp.ioca.ImageSizeParameter;
-import org.apache.fop.render.afp.tools.StringUtils;
+import org.apache.fop.afp.goca.GraphicsData;
+import org.apache.fop.afp.ioca.ImageContent;
+import org.apache.fop.afp.ioca.ImageRasterData;
+import org.apache.fop.afp.ioca.ImageSegment;
+import org.apache.fop.afp.ioca.ImageSizeParameter;
+import org.apache.fop.afp.modca.ActiveEnvironmentGroup;
+import org.apache.fop.afp.modca.ContainerDataDescriptor;
+import org.apache.fop.afp.modca.DataStream;
+import org.apache.fop.afp.modca.Document;
+import org.apache.fop.afp.modca.GraphicsDataDescriptor;
+import org.apache.fop.afp.modca.GraphicsObject;
+import org.apache.fop.afp.modca.IMImageObject;
+import org.apache.fop.afp.modca.ImageDataDescriptor;
+import org.apache.fop.afp.modca.ImageObject;
+import org.apache.fop.afp.modca.IncludeObject;
+import org.apache.fop.afp.modca.IncludePageSegment;
+import org.apache.fop.afp.modca.InvokeMediumMap;
+import org.apache.fop.afp.modca.MapCodedFont;
+import org.apache.fop.afp.modca.MapContainerData;
+import org.apache.fop.afp.modca.MapDataResource;
+import org.apache.fop.afp.modca.ObjectAreaDescriptor;
+import org.apache.fop.afp.modca.ObjectAreaPosition;
+import org.apache.fop.afp.modca.ObjectContainer;
+import org.apache.fop.afp.modca.ObjectEnvironmentGroup;
+import org.apache.fop.afp.modca.Overlay;
+import org.apache.fop.afp.modca.PageDescriptor;
+import org.apache.fop.afp.modca.PageGroup;
+import org.apache.fop.afp.modca.PageObject;
+import org.apache.fop.afp.modca.PresentationEnvironmentControl;
+import org.apache.fop.afp.modca.PresentationTextDescriptor;
+import org.apache.fop.afp.modca.PresentationTextObject;
+import org.apache.fop.afp.modca.ResourceEnvironmentGroup;
+import org.apache.fop.afp.modca.ResourceGroup;
+import org.apache.fop.afp.modca.ResourceObject;
+import org.apache.fop.afp.modca.StreamedResourceGroup;
+import org.apache.fop.afp.modca.TagLogicalElement;
+import org.apache.fop.afp.util.StringUtils;
/**
* Creator of MO:DCA data objects (mostly)
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Factory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Factory.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Factory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/Factory.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/Factory.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/PaintInfo.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/PaintInfo.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/PaintInfo.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCAResource \
s/src/java/org/apache/fop/afp/PaintInfo.java&p1=xmlgraphics/fop/branches/Temp_AFPGOCAR \
esources/src/java/org/apache/fop/render/afp/PaintInfo.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/PaintInfo.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/PaintInfo.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
/**
* Generic painting information interface
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/PaintInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/PaintInfo.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/PaintInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/PaintInfo.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/PaintInfo.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/RectanglePaintInfo.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/RectanglePaintInfo.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/RectanglePaintInfo.java?p2=xmlgraphics/fop/branches/Temp_AFPGOC \
AResources/src/java/org/apache/fop/afp/RectanglePaintInfo.java&p1=xmlgraphics/fop/bran \
ches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/RectanglePaintInfo.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/RectanglePaintInfo.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/RectanglePaintInfo.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,8 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
+
/**
* Filled rectangle painting information
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/RectanglePaintInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/RectanglePaintInfo.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/RectanglePaintInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/RectanglePaintInfo.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/RectanglePaintInfo.java:69 \
3433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Streamable.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/Streamable.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/Streamable.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCAResourc \
es/src/java/org/apache/fop/afp/Streamable.java&p1=xmlgraphics/fop/branches/Temp_AFPGOC \
AResources/src/java/org/apache/fop/render/afp/Streamable.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/Streamable.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Streamable.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp;
+package org.apache.fop.afp;
import java.io.IOException;
import java.io.OutputStream;
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Streamable.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Streamable.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/Streamable.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/Streamable.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/Streamable.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPBase12FontCollection.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/fonts/AFPBase12FontCollection.java?p2=xmlgraphics/fop/branches/ \
Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java&p \
1=xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPBase12FontCollection.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPBase12FontCollection.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp.fonts;
+package org.apache.fop.afp.fonts;
import org.apache.fop.fonts.Base14Font;
import org.apache.fop.fonts.Font;
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/AFPBase12FontCollection.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/AFPBase12FontCollect \
ion.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFont.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPFont.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/fonts/AFPFont.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCAReso \
urces/src/java/org/apache/fop/afp/fonts/AFPFont.java&p1=xmlgraphics/fop/branches/Temp_ \
AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPFont.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPFont.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFont.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,8 @@
/* $Id$ */
-package org.apache.fop.render.afp.fonts;
+package org.apache.fop.afp.fonts;
+
import java.util.Map;
import java.util.Set;
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFont.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFont.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFont.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/AFPFont.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/AFPFont.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPFontAttributes.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/fonts/AFPFontAttributes.java?p2=xmlgraphics/fop/branches/Temp_A \
FPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java&p1=xmlgraphic \
s/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPFontAttributes.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPFontAttributes.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java \
Mon Oct 27 04:11:31 2008 @@ -17,9 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp;
-
-import org.apache.fop.render.afp.fonts.AFPFont;
+package org.apache.fop.afp.fonts;
/**
* This class encapsulates the font attributes that need to be included
@@ -37,17 +35,17 @@
/**
* The font key
*/
- private String fontKey;
+ private final String fontKey;
/**
* The font
*/
- private AFPFont font;
+ private final AFPFont font;
/**
* The point size
*/
- private int pointSize;
+ private final int pointSize;
/**
* Constructor for the AFPFontAttributes
@@ -96,12 +94,12 @@
public void setFontReference(int fontReference) {
this.fontReference = fontReference;
}
-
+
/** {@inheritDoc} */
public String toString() {
return "fontReference=" + fontReference
+ ", fontKey=" + fontKey
+ ", font=" + font
- + ", pointSize=" + pointSize;
+ + ", pointSize=" + pointSize;
}
}
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPFontAttributes.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontAttributes.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPFontCollection.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/fonts/AFPFontCollection.java?p2=xmlgraphics/fop/branches/Temp_A \
FPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java&p1=xmlgraphic \
s/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPFontCollection.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPFontCollection.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp.fonts;
+package org.apache.fop.afp.fonts;
import java.util.Iterator;
import java.util.List;
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontCollection.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/AFPFontCollection.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/AFPFontCollection.ja \
va:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPFontInfo.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/fonts/AFPFontInfo.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCA \
Resources/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java&p1=xmlgraphics/fop/branch \
es/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPFontInfo.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPFontInfo.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java \
Mon Oct 27 04:11:31 2008 @@ -17,10 +17,11 @@
/* $Id$ */
-package org.apache.fop.render.afp.fonts;
+package org.apache.fop.afp.fonts;
import java.util.List;
+
/**
* FontInfo contains meta information on fonts
*/
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/AFPFontInfo.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/AFPFontInfo.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontReader.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPFontReader.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/fonts/AFPFontReader.java?p2=xmlgraphics/fop/branches/Temp_AFPGO \
CAResources/src/java/org/apache/fop/afp/fonts/AFPFontReader.java&p1=xmlgraphics/fop/br \
anches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPFontReader.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/AFPFontReader.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontReader.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp.fonts;
+package org.apache.fop.afp.fonts;
import java.io.File;
import java.io.FileNotFoundException;
@@ -31,7 +31,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.render.afp.tools.StructuredFieldReader;
+import org.apache.fop.afp.AFPConstants;
+import org.apache.fop.afp.util.StructuredFieldReader;
/**
* The AFPFontReader is responsible for reading the font attributes from binary
@@ -55,7 +56,7 @@
/**
* Static logging instance
*/
- protected static final Log log = \
LogFactory.getLog("org.apache.fop.render.afp.fonts"); + protected static final Log \
log = LogFactory.getLog("org.apache.xmlgraphics.afp.fonts");
/**
* Template used to convert lists to arrays.
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontReader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontReader.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/AFPFontReader.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/AFPFontReader.java:6 \
93433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSet.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/fonts/CharacterSet.java?p2=xmlgraphics/fop/branches/Temp_AFPGOC \
AResources/src/java/org/apache/fop/afp/fonts/CharacterSet.java&p1=xmlgraphics/fop/bran \
ches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSet.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp.fonts;
+package org.apache.fop.afp.fonts;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -25,8 +25,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.render.afp.AFPConstants;
-import org.apache.fop.render.afp.tools.StringUtils;
+import org.apache.fop.afp.AFPConstants;
+import org.apache.fop.afp.util.StringUtils;
/**
* The IBM Font Object Content Architecture (FOCA) supports presentation
@@ -51,10 +51,10 @@
protected static final Log log = \
LogFactory.getLog(CharacterSet.class.getName());
/** default codepage */
- protected static final String DEFAULT_CODEPAGE = "T1V10500";
+ public static final String DEFAULT_CODEPAGE = "T1V10500";
/** default encoding */
- protected static final String DEFAULT_ENCODING = "Cp500";
+ public static final String DEFAULT_ENCODING = "Cp500";
private static final int MAX_NAME_LEN = 8;
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSet.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java:69 \
3433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/fonts/CharacterSetOrientation.java?p2=xmlgraphics/fop/branches/ \
Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java&p \
1=xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp.fonts;
+package org.apache.fop.afp.fonts;
/**
* The IBM Font Object Content Architecture (FOCA) supports presentation
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/CharacterSetOrientat \
ion.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/exceptions/FontRuntimeException.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/fonts/FontRuntimeException.java?p2=xmlgraphics/fop/branches/Tem \
p_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java&p1=xmlg \
raphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/exceptions/FontRuntimeException.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/exceptions/FontRuntimeException.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java \
Mon Oct 27 04:11:31 2008 @@ -17,13 +17,15 @@
/* $Id$ */
-package org.apache.fop.render.afp.exceptions;
+package org.apache.fop.afp.fonts;
/**
* A runtime exception for handling fatal errors in processing fonts.
* <p/>
*/
-public class FontRuntimeException extends NestedRuntimeException {
+public class FontRuntimeException extends RuntimeException {
+
+ private static final long serialVersionUID = -2217420523816384707L;
/**
* Constructs a FontRuntimeException with the specified message.
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/exceptions/FontRuntimeException.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/exceptions/FontRuntimeExce \
ption.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/fonts/FopCharacterSet.java?p2=xmlgraphics/fop/branches/Temp_AFP \
GOCAResources/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java&p1=xmlgraphics/fo \
p/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.render.afp.fonts;
+package org.apache.fop.afp.fonts;
import org.apache.fop.fonts.Typeface;
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java \
:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/OutlineFont.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/OutlineFont.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/fonts/OutlineFont.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCA \
Resources/src/java/org/apache/fop/afp/fonts/OutlineFont.java&p1=xmlgraphics/fop/branch \
es/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/OutlineFont.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/OutlineFont.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/OutlineFont.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,8 @@
/* $Id$ */
-package org.apache.fop.render.afp.fonts;
+package org.apache.fop.afp.fonts;
+
/**
* A font defined as a set of lines and curves as opposed to a bitmap font. An
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/OutlineFont.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/OutlineFont.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/OutlineFont.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/OutlineFont.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/OutlineFont.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/RasterFont.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/RasterFont.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/fonts/RasterFont.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCAR \
esources/src/java/org/apache/fop/afp/fonts/RasterFont.java&p1=xmlgraphics/fop/branches \
/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/RasterFont.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/fonts/RasterFont.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/RasterFont.java \
Mon Oct 27 04:11:31 2008 @@ -17,16 +17,13 @@
/* $Id$ */
-package org.apache.fop.render.afp.fonts;
+package org.apache.fop.afp.fonts;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.fo.properties.FixedLength;
-import org.apache.fop.render.afp.exceptions.FontRuntimeException;
/**
* A font where each character is stored as an array of pixels (a bitmap). Such
@@ -38,9 +35,10 @@
public class RasterFont extends AFPFont {
/** Static logging instance */
- protected static final Log log = \
LogFactory.getLog("org.apache.fop.render.afp.fonts"); + protected static final Log \
log = LogFactory.getLog("org.apache.xmlgraphics.afp.fonts");
- private Map charSets = new HashMap();
+ private final Map/*<String,CharacterSet>*/ charSets
+ = new java.util.HashMap/*<String,CharacterSet>*/();
private CharacterSet charSet = null;
@@ -65,6 +63,9 @@
this.charSet = characterSet;
}
+ /** Describes the unit millipoint. */
+ public static final String MPT = "mpt";
+
/**
* Get the character set metrics for the specified point size.
*
@@ -76,7 +77,7 @@
String pointsize = String.valueOf(size / 1000);
CharacterSet csm = (CharacterSet) charSets.get(pointsize);
if (csm == null) {
- csm = (CharacterSet) charSets.get(size + FixedLength.MPT);
+ csm = (CharacterSet) charSets.get(size + MPT);
}
if (csm == null) {
// Get char set with nearest font size
@@ -84,7 +85,7 @@
for (Iterator it = charSets.entrySet().iterator(); it.hasNext();) {
Map.Entry me = (Map.Entry)it.next();
String key = (String)me.getKey();
- if (!key.endsWith(FixedLength.MPT)) {
+ if (!key.endsWith(MPT)) {
int mpt = Integer.parseInt(key) * 1000;
if (Math.abs(size - mpt) < distance) {
distance = Math.abs(size - mpt);
@@ -94,7 +95,7 @@
}
}
if (csm != null) {
- charSets.put(size + FixedLength.MPT, csm);
+ charSets.put(size + MPT, csm);
String msg = "No " + (size / 1000) + "pt font " + getFontName()
+ " found, substituted with " + pointsize + "pt font";
log.warn(msg);
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/RasterFont.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/RasterFont.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/RasterFont.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/RasterFont.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/RasterFont.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/AbstractGraphicsCoord.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/goca/AbstractGraphicsCoord.java?p2=xmlgraphics/fop/branches/Tem \
p_AFPGOCAResources/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java&p1=xmlg \
raphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/AbstractGraphicsCoord.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/AbstractGraphicsCoord.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java \
Mon Oct 27 04:11:31 2008 @@ -17,10 +17,10 @@
/* $Id: $ */
-package org.apache.fop.render.afp.goca;
+package org.apache.fop.afp.goca;
-import org.apache.fop.render.afp.modca.AbstractPreparedAFPObject;
-import org.apache.fop.render.afp.tools.BinaryUtils;
+import org.apache.fop.afp.modca.AbstractPreparedAFPObject;
+import org.apache.fop.afp.util.BinaryUtils;
/**
* A base class encapsulating the structure of coordinate based GOCA objects
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/goca/AbstractGraphicsCoord.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/goca/AbstractGraphicsCoord \
.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsArea.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsArea.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/goca/GraphicsArea.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCA \
Resources/src/java/org/apache/fop/afp/goca/GraphicsArea.java&p1=xmlgraphics/fop/branch \
es/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsArea.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsArea.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsArea.java \
Mon Oct 27 04:11:31 2008 @@ -17,12 +17,12 @@
/* $Id: $ */
-package org.apache.fop.render.afp.goca;
+package org.apache.fop.afp.goca;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.fop.render.afp.modca.AbstractPreparedObjectContainer;
+import org.apache.fop.afp.modca.AbstractPreparedObjectContainer;
/**
* A GOCA graphics area (container for filled shapes/objects)
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsArea.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/goca/GraphicsArea.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/goca/GraphicsArea.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsBox.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsBox.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/goca/GraphicsBox.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCAR \
esources/src/java/org/apache/fop/afp/goca/GraphicsBox.java&p1=xmlgraphics/fop/branches \
/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsBox.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsBox.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsBox.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id: $ */
-package org.apache.fop.render.afp.goca;
+package org.apache.fop.afp.goca;
/**
* A GOCA graphics rectangular box
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsBox.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/goca/GraphicsBox.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/goca/GraphicsBox.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsChainedSegment.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/goca/GraphicsChainedSegment.java?p2=xmlgraphics/fop/branches/Te \
mp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java&p1=xm \
lgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsChainedSegment.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsChainedSegment.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java \
Mon Oct 27 04:11:31 2008 @@ -17,14 +17,14 @@
/* $Id: $ */
-package org.apache.fop.render.afp.goca;
+package org.apache.fop.afp.goca;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.fop.render.afp.modca.AbstractPreparedObjectContainer;
-import org.apache.fop.render.afp.modca.PreparedAFPObject;
-import org.apache.fop.render.afp.tools.BinaryUtils;
+import org.apache.fop.afp.modca.AbstractPreparedObjectContainer;
+import org.apache.fop.afp.modca.PreparedAFPObject;
+import org.apache.fop.afp.util.BinaryUtils;
/**
* A GOCA graphics segment
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/goca/GraphicsChainedSegment.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/goca/GraphicsChainedSegmen \
t.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsData.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsData.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/goca/GraphicsData.java?p2=xmlgraphics/fop/branches/Temp_AFPGOCA \
Resources/src/java/org/apache/fop/afp/goca/GraphicsData.java&p1=xmlgraphics/fop/branch \
es/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsData.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsData.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsData.java \
Mon Oct 27 04:11:31 2008 @@ -17,15 +17,15 @@
/* $Id: $ */
-package org.apache.fop.render.afp.goca;
+package org.apache.fop.afp.goca;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.fop.render.afp.modca.AbstractPreparedObjectContainer;
-import org.apache.fop.render.afp.modca.PreparedAFPObject;
-import org.apache.fop.render.afp.tools.BinaryUtils;
-import org.apache.fop.render.afp.tools.StringUtils;
+import org.apache.fop.afp.modca.AbstractPreparedObjectContainer;
+import org.apache.fop.afp.modca.PreparedAFPObject;
+import org.apache.fop.afp.util.BinaryUtils;
+import org.apache.fop.afp.util.StringUtils;
/**
* A GOCA graphics data
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 27 04:11:31 2008
@@ -0,0 +1,2 @@
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/goca/GraphicsData.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/goca/GraphicsData.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Copied: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsFillet.java \
(from r707630, xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsFillet.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/j \
ava/org/apache/fop/afp/goca/GraphicsFillet.java?p2=xmlgraphics/fop/branches/Temp_AFPGO \
CAResources/src/java/org/apache/fop/afp/goca/GraphicsFillet.java&p1=xmlgraphics/fop/br \
anches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsFillet.java&r1=707630&r2=708134&rev=708134&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/goca/GraphicsFillet.java \
(original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/goca/GraphicsFillet.java \
Mon Oct 27 04:11:31 2008 @@ -17,7 +17,7 @@
/* $Id: $ */
-package org.apache.fop.render.afp.goca;
+package org.apache.fop.afp.goca;
/**
* A GOCA graphics curved tangential line to a specified set of
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic