olegt 2002/12/18 16:35:32 Modified: src/org/apache/fop/area Page.java Trait.java src/org/apache/fop/area/inline Container.java InlineParent.java src/org/apache/fop/layout AbsolutePositionProps.java AreaClass.java FontDescriptor.java FontInfo.java FontState.java PageMaster.java TextState.java src/org/apache/fop/layout/hyphenation PatternParser.java Log: Cleaned up unused imports. Revision Changes Path 1.8 +1 -2 xml-fop/src/org/apache/fop/area/Page.java Index: Page.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/Page.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Page.java 14 Nov 2002 11:13:32 -0000 1.7 +++ Page.java 19 Dec 2002 00:35:31 -0000 1.8 @@ -9,7 +9,6 @@ import java.io.Serializable; import java.util.Map; -import java.util.HashMap; /** * The page. 1.11 +1 -4 xml-fop/src/org/apache/fop/area/Trait.java Index: Trait.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/Trait.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Trait.java 29 Nov 2002 23:18:52 -0000 1.10 +++ Trait.java 19 Dec 2002 00:35:31 -0000 1.11 @@ -9,7 +9,6 @@ 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 @@ /** * Return the string for debugging. - * - * @param the string from the data value */ public String toString() { return data.toString(); 1.5 +1 -2 xml-fop/src/org/apache/fop/area/inline/Container.java Index: Container.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/inline/Container.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Container.java 14 Nov 2002 11:13:33 -0000 1.4 +++ Container.java 19 Dec 2002 00:35:31 -0000 1.5 @@ -9,7 +9,6 @@ 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; 1.8 +1 -2 xml-fop/src/org/apache/fop/area/inline/InlineParent.java Index: InlineParent.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/inline/InlineParent.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- InlineParent.java 14 Nov 2002 11:13:33 -0000 1.7 +++ InlineParent.java 19 Dec 2002 00:35:31 -0000 1.8 @@ -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; 1.3 +1 -3 xml-fop/src/org/apache/fop/layout/AbsolutePositionProps.java Index: AbsolutePositionProps.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/AbsolutePositionProps.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbsolutePositionProps.java 30 Aug 2002 08:03:23 -0000 1.2 +++ AbsolutePositionProps.java 19 Dec 2002 00:35:31 -0000 1.3 @@ -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. 1.3 +7 -7 xml-fop/src/org/apache/fop/layout/AreaClass.java Index: AreaClass.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/AreaClass.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AreaClass.java 30 Jul 2001 20:29:27 -0000 1.2 +++ AreaClass.java 19 Dec 2002 00:35:31 -0000 1.3 @@ -10,13 +10,13 @@ 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 { 1.6 +4 -2 xml-fop/src/org/apache/fop/layout/FontDescriptor.java Index: FontDescriptor.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/FontDescriptor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- FontDescriptor.java 9 Nov 2001 11:32:41 -0000 1.5 +++ FontDescriptor.java 19 Dec 2002 00:35:31 -0000 1.6 @@ -7,6 +7,8 @@ package org.apache.fop.layout; +import java.util.HashMap; + public interface FontDescriptor { // Required @@ -20,7 +22,7 @@ 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); 1.18 +4 -4 xml-fop/src/org/apache/fop/layout/FontInfo.java Index: FontInfo.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/FontInfo.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- FontInfo.java 23 Jul 2002 11:06:50 -0000 1.17 +++ FontInfo.java 19 Dec 2002 00:35:31 -0000 1.18 @@ -22,9 +22,9 @@ 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(); 1.21 +1 -3 xml-fop/src/org/apache/fop/layout/FontState.java Index: FontState.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/FontState.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- FontState.java 25 Oct 2002 09:29:44 -0000 1.20 +++ FontState.java 19 Dec 2002 00:35:31 -0000 1.21 @@ -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 { 1.14 +1 -3 xml-fop/src/org/apache/fop/layout/PageMaster.java Index: PageMaster.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/PageMaster.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- PageMaster.java 17 May 2002 14:47:13 -0000 1.13 +++ PageMaster.java 19 Dec 2002 00:35:31 -0000 1.14 @@ -7,8 +7,6 @@ package org.apache.fop.layout; -import java.io.*; - import org.apache.fop.area.PageViewport; public class PageMaster { 1.5 +1 -3 xml-fop/src/org/apache/fop/layout/TextState.java Index: TextState.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/TextState.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TextState.java 4 Sep 2002 11:43:42 -0000 1.4 +++ TextState.java 19 Dec 2002 00:35:31 -0000 1.5 @@ -7,8 +7,6 @@ package org.apache.fop.layout; -import org.apache.fop.apps.FOPException; - /** * This class holds information about text-decoration * 1.6 +1 -5 xml-fop/src/org/apache/fop/layout/hyphenation/PatternParser.java Index: PatternParser.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/hyphenation/PatternParser.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PatternParser.java 9 Nov 2001 11:32:41 -0000 1.5 +++ PatternParser.java 19 Dec 2002 00:35:31 -0000 1.6 @@ -16,12 +16,8 @@ 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;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]