From: Mehdi Houshmand <mehdi@apache.org>
Date: Mon, 11 Jun 2012 14:18:30 +0000 (+0000)
Subject: Merge in trunk@1345838
X-Git-Tag: fop-2_0~346^2~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=991d69ab0cb29b8efe1fa3efc72ef16a1065e450;p=xmlgraphics-fop.git

Merge in trunk@1345838


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

991d69ab0cb29b8efe1fa3efc72ef16a1065e450
diff --cc src/java/org/apache/fop/pdf/PDFResources.java
index c625813b0,cded7c00a..e7dcccabe
--- a/src/java/org/apache/fop/pdf/PDFResources.java
+++ b/src/java/org/apache/fop/pdf/PDFResources.java
@@@ -21,9 -21,8 +21,10 @@@ package org.apache.fop.pdf
  
  import java.io.IOException;
  import java.io.OutputStream;
- import java.util.Iterator;
+ import java.util.LinkedHashMap;
+ import java.util.LinkedHashSet;
 +import java.util.LinkedHashMap;
 +import java.util.LinkedHashSet;
  import java.util.Map;
  import java.util.Set;
  
diff --cc src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
index 1cd76e455,332b4a77d..0ba85146c
--- a/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
+++ b/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
@@@ -43,12 -42,11 +43,13 @@@ import org.apache.fop.render.intermedia
  import org.apache.fop.render.intermediate.IFPainter;
  import org.apache.fop.render.java2d.Java2DPainter;
  import org.apache.fop.render.java2d.Java2DUtil;
 +import org.apache.fop.render.pcl.PCLRendererConfig.PCLRendererConfigParser;
  import org.apache.fop.render.pcl.extensions.PCLElementMapping;
  
 +
  /**
-  * {@link IFDocumentHandler} implementation that produces PCL 5.
+  * {@link org.apache.fop.render.intermediate.IFDocumentHandler} implementation
+  * that produces PCL 5.
   */
  public class PCLDocumentHandler extends AbstractBinaryWritingIFDocumentHandler
              implements PCLConstants {
diff --cc src/java/org/apache/fop/render/ps/PSDocumentHandler.java
index e6ba623da,dc785ea18..76e9b66e5
--- a/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
+++ b/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
@@@ -63,9 -62,9 +63,10 @@@ import org.apache.fop.render.ps.extensi
  import org.apache.fop.render.ps.extensions.PSSetPageDevice;
  import org.apache.fop.render.ps.extensions.PSSetupCode;
  
 +
  /**
-  * {@link IFDocumentHandler} implementation that produces PostScript.
+  * {@link org.apache.fop.render.intermediate.IFDocumentHandler} implementation
+  * that produces PostScript.
   */
  public class PSDocumentHandler extends AbstractBinaryWritingIFDocumentHandler {
  
diff --cc src/sandbox/org/apache/fop/render/mif/MIFHandler.java
index 8b24d4619,5ef4c0940..f63d30051
--- a/src/sandbox/org/apache/fop/render/mif/MIFHandler.java
+++ b/src/sandbox/org/apache/fop/render/mif/MIFHandler.java
@@@ -51,7 -55,9 +55,8 @@@ import org.apache.fop.fo.pagination.Flo
  import org.apache.fop.fo.pagination.PageSequence;
  import org.apache.fop.fo.pagination.PageSequenceMaster;
  import org.apache.fop.fo.pagination.SimplePageMaster;
+ import org.apache.fop.fo.pagination.StaticContent;
  import org.apache.fop.fonts.FontSetup;
 -import org.apache.fop.render.DefaultFontResolver;
  
  // TODO: do we really want every method throwing a SAXException