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

diff --cc src/java/org/apache/fop/afp/util/DefaultFOPResourceAccessor.java
Simple merge

diff --cc src/java/org/apache/fop/pdf/PDFResources.java
index c625813b0374d04ebca5c14e3e599162af00ff4c,cded7c00a97e2ae8e22e3200da8c40339070c192..e7dcccabe96bc76b018d5930c4d1306d753d4e25
--- 1/src/java/org/apache/fop/pdf/PDFResources.java
--- 2/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/afp/AFPDocumentHandler.java
Simple merge

diff --cc src/java/org/apache/fop/render/bitmap/AbstractBitmapDocumentHandler.java
Simple merge

diff --cc src/java/org/apache/fop/render/bitmap/PNGDocumentHandler.java
Simple merge

diff --cc src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java
Simple merge

diff --cc src/java/org/apache/fop/render/intermediate/IFUtil.java
Simple merge

diff --cc src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java
Simple merge

diff --cc src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
index 1cd76e4557ecac4675112bce5a062fde09e2484c,332b4a77dcdac65c2c201559b5fec3932c40d588..0ba85146cdfe27a2ce74102d710dc67149a2098a
--- 1/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
--- 2/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/pcl/PCLPainter.java
Simple merge

diff --cc src/java/org/apache/fop/render/ps/PSDocumentHandler.java
index e6ba623da0df2a9c9d0012e88da06cf4961a0b64,dc785ea1850a53dd3cf738dbd9e17e33de3daca6..76e9b66e509199f15ab79cbd1c12b8738b2f996c
--- 1/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
--- 2/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 8b24d4619660e8a941bc70e68f71bb43251ed749,5ef4c0940174f821bc47436b36976948311483ad..f63d30051d949db9c7a562a84cc00ca2b11b4aed
--- 1/src/sandbox/org/apache/fop/render/mif/MIFHandler.java
--- 2/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
  

diff --cc src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java
Simple merge

diff --cc src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java
Simple merge