Cleaned up unused imports.

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

diff --git a/src/org/apache/fop/fo/pagination/LayoutMasterSet.java b/src/org/apache/fop/fo/pagination/LayoutMasterSet.java
index 8a072ea6579b32f2e826064bcd1fc58120e819b4..87f6e93317e8c254f6a06c2fed792ec40208bd18 100644 (file)
--- a/src/org/apache/fop/fo/pagination/LayoutMasterSet.java
+++ b/src/org/apache/fop/fo/pagination/LayoutMasterSet.java
@@ -9,13 +9,12 @@ package org.apache.fop.fo.pagination;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.fo.properties.*;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.layout.PageMaster;
 
 // Java
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 import org.xml.sax.Attributes;
 
@@ -29,8 +28,8 @@ import org.xml.sax.Attributes;
  * information for a page sequence.
  */
 public class LayoutMasterSet extends FObj {
-    private HashMap simplePageMasters;
-    private HashMap pageSequenceMasters;
+    private Map simplePageMasters;
+    private Map pageSequenceMasters;
 
     public LayoutMasterSet(FONode parent) {
         super(parent);
@@ -110,12 +109,12 @@ public class LayoutMasterSet extends FObj {
     protected void checkRegionNames() throws FOPException {
         // Section 7.33.15 check to see that if a region-name is a
         // duplicate, that it maps to the same region-class.
-        HashMap allRegions = new HashMap();
+        Map allRegions = new HashMap();
         for (Iterator spm = simplePageMasters.values().iterator();
                 spm.hasNext(); ) {
             SimplePageMaster simplePageMaster =
                 (SimplePageMaster)spm.next();
-            HashMap spmRegions = simplePageMaster.getRegions();
+            Map spmRegions = simplePageMaster.getRegions();
             for (Iterator e = spmRegions.values().iterator();
                     e.hasNext(); ) {
                 Region region = (Region)e.next();
@@ -140,7 +139,7 @@ public class LayoutMasterSet extends FObj {
 
     /**
      * Checks whether or not a region name exists in this master set
-     * @returns true when the region name specified has a region in this LayoutMasterSet
+     * @return true when the region name specified has a region in this LayoutMasterSet
      */
     protected boolean regionNameExists(String regionName) {
         for (Iterator e = simplePageMasters.values().iterator();

diff --git a/src/org/apache/fop/fo/pagination/PageMasterReference.java b/src/org/apache/fop/fo/pagination/PageMasterReference.java
index fd5ec777054ce45559a1ae5b90cf8a19f21c30ef..400b27d0c753c07ac02b9f7df6123d15db3b7b5a 100644 (file)
--- a/src/org/apache/fop/fo/pagination/PageMasterReference.java
+++ b/src/org/apache/fop/fo/pagination/PageMasterReference.java
@@ -7,10 +7,11 @@
 
 package org.apache.fop.fo.pagination;
 
+// FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.fo.properties.*;
 import org.apache.fop.apps.FOPException;
 
+// SAX
 import org.xml.sax.Attributes;
 
 /**

diff --git a/src/org/apache/fop/fo/pagination/PageNumberGenerator.java b/src/org/apache/fop/fo/pagination/PageNumberGenerator.java
index 6cc0b123549375766dc1ada7df92da3549cbf31e..aea06f125057c67fc3e23b1227b7647855ad8194 100644 (file)
--- a/src/org/apache/fop/fo/pagination/PageNumberGenerator.java
+++ b/src/org/apache/fop/fo/pagination/PageNumberGenerator.java
@@ -7,15 +7,9 @@
 
 package org.apache.fop.fo.pagination;
 
-// FOP
-import org.apache.fop.fo.properties.*;
-
 // Avalon
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 
-// Java
-import java.util.*;
-
 /**
  * This class uses the 'format', 'groupingSeparator', 'groupingSize',
  * and 'letterValue' properties on fo:page-sequence to return a String

diff --git a/src/org/apache/fop/fo/pagination/PageSequenceMaster.java b/src/org/apache/fop/fo/pagination/PageSequenceMaster.java
index eb035623591353141fb2ee2ce7c2d57bc3bb4ac4..de11561ddaa33a384e1de4004dda2a1b070d7ebe 100644 (file)
--- a/src/org/apache/fop/fo/pagination/PageSequenceMaster.java
+++ b/src/org/apache/fop/fo/pagination/PageSequenceMaster.java
@@ -9,14 +9,13 @@ package org.apache.fop.fo.pagination;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.layout.PageMaster;
 import org.apache.fop.apps.FOPException;
 
 // Java
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.List;
 
+// SAX
 import org.xml.sax.Attributes;
 
 /**
@@ -26,7 +25,7 @@ import org.xml.sax.Attributes;
  */
 public class PageSequenceMaster extends FObj {
     LayoutMasterSet layoutMasterSet;
-    ArrayList subSequenceSpecifiers;
+    List subSequenceSpecifiers;
     private SubSequenceSpecifier currentSubSequence;
     private int currentSubSequenceNumber;
     private String masterName;

diff --git a/src/org/apache/fop/fo/pagination/Region.java b/src/org/apache/fop/fo/pagination/Region.java
index 58d1989c09469edb74431dc7a4ae49d97227c72c..8a0b3480bf826391dadd664a9529a8c9f13b11ac 100644 (file)
--- a/src/org/apache/fop/fo/pagination/Region.java
+++ b/src/org/apache/fop/fo/pagination/Region.java
@@ -15,7 +15,6 @@ import java.awt.geom.Rectangle2D;
 import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.PropertyList;
 import org.apache.fop.layout.BorderAndPadding;
 import org.apache.fop.layout.BackgroundProps;
 import org.apache.fop.apps.FOPException;

diff --git a/src/org/apache/fop/fo/pagination/RegionAfter.java b/src/org/apache/fop/fo/pagination/RegionAfter.java
index 6eac0d93f8d3615ac5a839bc52c5711783bf6ddf..15202520c1452e7e8ce3fbd6438afd93d38c2b6f 100644 (file)
--- a/src/org/apache/fop/fo/pagination/RegionAfter.java
+++ b/src/org/apache/fop/fo/pagination/RegionAfter.java
@@ -10,11 +10,10 @@ package org.apache.fop.fo.pagination;
 // FOP
 import org.apache.fop.fo.*;
 import org.apache.fop.datatypes.FODimension;
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.area.RegionReference;
 
+// Java
 import java.awt.Rectangle;
-import org.xml.sax.Attributes;
 
 public class RegionAfter extends RegionBA {
 

diff --git a/src/org/apache/fop/fo/pagination/RegionBA.java b/src/org/apache/fop/fo/pagination/RegionBA.java
index 1820bcd3b47b1371ccbeb4153c9306253decbf04..94d34760a696b7057bfc470ae6541c83ea3d018b 100644 (file)
--- a/src/org/apache/fop/fo/pagination/RegionBA.java
+++ b/src/org/apache/fop/fo/pagination/RegionBA.java
@@ -9,9 +9,9 @@ package org.apache.fop.fo.pagination;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.properties.Precedence;
 
+// Java
 import java.awt.Rectangle;
 
 public abstract class RegionBA extends RegionBASE {

diff --git a/src/org/apache/fop/fo/pagination/RegionBASE.java b/src/org/apache/fop/fo/pagination/RegionBASE.java
index d681039bb5eb8d69680161f6bb094ed89ac21819..a4256cf409ebe1c9baa4bb438de80c477cfc30db 100644 (file)
--- a/src/org/apache/fop/fo/pagination/RegionBASE.java
+++ b/src/org/apache/fop/fo/pagination/RegionBASE.java
@@ -9,8 +9,6 @@ package org.apache.fop.fo.pagination;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.PropertyList;
-import org.apache.fop.apps.FOPException;
 
 /**
  * Base class for Before, After, Start and End regions (BASE).

diff --git a/src/org/apache/fop/fo/pagination/RegionBefore.java b/src/org/apache/fop/fo/pagination/RegionBefore.java
index 734b1139896506bdf12b270404adeaa842380315..7c9d96b1358bcfbfb0370b4ee4d0603ba6f7caa3 100644 (file)
--- a/src/org/apache/fop/fo/pagination/RegionBefore.java
+++ b/src/org/apache/fop/fo/pagination/RegionBefore.java
@@ -8,14 +8,12 @@
 package org.apache.fop.fo.pagination;
 
 // FOP
-
 import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.fo.*;
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.area.RegionReference;
 
+// Java
 import java.awt.Rectangle;
-import org.xml.sax.Attributes;
 
 public class RegionBefore extends RegionBA {
 

diff --git a/src/org/apache/fop/fo/pagination/RegionBody.java b/src/org/apache/fop/fo/pagination/RegionBody.java
index d93f4bfa8dd23de636b9eff0db2f4ab9ca30c203..be058b33b17fb48fa76e5c18a8c472d304d78d71 100644 (file)
--- a/src/org/apache/fop/fo/pagination/RegionBody.java
+++ b/src/org/apache/fop/fo/pagination/RegionBody.java
@@ -7,11 +7,11 @@
 
 package org.apache.fop.fo.pagination;
 
+// Java
 import java.awt.Rectangle;
 import java.awt.geom.Rectangle2D;
 
 // FOP
-
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyList;
@@ -19,7 +19,6 @@ import org.apache.fop.fo.Property;
 import org.apache.fop.fo.properties.Overflow;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.FODimension;
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.area.RegionReference;
 import org.apache.fop.area.BodyRegion;
 import org.apache.fop.layout.MarginProps;

diff --git a/src/org/apache/fop/fo/pagination/RegionEnd.java b/src/org/apache/fop/fo/pagination/RegionEnd.java
index 8f12f5dd8c17fe48eb26d75589e521896625468a..7b6cf0d9990e31f7dbe62765360fb179ce995a6a 100644 (file)
--- a/src/org/apache/fop/fo/pagination/RegionEnd.java
+++ b/src/org/apache/fop/fo/pagination/RegionEnd.java
@@ -7,12 +7,12 @@
 
 package org.apache.fop.fo.pagination;
 
+// Java
 import java.awt.Rectangle;
 
 // FOP
 import org.apache.fop.fo.*;
 import org.apache.fop.datatypes.FODimension;
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.area.RegionReference;
 
 

diff --git a/src/org/apache/fop/fo/pagination/RegionSE.java b/src/org/apache/fop/fo/pagination/RegionSE.java
index 7993344860ba82e3b1ca125b12f6e8a5f7a4411b..b3e84eb8487a064a7f4bd5aaf7de44c698fda15a 100644 (file)
--- a/src/org/apache/fop/fo/pagination/RegionSE.java
+++ b/src/org/apache/fop/fo/pagination/RegionSE.java
@@ -7,10 +7,10 @@
 
 package org.apache.fop.fo.pagination;
 
-
+// FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.apps.FOPException;
 
+// Java
 import java.awt.Rectangle;
 
 public abstract class RegionSE extends RegionBASE {

diff --git a/src/org/apache/fop/fo/pagination/RegionStart.java b/src/org/apache/fop/fo/pagination/RegionStart.java
index 6324db754af632f330e8190fdada0a053b1c90cb..9607b638f1a9945d3cc5e87c643c4d979c50ea79 100644 (file)
--- a/src/org/apache/fop/fo/pagination/RegionStart.java
+++ b/src/org/apache/fop/fo/pagination/RegionStart.java
@@ -7,13 +7,12 @@
 
 package org.apache.fop.fo.pagination;
 
+// Java
 import java.awt.Rectangle;
 
-
 // FOP
 import org.apache.fop.fo.*;
 import org.apache.fop.datatypes.FODimension;
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.area.RegionReference;
 
 public class RegionStart extends RegionSE {

diff --git a/src/org/apache/fop/fo/pagination/Root.java b/src/org/apache/fop/fo/pagination/Root.java
index a9dd133d50dc9de2edcb625dffdb3d428aea0f2b..dde1a1180e337e2bda614c2140e1d599db41da45 100644 (file)
--- a/src/org/apache/fop/fo/pagination/Root.java
+++ b/src/org/apache/fop/fo/pagination/Root.java
@@ -8,13 +8,12 @@
 package org.apache.fop.fo.pagination;
 
 // FOP
-import org.apache.fop.fo.*;
-import org.apache.fop.fo.flow.*;
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.FObj;
+import org.apache.fop.fo.FONode;
 
 // Java
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * The fo:root formatting object. Contains page masters, page-sequences.
@@ -22,7 +21,7 @@ import java.util.ArrayList;
 public class Root extends FObj {
 
     LayoutMasterSet layoutMasterSet;
-    ArrayList pageSequences;
+    List pageSequences;
 
     /**
      * keeps count of page number from over PageSequence instances
@@ -56,7 +55,7 @@ public class Root extends FObj {
     /**
      * Some properties, such as 'force-page-count', require a
      * page-sequence to know about some properties of the next.
-     * @returns succeeding PageSequence; null if none
+     * @return succeeding PageSequence; null if none
      */
     public PageSequence getSucceedingPageSequence(PageSequence current) {
         int currentIndex = pageSequences.indexOf(current);

diff --git a/src/org/apache/fop/fo/pagination/SimplePageMaster.java b/src/org/apache/fop/fo/pagination/SimplePageMaster.java
index 243474bb5177bc95e56d1ade9e60372ac1d759f8..a14beb534baa4da9a92c6edd387ef680addb83f0 100644 (file)
--- a/src/org/apache/fop/fo/pagination/SimplePageMaster.java
+++ b/src/org/apache/fop/fo/pagination/SimplePageMaster.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.pagination;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.fo.properties.*;
 import org.apache.fop.area.CTM;
 import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.area.PageViewport;
@@ -21,9 +20,10 @@ import org.apache.fop.layout.PageMaster;
 import org.apache.fop.apps.FOPException;
 
 import java.awt.Rectangle;
-import java.awt.geom.Rectangle2D;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
+
 import org.xml.sax.Attributes;
 
 /**
@@ -35,7 +35,7 @@ public class SimplePageMaster extends FObj {
     /**
      * Page regions (regionClass, Region)
      */
-    private HashMap _regions;
+    private Map _regions;
 
     PageMaster pageMaster;
     String masterName;
@@ -168,7 +168,7 @@ public class SimplePageMaster extends FObj {
         return (Region)_regions.get(regionClass);
     }
 
-    protected HashMap getRegions() {
+    protected Map getRegions() {
         return _regions;
     }