Minor cleanup.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@719589 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/afp/fonts/AFPPageFonts.java b/src/java/org/apache/fop/afp/fonts/AFPPageFonts.java
index 146c6f14b083ee78f540589b8870cabe544b6d6f..ee7a3c0ebab59af8736c55d7034e1c07cda54098 100644 (file)
--- a/src/java/org/apache/fop/afp/fonts/AFPPageFonts.java
+++ b/src/java/org/apache/fop/afp/fonts/AFPPageFonts.java
@@ -56,7 +56,8 @@ public class AFPPageFonts extends java.util.HashMap {
         if (afpFontAttributes == null) {
             afpFontAttributes = new AFPFontAttributes(fontName, font, fontSize);
             super.put(pageFontKey, afpFontAttributes);
-            afpFontAttributes.setFontReference(super.size());
+            int fontRef = super.size();
+            afpFontAttributes.setFontReference(fontRef);
         }
         return afpFontAttributes;
     }

diff --git a/src/java/org/apache/fop/afp/modca/GraphicsObject.java b/src/java/org/apache/fop/afp/modca/GraphicsObject.java
index 7602f7dd522471ff65028669a1732105aad521db..24b3f949e183333950ab55ceda6adf2849a1b718 100644 (file)
--- a/src/java/org/apache/fop/afp/modca/GraphicsObject.java
+++ b/src/java/org/apache/fop/afp/modca/GraphicsObject.java
@@ -59,8 +59,8 @@ public class GraphicsObject extends AbstractDataObject {
     private GraphicsData currentData = null;
 
     /** list of objects contained within this container */
-    protected List/*<GraphicsDrawingOrder>*/ objects
-        = new java.util.ArrayList/*<GraphicsDrawingOrder>*/();
+    protected List/*<GraphicsData>*/ objects
+        = new java.util.ArrayList/*<GraphicsData>*/();
 
     /** the graphics state */
     private final GraphicsState graphicsState = new GraphicsState();