From ec89ca259c67414c70197e6b54e24d0aaf8e4718 Mon Sep 17 00:00:00 2001 From: Finn Bock Date: Thu, 28 Jul 2005 10:40:17 +0000 Subject: [PATCH] Removing unused import. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@225743 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/fo/FObj.java | 1 - .../fop/fo/extensions/ExtensionElementMapping.java | 1 - src/java/org/apache/fop/fo/flow/Footnote.java | 3 --- .../fop/fo/pagination/PageSequenceWrapper.java | 4 ---- .../org/apache/fop/fo/pagination/RegionBody.java | 1 - src/java/org/apache/fop/fo/pagination/Title.java | 3 --- .../fop/fo/pagination/bookmarks/Bookmark.java | 1 - .../fop/fo/pagination/bookmarks/BookmarkTree.java | 2 -- .../fop/layoutmgr/PageSequenceLayoutManager.java | 14 +++++++------- .../layoutmgr/inline/CharacterLayoutManager.java | 1 - .../fop/layoutmgr/inline/LineLayoutManager.java | 1 - .../fop/layoutmgr/table/PrimaryGridUnit.java | 1 - src/java/org/apache/fop/tools/TestConverter.java | 1 - 13 files changed, 7 insertions(+), 27 deletions(-) diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java index 827ebda3f..3e82c2911 100644 --- a/src/java/org/apache/fop/fo/FObj.java +++ b/src/java/org/apache/fop/fo/FObj.java @@ -27,7 +27,6 @@ import java.util.Set; import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.PercentBase; import org.apache.fop.fo.flow.Marker; -import org.apache.fop.fo.pagination.Flow; import org.apache.fop.fo.properties.PropertyMaker; import org.xml.sax.Attributes; import org.xml.sax.Locator; diff --git a/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java b/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java index 950738e85..310b61550 100644 --- a/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java +++ b/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java @@ -18,7 +18,6 @@ package org.apache.fop.fo.extensions; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.ElementMapping; import java.util.HashMap; diff --git a/src/java/org/apache/fop/fo/flow/Footnote.java b/src/java/org/apache/fop/fo/flow/Footnote.java index 20546ca27..1a3e2b253 100644 --- a/src/java/org/apache/fop/fo/flow/Footnote.java +++ b/src/java/org/apache/fop/fo/flow/Footnote.java @@ -18,9 +18,6 @@ package org.apache.fop.fo.flow; -// Java -import java.util.List; - import org.xml.sax.Locator; import org.apache.fop.apps.FOPException; diff --git a/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java b/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java index 7639d7c02..e7e876af0 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java +++ b/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java @@ -18,10 +18,6 @@ package org.apache.fop.fo.pagination; -// Java -import java.util.List; -import java.util.ListIterator; - import org.xml.sax.Locator; import org.apache.fop.apps.FOPException; diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java index a4bd82700..00acca4da 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBody.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java @@ -25,7 +25,6 @@ import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.FODimension; import org.apache.fop.datatypes.Length; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.Constants; import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropertyList; import org.apache.fop.fo.properties.CommonMarginBlock; diff --git a/src/java/org/apache/fop/fo/pagination/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java index a87b6031e..87c29cc71 100644 --- a/src/java/org/apache/fop/fo/pagination/Title.java +++ b/src/java/org/apache/fop/fo/pagination/Title.java @@ -21,10 +21,7 @@ package org.apache.fop.fo.pagination; // XML import org.xml.sax.Locator; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datatypes.Length; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.PropertyList; import org.apache.fop.fo.ValidationException; import org.apache.fop.fo.flow.InlineLevel; diff --git a/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java b/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java index 38c01b739..1a586c516 100644 --- a/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java +++ b/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java @@ -19,7 +19,6 @@ package org.apache.fop.fo.pagination.bookmarks; import java.util.ArrayList; -import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.FObj; diff --git a/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java b/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java index 025e91054..9f9812e14 100644 --- a/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java +++ b/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java @@ -26,10 +26,8 @@ import org.xml.sax.Locator; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObj; -import org.apache.fop.fo.PropertyList; import org.apache.fop.fo.ValidationException; import org.apache.fop.fo.pagination.Root; -import org.apache.fop.fo.properties.Property; /** * The fo:bookmark-tree formatting object, first introduced in the diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java index cbe27d2b2..e5e730660 100644 --- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java @@ -189,7 +189,7 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager { needColumnBalancing = (childLC.getNextSpan() == Constants.EN_ALL); } if (needColumnBalancing) { - this.log.debug("Column balancing necessary for the next element list!!!"); + AbstractBreaker.log.debug("Column balancing necessary for the next element list!!!"); } return nextSequenceStartsOn; } @@ -303,8 +303,8 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager { protected void doPhase3(PageBreakingAlgorithm alg, int partCount, BlockSequence originalList, BlockSequence effectiveList) { if (needColumnBalancing) { - this.log.debug("Column balancing now!!!"); - this.log.debug("==================================================="); + AbstractBreaker.log.debug("Column balancing now!!!"); + AbstractBreaker.log.debug("==================================================="); int restartPoint = pvProvider.getStartingPartIndexForLastPage(partCount); if (restartPoint > 0) { addAreas(alg, restartPoint, originalList, effectiveList); @@ -318,7 +318,7 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager { } else { newStartPos = 0; } - this.log.debug("Restarting at " + restartPoint + ", new start position: " + newStartPos); + AbstractBreaker.log.debug("Restarting at " + restartPoint + ", new start position: " + newStartPos); //Handle page break right here to avoid any side-effects handleBreakTrait(EN_PAGE); @@ -338,7 +338,7 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager { int iOptPageCount = algRestart.findBreakingPoints(effectiveList, newStartPos, 1, true, true); - this.log.debug("restart: iOptPageCount= " + iOptPageCount + AbstractBreaker.log.debug("restart: iOptPageCount= " + iOptPageCount + " pageBreaks.size()= " + algRestart.getPageBreaks().size()); if (iOptPageCount > getCurrentPV().getBodyRegion().getColumnCount()) { /* reenable when everything works @@ -349,7 +349,7 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager { //Make sure we only add the areas we haven't added already effectiveList.ignoreAtStart = newStartPos; addAreas(algRestart, iOptPageCount, originalList, effectiveList); - this.log.debug("==================================================="); + AbstractBreaker.log.debug("==================================================="); } else { //Directly add areas after finding the breaks addAreas(alg, partCount, originalList, effectiveList); @@ -357,7 +357,7 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager { } protected void startPart(BlockSequence list, int breakClass) { - this.log.debug("startPart() breakClass=" + breakClass); + AbstractBreaker.log.debug("startPart() breakClass=" + breakClass); if (curPV == null) { throw new IllegalStateException("curPV must not be null"); } diff --git a/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java index 498d0ed0b..9f05e8876 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java @@ -27,7 +27,6 @@ import org.apache.fop.layoutmgr.LayoutContext; import org.apache.fop.layoutmgr.LeafPosition; import org.apache.fop.layoutmgr.Position; import org.apache.fop.layoutmgr.TraitSetter; -import org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager.AreaInfo; import org.apache.fop.area.inline.InlineArea; import org.apache.fop.area.Trait; import org.apache.fop.traits.MinOptMax; diff --git a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java index 01955ee67..cd136bd40 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java @@ -40,7 +40,6 @@ import org.apache.fop.layoutmgr.LeafPosition; import org.apache.fop.layoutmgr.Position; import org.apache.fop.layoutmgr.PositionIterator; import org.apache.fop.layoutmgr.SpaceSpecifier; -import org.apache.fop.layoutmgr.BreakingAlgorithm.KnuthNode; import org.apache.fop.area.LineArea; import java.util.ListIterator; diff --git a/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java b/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java index 0657128cf..df22143e5 100644 --- a/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java +++ b/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java @@ -23,7 +23,6 @@ import java.util.List; import org.apache.fop.fo.flow.TableCell; import org.apache.fop.fo.flow.TableColumn; -import org.apache.fop.fo.properties.LengthRangeProperty; /** * This class represents a primary grid unit of a spanned cell. diff --git a/src/java/org/apache/fop/tools/TestConverter.java b/src/java/org/apache/fop/tools/TestConverter.java index 0fd0831b7..601c14944 100644 --- a/src/java/org/apache/fop/tools/TestConverter.java +++ b/src/java/org/apache/fop/tools/TestConverter.java @@ -19,7 +19,6 @@ package org.apache.fop.tools; import java.io.File; -import java.io.InputStream; import java.io.OutputStream; import java.util.Map; -- 2.39.5