Cleaned up unused imports.

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

diff --git a/src/org/apache/fop/area/Page.java b/src/org/apache/fop/area/Page.java
index 0362a4ff60ad158598078025aed24dd20d011e73..4e636e4f892e83e9aae2eef88f4d70c6b477f7ee 100644 (file)
--- a/src/org/apache/fop/area/Page.java
+++ b/src/org/apache/fop/area/Page.java
@@ -9,7 +9,6 @@ package org.apache.fop.area;
 
 import java.io.Serializable;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
  * The page.

diff --git a/src/org/apache/fop/area/Trait.java b/src/org/apache/fop/area/Trait.java
index 7a688aeba787ff40e545bf149824b4a5699c035e..fa4d6b422895d398afd24022c6b0c0c7075f3ead 100644 (file)
--- a/src/org/apache/fop/area/Trait.java
+++ b/src/org/apache/fop/area/Trait.java
@@ -9,7 +9,6 @@ package org.apache.fop.area;
 
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.traits.BorderProps;
-import org.apache.fop.layout.FontState;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -256,8 +255,6 @@ public class Trait implements Serializable {
 
     /**
      * Return the string for debugging.
-     *
-     * @param the string from the data value
      */
     public String toString() {
         return data.toString();

diff --git a/src/org/apache/fop/area/inline/Container.java b/src/org/apache/fop/area/inline/Container.java
index 40ceb188c968130886277ab0d4700f31c485771d..12d10acbd8a552e4c46bee7d17792524ed7c9bbe 100644 (file)
--- a/src/org/apache/fop/area/inline/Container.java
+++ b/src/org/apache/fop/area/inline/Container.java
@@ -9,7 +9,6 @@ package org.apache.fop.area.inline;
 
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Block;
-import org.apache.fop.render.Renderer;
 
 import java.util.List;
 import java.util.ArrayList;

diff --git a/src/org/apache/fop/area/inline/InlineParent.java b/src/org/apache/fop/area/inline/InlineParent.java
index d05f98b46e54f16a38584b0b955db0167c45d7fa..b5d7c0eead003ff4cd69c2830c321640909847af 100644 (file)
--- a/src/org/apache/fop/area/inline/InlineParent.java
+++ b/src/org/apache/fop/area/inline/InlineParent.java
@@ -8,7 +8,6 @@
 package org.apache.fop.area.inline;
 
 import org.apache.fop.area.Area;
-import org.apache.fop.area.Block;
 import org.apache.fop.render.Renderer;
 
 import java.util.List;

diff --git a/src/org/apache/fop/layout/AbsolutePositionProps.java b/src/org/apache/fop/layout/AbsolutePositionProps.java
index 521c47cebf3e5962f8b2656696521235d8fa005a..d28c66345e36c39688703db9a361e1ca61ab6d72 100644 (file)
--- a/src/org/apache/fop/layout/AbsolutePositionProps.java
+++ b/src/org/apache/fop/layout/AbsolutePositionProps.java
@@ -7,8 +7,6 @@
 
 package org.apache.fop.layout;
 
-import org.apache.fop.datatypes.Length;
-
 /**
  * Store all hyphenation related properties on an FO.
  * Public "structure" allows direct member access.

diff --git a/src/org/apache/fop/layout/AreaClass.java b/src/org/apache/fop/layout/AreaClass.java
index 7af180a901249c7f8780fd28f4bfbf3bdc95c285..479b7f2027814aa9167e18a5b471bca265207433 100644 (file)
--- a/src/org/apache/fop/layout/AreaClass.java
+++ b/src/org/apache/fop/layout/AreaClass.java
@@ -10,13 +10,13 @@ package org.apache.fop.layout;
 import org.apache.fop.apps.FOPException;
 
 public class AreaClass {
-    public static String UNASSIGNED = "unassigned";
+    public static final String UNASSIGNED = "unassigned";
 
-    public static String XSL_NORMAL = "xsl-normal";
-    public static String XSL_ABSOLUTE = "xsl-absolute";
-    public static String XSL_FOOTNOTE = "xsl-footnote";
-    public static String XSL_SIDE_FLOAT = "xsl-side-float";
-    public static String XSL_BEFORE_FLOAT = "xsl-before-float";
+    public static final String XSL_NORMAL = "xsl-normal";
+    public static final String XSL_ABSOLUTE = "xsl-absolute";
+    public static final String XSL_FOOTNOTE = "xsl-footnote";
+    public static final String XSL_SIDE_FLOAT = "xsl-side-float";
+    public static final String XSL_BEFORE_FLOAT = "xsl-before-float";
 
     // checker method
     public static String setAreaClass(String areaClass) throws FOPException {

diff --git a/src/org/apache/fop/layout/FontDescriptor.java b/src/org/apache/fop/layout/FontDescriptor.java
index fb818631b659c90e1c8db30a533db491f5601da8..5e05703f0fde9f13eb95e510db64f0ba9d0c6164 100644 (file)
--- a/src/org/apache/fop/layout/FontDescriptor.java
+++ b/src/org/apache/fop/layout/FontDescriptor.java
@@ -7,6 +7,8 @@
 
 package org.apache.fop.layout;
 
+import java.util.HashMap;
+
 public interface FontDescriptor {
 
     // Required
@@ -20,7 +22,7 @@ public interface FontDescriptor {
     public int getStemV();
 
     public boolean hasKerningInfo();
-    public java.util.HashMap getKerningInfo();
+    public HashMap getKerningInfo();
     public boolean isEmbeddable();
     public byte getSubType();
     public org.apache.fop.pdf.PDFStream getFontFile(int objNum);

diff --git a/src/org/apache/fop/layout/FontInfo.java b/src/org/apache/fop/layout/FontInfo.java
index a6df5f54a369ed80daddbb403a14bb3e1d0bb469..93971d6fc0669de614f57b95a05cd150695dea91 100644 (file)
--- a/src/org/apache/fop/layout/FontInfo.java
+++ b/src/org/apache/fop/layout/FontInfo.java
@@ -22,9 +22,9 @@ public class FontInfo {
     public static final int NORMAL = 400;
     public static final int BOLD = 700;
 
-    HashMap usedFonts;
-    HashMap triplets;    // look up a font-triplet to find a font-name
-    HashMap fonts;    // look up a font-name to get a font (that implements FontMetric at least)
+    private HashMap usedFonts;
+    private HashMap triplets;    // look up a font-triplet to find a font-name
+    private HashMap fonts;    // look up a font-name to get a font (that implements FontMetric at least)
 
     public FontInfo() {
         this.triplets = new HashMap();

diff --git a/src/org/apache/fop/layout/FontState.java b/src/org/apache/fop/layout/FontState.java
index dbf3ccc6d7484f9af1216b21ae991e8c3916741f..6349e049a5013df83f0fa2e4b233956c89592259 100644 (file)
--- a/src/org/apache/fop/layout/FontState.java
+++ b/src/org/apache/fop/layout/FontState.java
@@ -8,8 +8,6 @@
 package org.apache.fop.layout;
 
 import java.util.HashMap;
-
-import org.apache.fop.fo.properties.FontVariant;
 import org.apache.fop.render.pdf.CodePointMapping;
 
 public class FontState {

diff --git a/src/org/apache/fop/layout/PageMaster.java b/src/org/apache/fop/layout/PageMaster.java
index afc5f7d2cf77adfecf8821e5412f7bda28f1eb6a..7b98bde6becb04f703da467cc8bbc392c18e073c 100644 (file)
--- a/src/org/apache/fop/layout/PageMaster.java
+++ b/src/org/apache/fop/layout/PageMaster.java
@@ -7,8 +7,6 @@
 
 package org.apache.fop.layout;
 
-import java.io.*;
-
 import org.apache.fop.area.PageViewport;
 
 public class PageMaster {

diff --git a/src/org/apache/fop/layout/TextState.java b/src/org/apache/fop/layout/TextState.java
index b76b983494e63093ebd935e86c6fdae87512703c..ab0a775d5a4d2c28f200775eaedc26c0b1d4b593 100644 (file)
--- a/src/org/apache/fop/layout/TextState.java
+++ b/src/org/apache/fop/layout/TextState.java
@@ -7,8 +7,6 @@
 
 package org.apache.fop.layout;
 
-import org.apache.fop.apps.FOPException;
-
 /**
  * This class holds information about text-decoration
  *

diff --git a/src/org/apache/fop/layout/hyphenation/PatternParser.java b/src/org/apache/fop/layout/hyphenation/PatternParser.java
index 6581b7216228f9550060b2d2de18cbfccd325030..42331816691db39e26913d9f3a12cd903e10775f 100644 (file)
--- a/src/org/apache/fop/layout/hyphenation/PatternParser.java
+++ b/src/org/apache/fop/layout/hyphenation/PatternParser.java
@@ -16,12 +16,8 @@ import org.xml.sax.helpers.DefaultHandler;
 import org.xml.sax.Attributes;
 
 // Java
-import java.io.FileReader;
 import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
 import java.io.IOException;
-import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.net.URL;