vmote 2003/08/23 10:38:13
Modified: src/java/org/apache/fop/apps Driver.java
src/java/org/apache/fop/fonts CIDFont.java LazyFont.java
MultiByteFont.java SingleByteFont.java
src/java/org/apache/fop/render/svg SVGRenderer.java
Log:
clean up some gump javadoc warnings
Revision Changes Path
1.36 +1 -1 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Driver.java 22 Aug 2003 17:42:41 -0000 1.35
+++ Driver.java 23 Aug 2003 17:38:12 -0000 1.36
@@ -635,7 +635,7 @@
/**
* 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.
*/
1.4 +1 -1 xml-fop/src/java/org/apache/fop/fonts/CIDFont.java
Index: CIDFont.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/CIDFont.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CIDFont.java 25 Apr 2003 07:06:42 -0000 1.3
+++ CIDFont.java 23 Aug 2003 17:38:12 -0000 1.4
@@ -101,7 +101,7 @@
}
/**
- * @see org.apache.fop.fonts.Font#isMultiByte()
+ * @see org.apache.fop.fonts.Typeface#isMultiByte()
*/
public boolean isMultiByte() {
return true;
1.5 +12 -12 xml-fop/src/java/org/apache/fop/fonts/LazyFont.java
Index: LazyFont.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/LazyFont.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LazyFont.java 14 Aug 2003 14:59:56 -0000 1.4
+++ LazyFont.java 23 Aug 2003 17:38:12 -0000 1.5
@@ -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
* [EMAIL PROTECTED]
- *
+ *
* 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 <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
- */
+ */
package org.apache.fop.fonts;
//Java
@@ -116,7 +116,7 @@
// ---- Font ----
/**
- * @see org.apache.fop.fonts.Font#getEncoding()
+ * @see org.apache.fop.fonts.Typeface#getEncoding()
*/
public String getEncoding() {
load();
@@ -132,7 +132,7 @@
}
/**
- * @see org.apache.fop.fonts.Font#isMultiByte()
+ * @see org.apache.fop.fonts.Typeface#isMultiByte()
*/
public boolean isMultiByte() {
return realFont.isMultiByte();
1.3 +14 -14 xml-fop/src/java/org/apache/fop/fonts/MultiByteFont.java
Index: MultiByteFont.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/MultiByteFont.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiByteFont.java 3 Apr 2003 12:53:44 -0000 1.2
+++ MultiByteFont.java 23 Aug 2003 17:38:12 -0000 1.3
@@ -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
* [EMAIL PROTECTED]
- *
+ *
* 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 <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
- */
+ */
package org.apache.fop.fonts;
//Java
@@ -112,7 +112,7 @@
}
int ctm = (int)(System.currentTimeMillis() & 0xffff);
namePrefix = new String(cnt + "E" + Integer.toHexString(ctm));
-
+
setFontType(FontType.TYPE0);
}
@@ -150,7 +150,7 @@
public CIDFontType getCIDType() {
return cidType;
}
-
+
/**
* Sets the CIDType.
* @param cidType The cidType to set
@@ -174,7 +174,7 @@
* @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 @@
}
/**
- * @see org.apache.fop.fonts.Font#getEncoding()
+ * @see org.apache.fop.fonts.Typeface#getEncoding()
*/
public String getEncoding() {
return encoding;
1.2 +14 -14 xml-fop/src/java/org/apache/fop/fonts/SingleByteFont.java
Index: SingleByteFont.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/SingleByteFont.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SingleByteFont.java 11 Mar 2003 13:05:15 -0000 1.1
+++ SingleByteFont.java 23 Aug 2003 17:38:12 -0000 1.2
@@ -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
* [EMAIL PROTECTED]
- *
+ *
* 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 <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
- */
+ */
package org.apache.fop.fonts;
/**
* Generic SingleByte font
*/
public class SingleByteFont extends CustomFont {
-
+
private final CodePointMapping mapping
= CodePointMapping.getMapping("WinAnsiEncoding");
@@ -72,7 +72,7 @@
}
/**
- * @see org.apache.fop.fonts.Font#getEncoding()
+ * @see org.apache.fop.fonts.Typeface#getEncoding()
*/
public String getEncoding() {
return encoding;
@@ -109,7 +109,7 @@
return '#';
}
}
-
+
/* ---- single byte font specific setters --- */
/**
@@ -123,6 +123,6 @@
}
this.width[index] = width;
}
-
+
}
1.7 +1 -1 xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java
Index: SVGRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGRenderer.java 22 Aug 2003 17:42:42 -0000 1.6
+++ SVGRenderer.java 23 Aug 2003 17:38:13 -0000 1.7
@@ -166,7 +166,7 @@
}
/**
- * @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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
