From: Oleg Tkachenko <olegt@apache.org>
Date: Thu, 19 Dec 2002 00:35:31 +0000 (+0000)
Subject: Cleaned up unused imports.
X-Git-Tag: Alt-Design-integration-base~235
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2906fb17c1f4b004356890522e8bee0788973430;p=xmlgraphics-fop.git

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 0362a4ff6..4e636e4f8 100644
--- 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 7a688aeba..fa4d6b422 100644
--- 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 40ceb188c..12d10acbd 100644
--- 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 d05f98b46..b5d7c0eea 100644
--- 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 521c47ceb..d28c66345 100644
--- 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 7af180a90..479b7f202 100644
--- 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 fb818631b..5e05703f0 100644
--- 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 a6df5f54a..93971d6fc 100644
--- 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 dbf3ccc6d..6349e049a 100644
--- 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 afc5f7d2c..7b98bde6b 100644
--- 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 b76b98349..ab0a775d5 100644
--- 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 6581b7216..423318166 100644
--- 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;