diff options
| author | Vincent Hennebert <vhennebert@apache.org> | 2010-11-25 21:04:09 +0000 |
|---|---|---|
| committer | Vincent Hennebert <vhennebert@apache.org> | 2010-11-25 21:04:09 +0000 |
| commit | 55fbf510250ace0c4891060934da0c6bc61beb96 (patch) | |
| tree | 635bf8ee07b799c49b093924b799452df005e123 | |
| parent | 6b4369d222468a32396e54b7a081d73d5129f212 (diff) | |
| download | xmlgraphics-fop-55fbf510250ace0c4891060934da0c6bc61beb96.tar.gz xmlgraphics-fop-55fbf510250ace0c4891060934da0c6bc61beb96.zip | |
Another go at removing all trailing whitespace
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1039179 13f79535-47bb-0310-9956-ffa450edef68
41 files changed, 125 insertions, 125 deletions
diff --git a/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java b/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java index 263a1c694..467df6b3a 100644 --- a/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java +++ b/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java @@ -50,7 +50,7 @@ import org.apache.fop.util.License; * The methods fromJava and fromTeX are commented out because they are not Java 1.4 compliant. */ public final class UnicodeClasses { - + /** directory containing unicode properties files */ public static final String UNICODE_DIR = "http://www.unicode.org/Public/UNIDATA/"; @@ -73,7 +73,7 @@ public final class UnicodeClasses { w.write("<!-- in 'src/java/org/apache/fop/hyphenation' -->\n"); w.write("<!-- * commit the changed file -->\n"); } - + /** * Generate classes.xml from Java's compiled-in Unicode Character Database * @param hexcode whether to prefix each class with the hexcode (only for debugging purposes) @@ -99,7 +99,7 @@ public final class UnicodeClasses { ow.write("<classes>\n"); // loop over the first Unicode plane for (int code = Character.MIN_VALUE; code <= maxChar; ++code) { - + // skip surrogate area if (code == Character.MIN_SURROGATE) { code = Character.MAX_SURROGATE; @@ -114,7 +114,7 @@ public final class UnicodeClasses { || Character.getType(code) == Character.OTHER_LETTER)) { continue; } - + // skip a number of blocks Character.UnicodeBlock ubi = Character.UnicodeBlock.of(code); if (ubi.equals(Character.UnicodeBlock.SUPERSCRIPTS_AND_SUBSCRIPTS) @@ -146,18 +146,18 @@ public final class UnicodeClasses { ow.flush(); ow.close(); } - - + + /** * The column numbers in the UCD file */ public static final int UNICODE = 0, GENERAL_CATEGORY = 2, SIMPLE_UPPERCASE_MAPPING = 12, SIMPLE_LOWERCASE_MAPPING = 13, SIMPLE_TITLECASE_MAPPING = 14, NUM_FIELDS = 15; - + /** * Generate classes.xml from Unicode Character Database files * @param hexcode whether to prefix each class with the hexcode (only for debugging purposes) - * @param unidataPath path to the directory with UCD files + * @param unidataPath path to the directory with UCD files * @param outfilePath output file * @throws IOException if the input files are not found * @throws URISyntaxException if {@code unidataPath} cannot be converted to a URI @@ -175,7 +175,7 @@ public final class UnicodeClasses { throw new FileNotFoundException ("URI with file or http scheme required for UNIDATA input directory"); } - + File f = new File(outfilePath); if (f.exists()) { f.delete(); @@ -183,7 +183,7 @@ public final class UnicodeClasses { f.createNewFile(); FileOutputStream fw = new FileOutputStream(f); OutputStreamWriter ow = new OutputStreamWriter(fw, "utf-8"); - + URI inuri = unidata.resolve("Blocks.txt"); InputStream inis = null; if (scheme.equals("file")) { @@ -253,7 +253,7 @@ public final class UnicodeClasses { if (j < blockNames.length) { continue; } - + int uppercode = -1, titlecode = -1; if (!"".equals(fields[SIMPLE_UPPERCASE_MAPPING])) { uppercode = Integer.parseInt(fields[SIMPLE_UPPERCASE_MAPPING], 16); @@ -284,7 +284,7 @@ public final class UnicodeClasses { /** * Generate classes.xml from XeTeX's Unicode letters file * @param hexcode whether to prefix each class with the hexcode (only for debugging purposes) - * @param lettersPath path to XeTeX's Unicode letters file unicode-letters-XeTeX.tex + * @param lettersPath path to XeTeX's Unicode letters file unicode-letters-XeTeX.tex * @param outfilePath output file * @throws IOException in case of an I/O exception */ @@ -345,7 +345,7 @@ public final class UnicodeClasses { inbr.close(); } - + /** * @param args [--hexcode] [--java|--ucd|--tex] outfile [infile] * @throws IOException if the input file cannot be found @@ -375,7 +375,7 @@ public final class UnicodeClasses { if (++i < args.length) { infile = args[i]; } - + if (type.equals("java") && infile != null) { System.err.println("Type java does not allow an infile"); System.exit(1); diff --git a/src/codegen/unicode/java/org/apache/fop/util/License.java b/src/codegen/unicode/java/org/apache/fop/util/License.java index ea28f6f09..0a9b6d339 100644 --- a/src/codegen/unicode/java/org/apache/fop/util/License.java +++ b/src/codegen/unicode/java/org/apache/fop/util/License.java @@ -28,7 +28,7 @@ import java.io.Writer; * Write the Apache license text in various forms */ public final class License { - + private License() { } @@ -56,10 +56,10 @@ public final class License { * The subversion Id keyword line */ public static final String ID = "$Id$"; - + /** * Calculate the maximum line length in the Apache license text - * for use in formatting + * for use in formatting */ private static int maxLength; static { @@ -103,7 +103,7 @@ public final class License { w.write("\n"); w.write("<!-- " + ID + " -->\n"); } - + /** * For testing purposes * @param args optional, --java or --xml diff --git a/src/java/org/apache/fop/afp/AFPConstants.java b/src/java/org/apache/fop/afp/AFPConstants.java index 3462ddfe6..6b26c18fd 100644 --- a/src/java/org/apache/fop/afp/AFPConstants.java +++ b/src/java/org/apache/fop/afp/AFPConstants.java @@ -39,13 +39,13 @@ public interface AFPConstants { * The encoding to use to convert to US ASCII (7 bit) */ String US_ASCII_ENCODING = "US-ASCII"; - + /** * The scaling of the default transform is set to * approximately 72 user space coordinates per square inch */ int DPI_72 = 72; - + /** * 72dpi in millipoints */ diff --git a/src/java/org/apache/fop/afp/AFPDataObjectFactory.java b/src/java/org/apache/fop/afp/AFPDataObjectFactory.java index 58321e546..d7e8ea5f9 100644 --- a/src/java/org/apache/fop/afp/AFPDataObjectFactory.java +++ b/src/java/org/apache/fop/afp/AFPDataObjectFactory.java @@ -167,7 +167,7 @@ public class AFPDataObjectFactory { //set color converter (i.e. an rgb to grayscale converter) graphicsObj.setColorConverter(g2d.getPaintingState().getColorConverter()); - + // paint to graphics object Graphics2DImagePainter painter = graphicsObjectInfo.getPainter(); Rectangle2D area = graphicsObjectInfo.getArea(); diff --git a/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java b/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java index 0259435c6..02e542419 100644 --- a/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java +++ b/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java @@ -32,7 +32,7 @@ public class AFPFontInfo { /** * Main constructor - * + * * @param afpFont The AFP Font * @param tripletList List of font triplets to associate with this font */ @@ -43,7 +43,7 @@ public class AFPFontInfo { /** * Returns the afp font - * + * * @return the afp font */ public AFPFont getAFPFont() { @@ -52,7 +52,7 @@ public class AFPFontInfo { /** * Returns the list of font triplets associated with this font. - * + * * @return List of font triplets */ public List/*<FontTriplet>*/ getFontTriplets() { diff --git a/src/java/org/apache/fop/afp/modca/GraphicsObject.java b/src/java/org/apache/fop/afp/modca/GraphicsObject.java index 11af83cab..0c3781be1 100644 --- a/src/java/org/apache/fop/afp/modca/GraphicsObject.java +++ b/src/java/org/apache/fop/afp/modca/GraphicsObject.java @@ -386,7 +386,7 @@ public class GraphicsObject extends AbstractDataObject { /** the internal graphics state */ private static final class GraphicsState { - + private GraphicsState() { } diff --git a/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java b/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java index 44f0edc5b..5a3d13f61 100644 --- a/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java +++ b/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java @@ -56,7 +56,7 @@ public class IncludePageOverlay extends AbstractNamedAFPObject { /** * Constructor for the Include Page Overlay - * + * * @param overlayName Name of the page segment * @param x The x position * @param y The y position @@ -64,7 +64,7 @@ public class IncludePageOverlay extends AbstractNamedAFPObject { */ public IncludePageOverlay(String overlayName, int x, int y, int orientation) { super(overlayName); - + this.x = x; this.y = y; setOrientation(orientation); diff --git a/src/java/org/apache/fop/afp/modca/IncludePageSegment.java b/src/java/org/apache/fop/afp/modca/IncludePageSegment.java index 7355e3b1a..c6eceafea 100644 --- a/src/java/org/apache/fop/afp/modca/IncludePageSegment.java +++ b/src/java/org/apache/fop/afp/modca/IncludePageSegment.java @@ -46,22 +46,22 @@ public class IncludePageSegment extends AbstractNamedAFPObject { * The x position where we need to put this object on the page */ private int x; - + /** * The y position where we need to put this object on the page */ private int y; - + /** * Constructor for the Include Page Segment - * + * * @param name Name of the page segment * @param x The x position * @param y The y position */ public IncludePageSegment(String name, int x, int y) { super(name); - + this.x = x; this.y = y; } diff --git a/src/java/org/apache/fop/afp/modca/InterchangeSet.java b/src/java/org/apache/fop/afp/modca/InterchangeSet.java index f4b020239..35919af15 100644 --- a/src/java/org/apache/fop/afp/modca/InterchangeSet.java +++ b/src/java/org/apache/fop/afp/modca/InterchangeSet.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,10 +25,10 @@ package org.apache.fop.afp.modca; public class InterchangeSet { /** interchange set 1 string value */ public static final String MODCA_PRESENTATION_INTERCHANGE_SET_1 = "MO:DCA-P IS/1"; - + /** interchange set 2 string value */ public static final String MODCA_PRESENTATION_INTERCHANGE_SET_2 = "MO:DCA-P IS/2"; - + /** resource interchange set string value */ public static final String MODCA_RESOURCE_INTERCHANGE_SET = "MO:DCA-L"; @@ -47,7 +47,7 @@ public class InterchangeSet { /** * Returns the interchange set value of a given string - * + * * @param str an interchange set value * @return an interchange set */ @@ -65,7 +65,7 @@ public class InterchangeSet { /** * Main constructor - * + * * @param value the interchange set value */ public InterchangeSet(int value) { @@ -74,39 +74,39 @@ public class InterchangeSet { /** * Returns true if complies with MOD:CA interchange set 1 - * + * * @return true if complies with MOD:CA interchange set 1 */ protected boolean is1() { return value == SET_1; } - + /** * Returns true if complies with MOD:CA interchange set 2 - * + * * @return true if complies with MOD:CA interchange set 2 */ public boolean is2() { return value == SET_2; } - + /** * Returns true if complies with MOD:CA resource set - * + * * @return true if complies with MOD:CA resource set */ public boolean isResource() { return value == RESOURCE_SET; } - + /** {@inheritDoc} */ public String toString() { return NAMES[value]; } - + /** * Returns true if MOD:CA interchange set 2 (resource groups) is supported - * + * * @return true if MOD:CA interchange set 2 (resource groups) is supported */ public boolean supportsLevel2() { diff --git a/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java b/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java index f910a0b9c..02031003b 100644 --- a/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java +++ b/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java @@ -34,7 +34,7 @@ public class InvokeMediumMap extends AbstractNamedAFPObject { /** * Constructor for the Invoke Medium Map - * + * * @param name the name of the medium map */ public InvokeMediumMap(String name) { diff --git a/src/java/org/apache/fop/afp/modca/MapPageOverlay.java b/src/java/org/apache/fop/afp/modca/MapPageOverlay.java index 6f5855c93..cf22e3502 100644 --- a/src/java/org/apache/fop/afp/modca/MapPageOverlay.java +++ b/src/java/org/apache/fop/afp/modca/MapPageOverlay.java @@ -35,7 +35,7 @@ import org.apache.fop.afp.util.BinaryUtils; public class MapPageOverlay extends AbstractAFPObject { private static final int MAX_SIZE = 253; - + /** * The collection of overlays (maximum of 254 stored as byte[]) */ @@ -53,7 +53,7 @@ public class MapPageOverlay extends AbstractAFPObject { } return this.overLays; } - + /** * Add an overlay to to the map page overlay object. * diff --git a/src/java/org/apache/fop/afp/modca/PageSegment.java b/src/java/org/apache/fop/afp/modca/PageSegment.java index b765d6c2f..333608d7f 100644 --- a/src/java/org/apache/fop/afp/modca/PageSegment.java +++ b/src/java/org/apache/fop/afp/modca/PageSegment.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -32,10 +32,10 @@ import java.util.List; public class PageSegment extends AbstractNamedAFPObject { private List/*<AbstractAFPObject>*/ objects = null; - + /** * Main constructor - * + * * @param name the name of this object */ public PageSegment(String name) { @@ -44,7 +44,7 @@ public class PageSegment extends AbstractNamedAFPObject { /** * Returns a list of objects contained withing this page segment - * + * * @return a list of objects contained within this page segment */ public List/*<AbstractAFPObject>*/ getObjects() { @@ -56,13 +56,13 @@ public class PageSegment extends AbstractNamedAFPObject { /** * Adds a resource object (image/graphic) to this page segment - * + * * @param object the resource objec to add to this page segment */ public void addObject(AbstractAFPObject object) { getObjects().add(object); } - + /** {@inheritDoc} */ protected void writeStart(OutputStream os) throws IOException { byte[] data = new byte[17]; @@ -82,7 +82,7 @@ public class PageSegment extends AbstractNamedAFPObject { copySF(data, Type.END, Category.PAGE_SEGMENT); os.write(data); } - + /** {@inheritDoc} */ public String toString() { return this.name; diff --git a/src/java/org/apache/fop/afp/modca/TagLogicalElement.java b/src/java/org/apache/fop/afp/modca/TagLogicalElement.java index 12cb427ef..ab2c52143 100644 --- a/src/java/org/apache/fop/afp/modca/TagLogicalElement.java +++ b/src/java/org/apache/fop/afp/modca/TagLogicalElement.java @@ -102,11 +102,11 @@ public class TagLogicalElement extends AbstractTripletStructuredObject { FullyQualifiedNameTriplet.FORMAT_CHARSTR, name); setAttributeValue(value); - setAttributeQualifier(tleID, 1); - + setAttributeQualifier(tleID, 1); + byte[] data = new byte[SF_HEADER.length]; copySF(data, Type.ATTRIBUTE, Category.PROCESS_ELEMENT); - + int tripletDataLength = getTripletDataLength(); byte[] l = BinaryUtils.convert(data.length + tripletDataLength - 1, 2); data[1] = l[0]; diff --git a/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java b/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java index 5d4523777..923a5d590 100644 --- a/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java +++ b/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java @@ -34,7 +34,7 @@ public class TagLogicalElementBean { /** * Constructor for the TagLogicalElementBean. - * + * * @param key the key attribute * @param value the value attribute */ @@ -45,7 +45,7 @@ public class TagLogicalElementBean { /** * Getter for the key attribute. - * + * * @return the key */ public String getKey() { @@ -54,7 +54,7 @@ public class TagLogicalElementBean { /** * Getter for the value attribute. - * + * * @return the value */ public String getValue() { diff --git a/src/java/org/apache/fop/area/LineArea.java b/src/java/org/apache/fop/area/LineArea.java index 4d622bcec..c89b5be5b 100644 --- a/src/java/org/apache/fop/area/LineArea.java +++ b/src/java/org/apache/fop/area/LineArea.java @@ -40,7 +40,7 @@ public class LineArea extends Area { * page-number or a page-number-citation is resolved */ private final class LineAdjustingInfo implements Serializable { - + private static final long serialVersionUID = -6103629976229458273L; private int lineAlignment; diff --git a/src/java/org/apache/fop/area/Trait.java b/src/java/org/apache/fop/area/Trait.java index 4ad03b468..8114666bc 100644 --- a/src/java/org/apache/fop/area/Trait.java +++ b/src/java/org/apache/fop/area/Trait.java @@ -199,7 +199,7 @@ public final class Trait implements Serializable { public static final Integer OVERLINE_COLOR = new Integer(35); /** Trait for color of linethrough decorations when rendering inline parent. */ public static final Integer LINETHROUGH_COLOR = new Integer(36); - + /** The ptr trait. Used for accessibility */ public static final Integer PTR = new Integer(37); diff --git a/src/java/org/apache/fop/area/inline/Image.java b/src/java/org/apache/fop/area/inline/Image.java index baf3c183b..e6e355254 100644 --- a/src/java/org/apache/fop/area/inline/Image.java +++ b/src/java/org/apache/fop/area/inline/Image.java @@ -31,7 +31,7 @@ public class Image extends Area { private static final long serialVersionUID = 4800834714349695386L; private String url; - + /** * Create a new image with the given url. * diff --git a/src/java/org/apache/fop/fo/properties/BreakPropertySet.java b/src/java/org/apache/fop/fo/properties/BreakPropertySet.java index 2babe0f19..c70bc9fb2 100644 --- a/src/java/org/apache/fop/fo/properties/BreakPropertySet.java +++ b/src/java/org/apache/fop/fo/properties/BreakPropertySet.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,5 +29,5 @@ public interface BreakPropertySet { /** @return the "break-before" property. */ int getBreakBefore(); - + } diff --git a/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java b/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java index df8583089..0bef5e916 100644 --- a/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java @@ -30,7 +30,7 @@ import org.apache.fop.fo.expr.PropertyException; * Window - Preferences - Java - Code Generation - Code and Comments */ public class DimensionPropertyMaker extends CorrespondingPropertyMaker { - + private int[][] extraCorresponding = null; /** diff --git a/src/java/org/apache/fop/fonts/FontAdder.java b/src/java/org/apache/fop/fonts/FontAdder.java index f0e511c42..884a874a8 100644 --- a/src/java/org/apache/fop/fonts/FontAdder.java +++ b/src/java/org/apache/fop/fonts/FontAdder.java @@ -26,7 +26,7 @@ import java.util.List; import org.apache.fop.fonts.autodetect.FontInfoFinder; /** - * Adds a list of fonts to a given font info list + * Adds a list of fonts to a given font info list */ public class FontAdder { private FontEventListener listener; @@ -44,7 +44,7 @@ public class FontAdder { this.resolver = resolver; this.listener = listener; } - + /** * Iterates over font url list adding to font info list * @param fontURLList font file list diff --git a/src/java/org/apache/fop/fonts/FontCache.java b/src/java/org/apache/fop/fonts/FontCache.java index 29470a2a9..61eca0963 100644 --- a/src/java/org/apache/fop/fonts/FontCache.java +++ b/src/java/org/apache/fop/fonts/FontCache.java @@ -106,7 +106,7 @@ public final class FontCache implements Serializable { /** * Returns the default font cache file. - * + * * @param forWriting * true if the user directory should be created * @return the default font cache file @@ -133,7 +133,7 @@ public final class FontCache implements Serializable { /** * Reads the default font cache file and returns its contents. - * + * * @return the font cache deserialized from the file (or null if no cache * file exists or if it could not be read) */ @@ -143,7 +143,7 @@ public final class FontCache implements Serializable { /** * Reads a font cache file and returns its contents. - * + * * @param cacheFile * the cache file * @return the font cache deserialized from the file (or null if no cache @@ -186,7 +186,7 @@ public final class FontCache implements Serializable { /** * Writes the font cache to disk. - * + * * @throws FOPException * fop exception */ @@ -196,7 +196,7 @@ public final class FontCache implements Serializable { /** * Writes the font cache to disk. - * + * * @param cacheFile * the file to write to * @throws FOPException @@ -226,7 +226,7 @@ public final class FontCache implements Serializable { /** * creates a key given a font info for the font mapping - * + * * @param fontInfo * font info * @return font cache key @@ -242,7 +242,7 @@ public final class FontCache implements Serializable { /** * cache has been updated since it was read - * + * * @return if this cache has changed */ public boolean hasChanged() { @@ -251,7 +251,7 @@ public final class FontCache implements Serializable { /** * is this font in the cache? - * + * * @param embedUrl * font info * @return boolean @@ -262,7 +262,7 @@ public final class FontCache implements Serializable { /** * is this font info in the cache? - * + * * @param fontInfo * font info * @return font @@ -275,7 +275,7 @@ public final class FontCache implements Serializable { /** * Tries to identify a File instance from an array of URLs. If there's no * file URL in the array, the method returns null. - * + * * @param urls * array of possible font urls * @return file font file @@ -313,7 +313,7 @@ public final class FontCache implements Serializable { /** * Adds a font info to cache - * + * * @param fontInfo * font info */ @@ -346,7 +346,7 @@ public final class FontCache implements Serializable { /** * Returns a font from the cache. - * + * * @param embedUrl * font info * @return CachedFontFile object @@ -360,7 +360,7 @@ public final class FontCache implements Serializable { * Returns the EmbedFontInfo instances belonging to a font file. If the font * file was modified since it was cached the entry is removed and null is * returned. - * + * * @param embedUrl * the font URL * @param lastModified @@ -380,7 +380,7 @@ public final class FontCache implements Serializable { /** * removes font from cache - * + * * @param embedUrl * embed url */ @@ -398,7 +398,7 @@ public final class FontCache implements Serializable { /** * has this font previously failed to load? - * + * * @param embedUrl * embed url * @param lastModified @@ -425,7 +425,7 @@ public final class FontCache implements Serializable { /** * Registers a failed font with the cache - * + * * @param embedUrl * embed url * @param lastModified @@ -463,7 +463,7 @@ public final class FontCache implements Serializable { /** * Retrieve the last modified date/time of a URL. - * + * * @param url * the URL * @return the last modified date/time @@ -520,7 +520,7 @@ public final class FontCache implements Serializable { /** * Gets the modified timestamp for font file (not always available) - * + * * @return modified timestamp */ public long lastModified() { @@ -530,7 +530,7 @@ public final class FontCache implements Serializable { /** * Gets the modified timestamp for font file (used for the purposes of * font info caching) - * + * * @param lastModified * modified font file timestamp */ diff --git a/src/java/org/apache/fop/fonts/FontDetector.java b/src/java/org/apache/fop/fonts/FontDetector.java index 828cad2b5..5450b4ff9 100644 --- a/src/java/org/apache/fop/fonts/FontDetector.java +++ b/src/java/org/apache/fop/fonts/FontDetector.java @@ -41,7 +41,7 @@ public class FontDetector { private static final String[] FONT_MIMETYPES = { "application/x-font", "application/x-font-truetype" }; - + private FontManager fontManager; private FontAdder fontAdder; private boolean strict; @@ -75,7 +75,7 @@ public class FontDetector { List/*<URL>*/ fontURLList = fontFileFinder.find( fontBase.getAbsolutePath()); fontAdder.add(fontURLList, fontInfoList); - + //Can only use the font base URL if it's a file URL } } catch (IOException e) { diff --git a/src/java/org/apache/fop/fonts/FontManager.java b/src/java/org/apache/fop/fonts/FontManager.java index 519dab6d5..44b2f030b 100644 --- a/src/java/org/apache/fop/fonts/FontManager.java +++ b/src/java/org/apache/fop/fonts/FontManager.java @@ -175,11 +175,11 @@ public class FontManager { } return fontCache; } - + /** * Saves the FontCache as necessary - * - * @throws FOPException fop exception + * + * @throws FOPException fop exception */ public void saveCache() throws FOPException { if (useCache) { diff --git a/src/java/org/apache/fop/fonts/FontManagerConfigurator.java b/src/java/org/apache/fop/fonts/FontManagerConfigurator.java index 7792b118d..b0a4aada0 100644 --- a/src/java/org/apache/fop/fonts/FontManagerConfigurator.java +++ b/src/java/org/apache/fop/fonts/FontManagerConfigurator.java @@ -85,7 +85,7 @@ public class FontManagerConfigurator { // global font configuration Configuration fontsCfg = cfg.getChild("fonts", false); if (fontsCfg != null) { - + // font substitution Configuration substitutionsCfg = fontsCfg.getChild("substitutions", false); if (substitutionsCfg != null) { diff --git a/src/java/org/apache/fop/fonts/Typeface.java b/src/java/org/apache/fop/fonts/Typeface.java index f4e317de3..f0419464c 100644 --- a/src/java/org/apache/fop/fonts/Typeface.java +++ b/src/java/org/apache/fop/fonts/Typeface.java @@ -139,9 +139,9 @@ public abstract class Typeface implements FontMetrics { } } } - + /** {@inheritDoc} */ public String toString() { return getFullName(); - } + } } diff --git a/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java b/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java index 40a44a942..00a622be5 100644 --- a/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java +++ b/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java @@ -73,7 +73,7 @@ public class HyphenationTreeCache { * @param lang the language * @param country the country (may be null or "none") * @param hyphPatNames the map of user-configured hyphenation pattern file names - * @return the hyphenation pattern file name or null + * @return the hyphenation pattern file name or null */ public static String constructUserKey(String lang, String country, Map hyphPatNames) { String userKey = null; @@ -84,7 +84,7 @@ public class HyphenationTreeCache { } return userKey; } - + /** * Cache a hyphenation tree under its key. * @param key the key (ex. "de_CH" or "en") diff --git a/src/java/org/apache/fop/hyphenation/PatternParser.java b/src/java/org/apache/fop/hyphenation/PatternParser.java index 4c4edd78e..404f10c7f 100644 --- a/src/java/org/apache/fop/hyphenation/PatternParser.java +++ b/src/java/org/apache/fop/hyphenation/PatternParser.java @@ -273,14 +273,14 @@ public class PatternParser extends DefaultHandler implements PatternConsumer { parser = mainParser; } } - + // // ContentHandler methods // /** * {@inheritDoc} - * @throws SAXException + * @throws SAXException */ public void startElement(String uri, String local, String raw, Attributes attrs) throws SAXException { @@ -463,9 +463,9 @@ public class PatternParser extends DefaultHandler implements PatternConsumer { public void addPattern(String p, String v) { testOut.println("pattern: " + p + " : " + v); } - + private PrintStream testOut = System.out; - + /** * Set test out stream. * @param testOut the testOut to set @@ -473,7 +473,7 @@ public class PatternParser extends DefaultHandler implements PatternConsumer { public void setTestOut(PrintStream testOut) { this.testOut = testOut; } - + /** * Close test out file. */ @@ -503,5 +503,5 @@ public class PatternParser extends DefaultHandler implements PatternConsumer { } } - + } diff --git a/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java b/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java index d2a259db0..067e2009e 100644 --- a/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java +++ b/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java @@ -27,10 +27,10 @@ import java.io.ObjectOutputStream; /** * Serialize hyphenation patterns * For all xml files in the source directory a pattern file is built in the target directory - * This class may be called from the ant build file in a java task + * This class may be called from the ant build file in a java task */ public class SerializeHyphPattern { - + private boolean errorDump = false; /** diff --git a/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java index 7ac23f74f..edea3aa79 100644 --- a/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java +++ b/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java @@ -59,7 +59,7 @@ public abstract class BreakingAlgorithm { /** Holder for symbolic literals for the fitness classes */ static final class FitnessClasses { - + private FitnessClasses() { } diff --git a/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java index c4a76f2f5..458110a89 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java @@ -91,7 +91,7 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager * @param ipd inline progression dimension * @param bHyph true if hyphenated * @param alignmentContext an alignment context - */ + */ public AreaInfo(short iLS, MinOptMax ipd, boolean bHyph, AlignmentContext alignmentContext) { iLScount = iLS; diff --git a/src/java/org/apache/fop/pdf/PDFObject.java b/src/java/org/apache/fop/pdf/PDFObject.java index 4bb9a7d34..09b8673a8 100644 --- a/src/java/org/apache/fop/pdf/PDFObject.java +++ b/src/java/org/apache/fop/pdf/PDFObject.java @@ -401,7 +401,7 @@ public abstract class PDFObject implements PDFWritable { * identical, this method is not required to check everything. In the case * of PDFObjects, this means that the overriding function does not have to * check for {@link #getObjectID()}. - * + * * @param o * object to compare to. * @return true if the other object has the same content. diff --git a/src/java/org/apache/fop/render/AbstractConfigurator.java b/src/java/org/apache/fop/render/AbstractConfigurator.java index 874bb4d1b..4adc1451e 100644 --- a/src/java/org/apache/fop/render/AbstractConfigurator.java +++ b/src/java/org/apache/fop/render/AbstractConfigurator.java @@ -33,7 +33,7 @@ public abstract class AbstractConfigurator { protected static final Log log = LogFactory.getLog(AbstractConfigurator.class); private static final String MIME = "mime"; - + /** fop factory configuration */ protected FOUserAgent userAgent = null; diff --git a/src/java/org/apache/fop/render/DummyPercentBaseContext.java b/src/java/org/apache/fop/render/DummyPercentBaseContext.java index f9ecf63fe..c04c1d000 100644 --- a/src/java/org/apache/fop/render/DummyPercentBaseContext.java +++ b/src/java/org/apache/fop/render/DummyPercentBaseContext.java @@ -39,7 +39,7 @@ public final class DummyPercentBaseContext implements PercentBaseContext { public static DummyPercentBaseContext getInstance() { return singleton; } - + /** {@inheritDoc} */ public int getBaseLength(int lengthBase, FObj fo) { return 0; diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMapElement.java b/src/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMapElement.java index f36bd3e12..813cf6ddd 100644 --- a/src/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMapElement.java +++ b/src/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMapElement.java @@ -44,7 +44,7 @@ public class AFPInvokeMediumMapElement extends AbstractAFPExtensionObject { super.startOfNode(); if (parent.getNameId() != Constants.FO_PAGE_SEQUENCE && parent.getNameId() != Constants.FO_SIMPLE_PAGE_MASTER) { - + invalidChildError(getLocator(), parent.getName(), getNamespaceURI(), getName(), "rule.childOfPageSequence"); } diff --git a/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java b/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java index a2b4f31b6..4bd548c73 100644 --- a/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java +++ b/src/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java @@ -74,7 +74,7 @@ public class GoToXYAction extends AbstractAction implements DocumentNavigationEx * <p> * This function will always return a valid value for safety. Use * {@link #isComplete()} to check if the link is actually complete. - * + * * @return the page index (0-based) */ public int getPageIndex() { @@ -90,7 +90,7 @@ public class GoToXYAction extends AbstractAction implements DocumentNavigationEx * <p> * This function will always return a valid value for safety. Use * {@link #isComplete()} to check if the link is actually complete. - * + * * @return the target location (coordinates in millipoints) */ public Point getTargetLocation() { @@ -112,7 +112,7 @@ public class GoToXYAction extends AbstractAction implements DocumentNavigationEx private boolean isCompleteExceptTargetLocation() { return (getPageIndex() >= 0); } - + /** {@inheritDoc} */ public boolean isComplete() { return this.isCompleteExceptTargetLocation() && (this.targetLocation != null); @@ -147,9 +147,9 @@ public class GoToXYAction extends AbstractAction implements DocumentNavigationEx atts.addAttribute(null, "id", "id", XMLUtil.CDATA, getID()); atts.addAttribute(null, "page-index", "page-index", XMLUtil.CDATA, Integer.toString(pageIndex)); - atts.addAttribute(null, "x", "x", XMLUtil.CDATA, + atts.addAttribute(null, "x", "x", XMLUtil.CDATA, Integer.toString(reportedTargetLocation.x)); - atts.addAttribute(null, "y", "y", XMLUtil.CDATA, + atts.addAttribute(null, "y", "y", XMLUtil.CDATA, Integer.toString(reportedTargetLocation.y)); } else { atts.addAttribute(null, "idref", "idref", XMLUtil.CDATA, getID()); diff --git a/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java b/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java index 00dfdfa03..2130ef685 100644 --- a/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java +++ b/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java @@ -134,7 +134,7 @@ public abstract class AbstractImageAdapter implements PDFImage { // sRGB hasn't been set up for the PDF document // so install but don't set to DefaultRGB cs = PDFICCBasedColorSpace.setupsRGBColorSpace(doc); - } + } pdfICCStream = cs.getICCStream(); } return pdfICCStream; diff --git a/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java b/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java index 05726be22..d46621068 100644 --- a/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java +++ b/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java @@ -84,7 +84,7 @@ public class PDFImageHandlerSVG implements ImageHandler { userAgent.getFactory().getImageManager(), userAgent.getImageSessionContext(), new AffineTransform()); - + //Cloning SVG DOM as Batik attaches non-thread-safe facilities (like the CSS engine) //to it. Document clonedDoc = BatikUtil.cloneSVGDocument(imageSVG.getDocument()); diff --git a/src/java/org/apache/fop/render/ps/PSEventProducer.java b/src/java/org/apache/fop/render/ps/PSEventProducer.java index 512a4a687..702380a4d 100644 --- a/src/java/org/apache/fop/render/ps/PSEventProducer.java +++ b/src/java/org/apache/fop/render/ps/PSEventProducer.java @@ -29,7 +29,7 @@ public interface PSEventProducer extends EventProducer { /** Provider class for the event producer. */ final class Provider { - + private Provider() { } diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java index 657900574..f014186ed 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java @@ -62,7 +62,7 @@ extends RtfContainer { public static final String FOOTERY = "footery"; /** constant for itap level */ public static final String ITAP = "itap"; - + /** String array of RtfPage attributes */ public static final String[] PAGE_ATTR = new String[]{ PAGE_WIDTH, PAGE_HEIGHT, LANDSCAPE, MARGIN_TOP, MARGIN_BOTTOM, diff --git a/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java b/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java index 547c959d3..1591bbe26 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java @@ -111,7 +111,7 @@ public class BuilderContext { return result; } - /** + /** * Push an RtfContainer on our stack. * @param c the container */ diff --git a/src/sandbox/org/apache/fop/render/mif/RefElement.java b/src/sandbox/org/apache/fop/render/mif/RefElement.java index b23dffa2b..0849f4f69 100644 --- a/src/sandbox/org/apache/fop/render/mif/RefElement.java +++ b/src/sandbox/org/apache/fop/render/mif/RefElement.java @@ -38,7 +38,7 @@ public class RefElement extends MIFElement { super(name); } - /** + /** * @param key a key * @return an mif element */ |