From 30d70cec7bf6f2e0e629d6b447578f6ee8a6375d Mon Sep 17 00:00:00 2001 From: William Victor Mote Date: Sat, 23 Aug 2003 17:38:13 +0000 Subject: [PATCH] clean up some gump javadoc warnings git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196828 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/apps/Driver.java | 2 +- src/java/org/apache/fop/fonts/CIDFont.java | 2 +- src/java/org/apache/fop/fonts/LazyFont.java | 24 ++++++++-------- .../org/apache/fop/fonts/MultiByteFont.java | 28 +++++++++---------- .../org/apache/fop/fonts/SingleByteFont.java | 28 +++++++++---------- .../apache/fop/render/svg/SVGRenderer.java | 2 +- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java index f6d71aeaa..cd16f4d3f 100644 --- a/src/java/org/apache/fop/apps/Driver.java +++ b/src/java/org/apache/fop/apps/Driver.java @@ -635,7 +635,7 @@ public class Driver implements LogEnabled { /** * This method overloads the main render() method, adding the convenience * of using a DOM Document as input. - * @see render(XMLReader, InputSource) + * @see #render(XMLReader, InputSource) * @param document the DOM document to read from * @throws FOPException if anything goes wrong. */ diff --git a/src/java/org/apache/fop/fonts/CIDFont.java b/src/java/org/apache/fop/fonts/CIDFont.java index c66cbad5d..73e7587aa 100644 --- a/src/java/org/apache/fop/fonts/CIDFont.java +++ b/src/java/org/apache/fop/fonts/CIDFont.java @@ -101,7 +101,7 @@ public abstract class CIDFont extends CustomFont { } /** - * @see org.apache.fop.fonts.Font#isMultiByte() + * @see org.apache.fop.fonts.Typeface#isMultiByte() */ public boolean isMultiByte() { return true; diff --git a/src/java/org/apache/fop/fonts/LazyFont.java b/src/java/org/apache/fop/fonts/LazyFont.java index f37aa75ec..3c5bd548d 100644 --- a/src/java/org/apache/fop/fonts/LazyFont.java +++ b/src/java/org/apache/fop/fonts/LazyFont.java @@ -3,34 +3,34 @@ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ - * + * * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * + * * 3. The end-user documentation included with the redistribution, if any, must * include the following acknowledgment: "This product includes software * developed by the Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, if * and wherever such third-party acknowledgments normally appear. - * + * * 4. The names "FOP" and "Apache Software Foundation" must not be used to * endorse or promote products derived from this software without prior * written permission. For written permission, please contact * apache@apache.org. - * + * * 5. Products derived from this software may not be called "Apache", nor may * "Apache" appear in their name, without prior written permission of the * Apache Software Foundation. - * + * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -42,12 +42,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ - * + * * This software consists of voluntary contributions made by many individuals * on behalf of the Apache Software Foundation and was originally created by * James Tauber . For more information on the Apache * Software Foundation, please see . - */ + */ package org.apache.fop.fonts; //Java @@ -116,7 +116,7 @@ public class LazyFont extends Typeface implements FontDescriptor { // ---- Font ---- /** - * @see org.apache.fop.fonts.Font#getEncoding() + * @see org.apache.fop.fonts.Typeface#getEncoding() */ public String getEncoding() { load(); @@ -132,7 +132,7 @@ public class LazyFont extends Typeface implements FontDescriptor { } /** - * @see org.apache.fop.fonts.Font#isMultiByte() + * @see org.apache.fop.fonts.Typeface#isMultiByte() */ public boolean isMultiByte() { return realFont.isMultiByte(); diff --git a/src/java/org/apache/fop/fonts/MultiByteFont.java b/src/java/org/apache/fop/fonts/MultiByteFont.java index 3195eb1dc..e26b0c508 100644 --- a/src/java/org/apache/fop/fonts/MultiByteFont.java +++ b/src/java/org/apache/fop/fonts/MultiByteFont.java @@ -3,34 +3,34 @@ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ - * + * * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * + * * 3. The end-user documentation included with the redistribution, if any, must * include the following acknowledgment: "This product includes software * developed by the Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, if * and wherever such third-party acknowledgments normally appear. - * + * * 4. The names "FOP" and "Apache Software Foundation" must not be used to * endorse or promote products derived from this software without prior * written permission. For written permission, please contact * apache@apache.org. - * + * * 5. Products derived from this software may not be called "Apache", nor may * "Apache" appear in their name, without prior written permission of the * Apache Software Foundation. - * + * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -42,12 +42,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ - * + * * This software consists of voluntary contributions made by many individuals * on behalf of the Apache Software Foundation and was originally created by * James Tauber . For more information on the Apache * Software Foundation, please see . - */ + */ package org.apache.fop.fonts; //Java @@ -112,7 +112,7 @@ public class MultiByteFont extends CIDFont { } int ctm = (int)(System.currentTimeMillis() & 0xffff); namePrefix = new String(cnt + "E" + Integer.toHexString(ctm)); - + setFontType(FontType.TYPE0); } @@ -150,7 +150,7 @@ public class MultiByteFont extends CIDFont { public CIDFontType getCIDType() { return cidType; } - + /** * Sets the CIDType. * @param cidType The cidType to set @@ -174,7 +174,7 @@ public class MultiByteFont extends CIDFont { * @see org.apache.fop.fonts.FontDescriptor#isEmbeddable() */ public boolean isEmbeddable() { - if (getEmbedFileName() == null + if (getEmbedFileName() == null && embedResourceName == null) { return false; } else { @@ -183,7 +183,7 @@ public class MultiByteFont extends CIDFont { } /** - * @see org.apache.fop.fonts.Font#getEncoding() + * @see org.apache.fop.fonts.Typeface#getEncoding() */ public String getEncoding() { return encoding; diff --git a/src/java/org/apache/fop/fonts/SingleByteFont.java b/src/java/org/apache/fop/fonts/SingleByteFont.java index fac9f65a1..50e0a13cf 100644 --- a/src/java/org/apache/fop/fonts/SingleByteFont.java +++ b/src/java/org/apache/fop/fonts/SingleByteFont.java @@ -3,34 +3,34 @@ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ - * + * * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * + * * 3. The end-user documentation included with the redistribution, if any, must * include the following acknowledgment: "This product includes software * developed by the Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, if * and wherever such third-party acknowledgments normally appear. - * + * * 4. The names "FOP" and "Apache Software Foundation" must not be used to * endorse or promote products derived from this software without prior * written permission. For written permission, please contact * apache@apache.org. - * + * * 5. Products derived from this software may not be called "Apache", nor may * "Apache" appear in their name, without prior written permission of the * Apache Software Foundation. - * + * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -42,19 +42,19 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ - * + * * This software consists of voluntary contributions made by many individuals * on behalf of the Apache Software Foundation and was originally created by * James Tauber . For more information on the Apache * Software Foundation, please see . - */ + */ package org.apache.fop.fonts; /** * Generic SingleByte font */ public class SingleByteFont extends CustomFont { - + private final CodePointMapping mapping = CodePointMapping.getMapping("WinAnsiEncoding"); @@ -72,7 +72,7 @@ public class SingleByteFont extends CustomFont { } /** - * @see org.apache.fop.fonts.Font#getEncoding() + * @see org.apache.fop.fonts.Typeface#getEncoding() */ public String getEncoding() { return encoding; @@ -109,7 +109,7 @@ public class SingleByteFont extends CustomFont { return '#'; } } - + /* ---- single byte font specific setters --- */ /** @@ -123,6 +123,6 @@ public class SingleByteFont extends CustomFont { } this.width[index] = width; } - + } diff --git a/src/java/org/apache/fop/render/svg/SVGRenderer.java b/src/java/org/apache/fop/render/svg/SVGRenderer.java index e2c217cb0..0a65b0b2a 100644 --- a/src/java/org/apache/fop/render/svg/SVGRenderer.java +++ b/src/java/org/apache/fop/render/svg/SVGRenderer.java @@ -166,7 +166,7 @@ public class SVGRenderer extends AbstractRenderer implements XMLHandler { } /** - * @see org.apache.fop.render.Renderer#setupFontInfo(FontInfo) + * @see org.apache.fop.render.Renderer#setupFontInfo(FOTreeControl) */ public void setupFontInfo(FOTreeControl foTreeControl) { // create a temp Image to test font metrics on -- 2.39.5