You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ad...@apache.org on 2007/07/17 21:29:43 UTC
svn commit: r557035 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop:
fonts/truetype/ util/
Author: adelmelle
Date: Tue Jul 17 12:29:40 2007
New Revision: 557035
URL: http://svn.apache.org/viewvc?view=rev&rev=557035
Log:
Undo changes of r556112
Removed:
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/IntMap.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CMYKColorSpace.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CloseBlockerOutputStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CommandLineLogger.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DataURIResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DefaultErrorListener.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DelegatingContentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/QName.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/WriterOutputStream.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java?view=diff&rev=557035&r1=557034&r2=557035
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java Tue Jul 17 12:29:40 2007
@@ -20,7 +20,6 @@
package org.apache.fop.fonts.truetype;
import java.io.IOException;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.List;
@@ -28,7 +27,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.fonts.Glyphs;
-import org.apache.fop.util.IntMap;
/**
* Reads a TrueType file or a TrueType Collection.
@@ -111,8 +109,8 @@
// internal mapping of glyph indexes to unicode indexes
// used for quick mappings in this class
- private IntMap glyphToUnicodeMap = new IntMap();
- private IntMap unicodeToGlyphMap = new IntMap();
+ private Map glyphToUnicodeMap = new java.util.HashMap();
+ private Map unicodeToGlyphMap = new java.util.HashMap();
private TTFDirTabEntry currentDirTab;
@@ -134,8 +132,8 @@
UnicodeMapping(int glyphIndex, int unicodeIndex) {
this.unicodeIndex = unicodeIndex;
this.glyphIndex = glyphIndex;
- glyphToUnicodeMap.put(glyphIndex, unicodeIndex);
- unicodeToGlyphMap.put(unicodeIndex, glyphIndex);
+ glyphToUnicodeMap.put(new Integer(glyphIndex), new Integer(unicodeIndex));
+ unicodeToGlyphMap.put(new Integer(unicodeIndex), new Integer(glyphIndex));
}
/**
@@ -1505,7 +1503,7 @@
* @throws IOException if glyphIndex not found
*/
private Integer glyphToUnicode(int glyphIndex) throws IOException {
- return new Integer(glyphToUnicodeMap.get(glyphIndex));
+ return (Integer) glyphToUnicodeMap.get(new Integer(glyphIndex));
}
/**
@@ -1517,7 +1515,7 @@
*/
private Integer unicodeToGlyph(int unicodeIndex) throws IOException {
final Integer result =
- new Integer(unicodeToGlyphMap.get(unicodeIndex));
+ (Integer) unicodeToGlyphMap.get(new Integer(unicodeIndex));
if (result == null) {
throw new IOException(
"Glyph index not found for unicode value " + unicodeIndex);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CMYKColorSpace.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CMYKColorSpace.java?view=diff&rev=557035&r1=557034&r2=557035
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CMYKColorSpace.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CMYKColorSpace.java Tue Jul 17 12:29:40 2007
@@ -48,7 +48,7 @@
}
/**
- * @see java.awt.color.ColorSpace#toRGB(float[])
+ * @inheritDoc java.awt.color.ColorSpace#toRGB(float[])
*/
public float[] toRGB(float[] colorvalue) {
return new float [] {
@@ -58,21 +58,21 @@
}
/**
- * @see java.awt.color.ColorSpace#fromRGB(float[])
+ * @inheritDoc java.awt.color.ColorSpace#fromRGB(float[])
*/
public float[] fromRGB(float[] rgbvalue) {
throw new UnsupportedOperationException("NYI");
}
/**
- * @see java.awt.color.ColorSpace#toCIEXYZ(float[])
+ * @inheritDoc java.awt.color.ColorSpace#toCIEXYZ(float[])
*/
public float[] toCIEXYZ(float[] colorvalue) {
throw new UnsupportedOperationException("NYI");
}
/**
- * @see java.awt.color.ColorSpace#fromCIEXYZ(float[])
+ * @inheritDoc java.awt.color.ColorSpace#fromCIEXYZ(float[])
*/
public float[] fromCIEXYZ(float[] colorvalue) {
throw new UnsupportedOperationException("NYI");
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CloseBlockerOutputStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CloseBlockerOutputStream.java?view=diff&rev=557035&r1=557034&r2=557035
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CloseBlockerOutputStream.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CloseBlockerOutputStream.java Tue Jul 17 12:29:40 2007
@@ -36,7 +36,7 @@
}
/**
- * @see java.io.OutputStream#close()
+ * @inheritDoc java.io.OutputStream#close()
*/
public void close() throws IOException {
try {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java?view=diff&rev=557035&r1=557034&r2=557035
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java Tue Jul 17 12:29:40 2007
@@ -157,7 +157,7 @@
* @return a color if possible
* @throws PropertyException
* if the format is wrong.
- * @see java.awt.Color#toString()
+ * @inheritDoc java.awt.Color#toString()
*/
private static Color parseAsJavaAWTColor(String value)
throws PropertyException {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CommandLineLogger.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CommandLineLogger.java?view=diff&rev=557035&r1=557034&r2=557035
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CommandLineLogger.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CommandLineLogger.java Tue Jul 17 12:29:40 2007
@@ -74,49 +74,49 @@
}
/**
- * @see org.apache.commons.logging.Log#isTraceEnabled()
+ * @inheritDoc org.apache.commons.logging.Log#isTraceEnabled()
*/
public final boolean isTraceEnabled() {
return logLevel <= LOG_LEVEL_TRACE;
}
/**
- * @see org.apache.commons.logging.Log#isDebugEnabled()
+ * @inheritDoc org.apache.commons.logging.Log#isDebugEnabled()
*/
public final boolean isDebugEnabled() {
return logLevel <= LOG_LEVEL_DEBUG;
}
/**
- * @see org.apache.commons.logging.Log#isInfoEnabled()
+ * @inheritDoc org.apache.commons.logging.Log#isInfoEnabled()
*/
public final boolean isInfoEnabled() {
return logLevel <= LOG_LEVEL_INFO;
}
/**
- * @see org.apache.commons.logging.Log#isWarnEnabled()
+ * @inheritDoc org.apache.commons.logging.Log#isWarnEnabled()
*/
public final boolean isWarnEnabled() {
return logLevel <= LOG_LEVEL_WARN;
}
/**
- * @see org.apache.commons.logging.Log#isErrorEnabled()
+ * @inheritDoc org.apache.commons.logging.Log#isErrorEnabled()
*/
public final boolean isErrorEnabled() {
return logLevel <= LOG_LEVEL_ERROR;
}
/**
- * @see org.apache.commons.logging.Log#isFatalEnabled()
+ * @inheritDoc org.apache.commons.logging.Log#isFatalEnabled()
*/
public final boolean isFatalEnabled() {
return logLevel <= LOG_LEVEL_FATAL;
}
/**
- * @see org.apache.commons.logging.Log#trace(java.lang.Object)
+ * @inheritDoc org.apache.commons.logging.Log#trace(java.lang.Object)
*/
public final void trace(Object message) {
if (isTraceEnabled()) {
@@ -125,7 +125,7 @@
}
/**
- * @see org.apache.commons.logging.Log#trace(java.lang.Object, java.lang.Throwable)
+ * @inheritDoc org.apache.commons.logging.Log#trace(java.lang.Object, java.lang.Throwable)
*/
public final void trace(Object message, Throwable t) {
if (isTraceEnabled()) {
@@ -134,7 +134,7 @@
}
/**
- * @see org.apache.commons.logging.Log#debug(java.lang.Object)
+ * @inheritDoc org.apache.commons.logging.Log#debug(java.lang.Object)
*/
public final void debug(Object message) {
if (isDebugEnabled()) {
@@ -143,7 +143,7 @@
}
/**
- * @see org.apache.commons.logging.Log#debug(java.lang.Object, java.lang.Throwable)
+ * @inheritDoc org.apache.commons.logging.Log#debug(java.lang.Object, java.lang.Throwable)
*/
public final void debug(Object message, Throwable t) {
if (isDebugEnabled()) {
@@ -152,7 +152,7 @@
}
/**
- * @see org.apache.commons.logging.Log#info(java.lang.Object)
+ * @inheritDoc org.apache.commons.logging.Log#info(java.lang.Object)
*/
public final void info(Object message) {
if (isInfoEnabled()) {
@@ -161,7 +161,7 @@
}
/**
- * @see org.apache.commons.logging.Log#info(java.lang.Object, java.lang.Throwable)
+ * @inheritDoc org.apache.commons.logging.Log#info(java.lang.Object, java.lang.Throwable)
*/
public final void info(Object message, Throwable t) {
if (isInfoEnabled()) {
@@ -170,7 +170,7 @@
}
/**
- * @see org.apache.commons.logging.Log#warn(java.lang.Object)
+ * @inheritDoc org.apache.commons.logging.Log#warn(java.lang.Object)
*/
public final void warn(Object message) {
if (isWarnEnabled()) {
@@ -179,7 +179,7 @@
}
/**
- * @see org.apache.commons.logging.Log#warn(java.lang.Object, java.lang.Throwable)
+ * @inheritDoc org.apache.commons.logging.Log#warn(java.lang.Object, java.lang.Throwable)
*/
public final void warn(Object message, Throwable t) {
if (isWarnEnabled()) {
@@ -188,7 +188,7 @@
}
/**
- * @see org.apache.commons.logging.Log#error(java.lang.Object)
+ * @inheritDoc org.apache.commons.logging.Log#error(java.lang.Object)
*/
public final void error(Object message) {
if (isErrorEnabled()) {
@@ -197,7 +197,7 @@
}
/**
- * @see org.apache.commons.logging.Log#error(java.lang.Object, java.lang.Throwable)
+ * @inheritDoc org.apache.commons.logging.Log#error(java.lang.Object, java.lang.Throwable)
*/
public final void error(Object message, Throwable t) {
if (isErrorEnabled()) {
@@ -206,7 +206,7 @@
}
/**
- * @see org.apache.commons.logging.Log#fatal(java.lang.Object)
+ * @inheritDoc org.apache.commons.logging.Log#fatal(java.lang.Object)
*/
public final void fatal(Object message) {
if (isFatalEnabled()) {
@@ -215,7 +215,7 @@
}
/**
- * @see org.apache.commons.logging.Log#fatal(java.lang.Object, java.lang.Throwable)
+ * @inheritDoc org.apache.commons.logging.Log#fatal(java.lang.Object, java.lang.Throwable)
*/
public final void fatal(Object message, Throwable t) {
if (isFatalEnabled()) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java?view=diff&rev=557035&r1=557034&r2=557035
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java Tue Jul 17 12:29:40 2007
@@ -52,12 +52,12 @@
this.domImplementation = domImplementation;
}
- /** @see org.apache.fop.util.ContentHandlerFactory#getSupportedNamespaces() */
+ /** @inheritDoc org.apache.fop.util.ContentHandlerFactory#getSupportedNamespaces() */
public String[] getSupportedNamespaces() {
return new String[] {namespaceURI};
}
- /** @see org.apache.fop.util.ContentHandlerFactory#createContentHandler() */
+ /** @inheritDoc org.apache.fop.util.ContentHandlerFactory#createContentHandler() */
public ContentHandler createContentHandler() throws SAXException {
return new Handler();
}
@@ -77,21 +77,21 @@
}
/**
- * @see org.apache.fop.util.ContentHandlerFactory.ObjectSource#getObject()
+ * @inheritDoc org.apache.fop.util.ContentHandlerFactory.ObjectSource#getObject()
*/
public Object getObject() {
return getDocument();
}
/**
- * @see org.apache.fop.util.ContentHandlerFactory.ObjectSource
+ * @inheritDoc org.apache.fop.util.ContentHandlerFactory.ObjectSource
*/
public void setObjectBuiltListener(ObjectBuiltListener listener) {
this.obListener = listener;
}
/**
- * @see org.apache.fop.util.DelegatingContentHandler#startDocument()
+ * @inheritDoc org.apache.fop.util.DelegatingContentHandler#startDocument()
*/
public void startDocument() throws SAXException {
//Suppress startDocument() call if doc has not been set, yet. It will be done later.
@@ -101,7 +101,7 @@
}
/**
- * @see org.apache.fop.util.DelegatingContentHandler
+ * @inheritDoc org.apache.fop.util.DelegatingContentHandler
*/
public void startElement(String uri, String localName, String qName, Attributes atts)
throws SAXException {
@@ -125,7 +125,7 @@
}
/**
- * @see org.apache.fop.util.DelegatingContentHandler#endDocument()
+ * @inheritDoc org.apache.fop.util.DelegatingContentHandler#endDocument()
*/
public void endDocument() throws SAXException {
super.endDocument();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DataURIResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DataURIResolver.java?view=diff&rev=557035&r1=557034&r2=557035
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DataURIResolver.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DataURIResolver.java Tue Jul 17 12:29:40 2007
@@ -38,7 +38,7 @@
public class DataURIResolver implements URIResolver {
/**
- * @see javax.xml.transform.URIResolver#resolve(java.lang.String, java.lang.String)
+ * @inheritDoc javax.xml.transform.URIResolver#resolve(java.lang.String, java.lang.String)
*/
public Source resolve(String href, String base) throws TransformerException {
if (href.startsWith("data:")) {
@@ -52,7 +52,7 @@
* Parses inline data URIs as generated by MS Word's XML export and FO
* stylesheet.
*
- * @see <a href="http://www.ietf.org/rfc/rfc2397">RFC 2397</a>
+ * @inheritDoc <a href="http://www.ietf.org/rfc/rfc2397">RFC 2397</a>
*/
private Source parseDataURI(String href) {
int commaPos = href.indexOf(',');
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DefaultErrorListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DefaultErrorListener.java?view=diff&rev=557035&r1=557034&r2=557035
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DefaultErrorListener.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DefaultErrorListener.java Tue Jul 17 12:29:40 2007
@@ -41,21 +41,21 @@
}
/**
- * @see javax.xml.transform.ErrorListener#warning(javax.xml.transform.TransformerException)
+ * @inheritDoc javax.xml.transform.ErrorListener#warning(javax.xml.transform.TransformerException)
*/
public void warning(TransformerException exc) {
log.warn(exc.toString());
}
/**
- * @see javax.xml.transform.ErrorListener#error(javax.xml.transform.TransformerException)
+ * @inheritDoc javax.xml.transform.ErrorListener#error(javax.xml.transform.TransformerException)
*/
public void error(TransformerException exc) throws TransformerException {
throw exc;
}
/**
- * @see javax.xml.transform.ErrorListener#fatalError(javax.xml.transform.TransformerException)
+ * @inheritDoc javax.xml.transform.ErrorListener#fatalError(javax.xml.transform.TransformerException)
*/
public void fatalError(TransformerException exc)
throws TransformerException {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DelegatingContentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DelegatingContentHandler.java?view=diff&rev=557035&r1=557034&r2=557035
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DelegatingContentHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DelegatingContentHandler.java Tue Jul 17 12:29:40 2007
@@ -106,7 +106,7 @@
// ==== EntityResolver
/**
- * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
+ * @inheritDoc org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
*/
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
if (entityResolver != null) {
@@ -119,7 +119,7 @@
// ==== DTDHandler
/**
- * @see org.xml.sax.DTDHandler#notationDecl(java.lang.String, java.lang.String, java.lang.String)
+ * @inheritDoc org.xml.sax.DTDHandler#notationDecl(java.lang.String, java.lang.String, java.lang.String)
*/
public void notationDecl(String name, String publicId, String systemId) throws SAXException {
if (dtdHandler != null) {
@@ -128,7 +128,7 @@
}
/**
- * @see org.xml.sax.DTDHandler#unparsedEntityDecl(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ * @inheritDoc org.xml.sax.DTDHandler#unparsedEntityDecl(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
*/
public void unparsedEntityDecl(String name, String publicId, String systemId,
String notationName) throws SAXException {
@@ -140,42 +140,42 @@
// ==== ContentHandler
/**
- * @see org.xml.sax.ContentHandler#setDocumentLocator(org.xml.sax.Locator)
+ * @inheritDoc org.xml.sax.ContentHandler#setDocumentLocator(org.xml.sax.Locator)
*/
public void setDocumentLocator(Locator locator) {
delegate.setDocumentLocator(locator);
}
/**
- * @see org.xml.sax.ContentHandler#startDocument()
+ * @inheritDoc org.xml.sax.ContentHandler#startDocument()
*/
public void startDocument() throws SAXException {
delegate.startDocument();
}
/**
- * @see org.xml.sax.ContentHandler#endDocument()
+ * @inheritDoc org.xml.sax.ContentHandler#endDocument()
*/
public void endDocument() throws SAXException {
delegate.endDocument();
}
/**
- * @see org.xml.sax.ContentHandler#startPrefixMapping(java.lang.String, java.lang.String)
+ * @inheritDoc org.xml.sax.ContentHandler#startPrefixMapping(java.lang.String, java.lang.String)
*/
public void startPrefixMapping(String prefix, String uri) throws SAXException {
delegate.startPrefixMapping(prefix, uri);
}
/**
- * @see org.xml.sax.ContentHandler#endPrefixMapping(java.lang.String)
+ * @inheritDoc org.xml.sax.ContentHandler#endPrefixMapping(java.lang.String)
*/
public void endPrefixMapping(String prefix) throws SAXException {
delegate.endPrefixMapping(prefix);
}
/**
- * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
+ * @inheritDoc org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
*/
public void startElement(String uri, String localName, String qName,
Attributes atts) throws SAXException {
@@ -183,35 +183,35 @@
}
/**
- * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
+ * @inheritDoc org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
*/
public void endElement(String uri, String localName, String qName) throws SAXException {
delegate.endElement(uri, localName, qName);
}
/**
- * @see org.xml.sax.ContentHandler#characters(char[], int, int)
+ * @inheritDoc org.xml.sax.ContentHandler#characters(char[], int, int)
*/
public void characters(char[] ch, int start, int length) throws SAXException {
delegate.characters(ch, start, length);
}
/**
- * @see org.xml.sax.ContentHandler#ignorableWhitespace(char[], int, int)
+ * @inheritDoc org.xml.sax.ContentHandler#ignorableWhitespace(char[], int, int)
*/
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
delegate.ignorableWhitespace(ch, start, length);
}
/**
- * @see org.xml.sax.ContentHandler#processingInstruction(java.lang.String, java.lang.String)
+ * @inheritDoc org.xml.sax.ContentHandler#processingInstruction(java.lang.String, java.lang.String)
*/
public void processingInstruction(String target, String data) throws SAXException {
delegate.processingInstruction(target, data);
}
/**
- * @see org.xml.sax.ContentHandler#skippedEntity(java.lang.String)
+ * @inheritDoc org.xml.sax.ContentHandler#skippedEntity(java.lang.String)
*/
public void skippedEntity(String name) throws SAXException {
delegate.skippedEntity(name);
@@ -220,7 +220,7 @@
// ==== LexicalHandler
/**
- * @see org.xml.sax.ext.LexicalHandler#startDTD(java.lang.String, java.lang.String, java.lang.String)
+ * @inheritDoc org.xml.sax.ext.LexicalHandler#startDTD(java.lang.String, java.lang.String, java.lang.String)
*/
public void startDTD(String name, String publicId, String systemId) throws SAXException {
if (lexicalHandler != null) {
@@ -230,7 +230,7 @@
}
/**
- * @see org.xml.sax.ext.LexicalHandler#endDTD()
+ * @inheritDoc org.xml.sax.ext.LexicalHandler#endDTD()
*/
public void endDTD() throws SAXException {
if (lexicalHandler != null) {
@@ -239,7 +239,7 @@
}
/**
- * @see org.xml.sax.ext.LexicalHandler#startEntity(java.lang.String)
+ * @inheritDoc org.xml.sax.ext.LexicalHandler#startEntity(java.lang.String)
*/
public void startEntity(String name) throws SAXException {
if (lexicalHandler != null) {
@@ -248,7 +248,7 @@
}
/**
- * @see org.xml.sax.ext.LexicalHandler#endEntity(java.lang.String)
+ * @inheritDoc org.xml.sax.ext.LexicalHandler#endEntity(java.lang.String)
*/
public void endEntity(String name) throws SAXException {
if (lexicalHandler != null) {
@@ -257,7 +257,7 @@
}
/**
- * @see org.xml.sax.ext.LexicalHandler#startCDATA()
+ * @inheritDoc org.xml.sax.ext.LexicalHandler#startCDATA()
*/
public void startCDATA() throws SAXException {
if (lexicalHandler != null) {
@@ -266,7 +266,7 @@
}
/**
- * @see org.xml.sax.ext.LexicalHandler#endCDATA()
+ * @inheritDoc org.xml.sax.ext.LexicalHandler#endCDATA()
*/
public void endCDATA() throws SAXException {
if (lexicalHandler != null) {
@@ -275,7 +275,7 @@
}
/**
- * @see org.xml.sax.ext.LexicalHandler#comment(char[], int, int)
+ * @inheritDoc org.xml.sax.ext.LexicalHandler#comment(char[], int, int)
*/
public void comment(char[] ch, int start, int length) throws SAXException {
if (lexicalHandler != null) {
@@ -286,7 +286,7 @@
// ==== ErrorHandler
/**
- * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
+ * @inheritDoc org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
*/
public void warning(SAXParseException exception) throws SAXException {
if (errorHandler != null) {
@@ -295,7 +295,7 @@
}
/**
- * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
+ * @inheritDoc org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
*/
public void error(SAXParseException exception) throws SAXException {
if (errorHandler != null) {
@@ -304,7 +304,7 @@
}
/**
- * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
+ * @inheritDoc org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
*/
public void fatalError(SAXParseException exception) throws SAXException {
if (errorHandler != null) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/QName.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/QName.java?view=diff&rev=557035&r1=557034&r2=557035
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/QName.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/QName.java Tue Jul 17 12:29:40 2007
@@ -99,12 +99,12 @@
return getPrefix() != null ? getPrefix() + ':' + getLocalName() : getLocalName();
}
- /** @see java.lang.Object#hashCode() */
+ /** @inheritDoc java.lang.Object#hashCode() */
public int hashCode() {
return this.hashCode;
}
- /** @see java.lang.Object#equals(java.lang.Object) */
+ /** @inheritDoc java.lang.Object#equals(java.lang.Object) */
public boolean equals(Object obj) {
if (obj == null) {
return false;
@@ -122,7 +122,7 @@
return false;
}
- /** @see java.lang.Object#toString() */
+ /** @inheritDoc java.lang.Object#toString() */
public String toString() {
return prefix != null
? (prefix + ":" + localName)
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/WriterOutputStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/WriterOutputStream.java?view=diff&rev=557035&r1=557034&r2=557035
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/WriterOutputStream.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/WriterOutputStream.java Tue Jul 17 12:29:40 2007
@@ -50,21 +50,21 @@
}
/**
- * @see java.io.OutputStream#close()
+ * @inheritDoc java.io.OutputStream#close()
*/
public void close() throws IOException {
writer.close();
}
/**
- * @see java.io.OutputStream#flush()
+ * @inheritDoc java.io.OutputStream#flush()
*/
public void flush() throws IOException {
writer.flush();
}
/**
- * @see java.io.OutputStream#write(byte[], int, int)
+ * @inheritDoc java.io.OutputStream#write(byte[], int, int)
*/
public void write(byte[] buf, int offset, int length) throws IOException {
if (encoding != null) {
@@ -75,14 +75,14 @@
}
/**
- * @see java.io.OutputStream#write(byte[])
+ * @inheritDoc java.io.OutputStream#write(byte[])
*/
public void write(byte[] buf) throws IOException {
write(buf, 0, buf.length);
}
/**
- * @see java.io.OutputStream#write(int)
+ * @inheritDoc java.io.OutputStream#write(int)
*/
public void write(int b) throws IOException {
write(new byte[] {(byte)b});
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
Re: svn commit: r557035 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop: fonts/truetype/ util/
Posted by Andreas L Delmelle <a_...@pandora.be>.
On Jul 17, 2007, at 21:29, adelmelle@apache.org wrote:
> Author: adelmelle
> Date: Tue Jul 17 12:29:40 2007
> New Revision: 557035
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=557035
> Log:
> Undo changes of r556112
Oops! Some javadoc changes already committed as well...
Well, if no one objects before tomorrow evening, the rest will follow
then.
Cheers
Andreas
Re: svn commit: r557035 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop: fonts/truetype/ util/
Posted by Andreas L Delmelle <a_...@pandora.be>.
On Jul 18, 2007, at 16:07, Jeremias Maerki wrote:
>> - * @see <a href="http://www.ietf.org/rfc/rfc2397">RFC 2397</a>
>> + * @inheritDoc <a href="http://www.ietf.org/rfc/rfc2397">RFC
>> 2397</a>
>
> ^^^^^^^^^^^^^
>
> Careful!!!!
Sorry, but no need to worry. If the correct {@inheritDoc} syntax is
used, as Vincent pointed out, mistakes such as these are caught when
building the javadocs.
See: http://svn.apache.org/viewvc?view=rev&rev=557272 for the correct
and intended results.
Cheers
Andreas
Re: svn commit: r557035 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop: fonts/truetype/ util/
Posted by Jeremias Maerki <de...@jeremias-maerki.ch>.
On 17.07.2007 21:29:43 adelmelle wrote:
> Author: adelmelle
> Date: Tue Jul 17 12:29:40 2007
> New Revision: 557035
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=557035
> Log:
> Undo changes of r556112
>
<snip/>
> Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DataURIResolver.java
> URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DataURIResolver.java?view=diff&rev=557035&r1=557034&r2=557035
> ==============================================================================
> --- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DataURIResolver.java (original)
> +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DataURIResolver.java Tue Jul 17 12:29:40 2007
> @@ -38,7 +38,7 @@
> public class DataURIResolver implements URIResolver {
>
> /**
> - * @see javax.xml.transform.URIResolver#resolve(java.lang.String, java.lang.String)
> + * @inheritDoc javax.xml.transform.URIResolver#resolve(java.lang.String, java.lang.String)
> */
> public Source resolve(String href, String base) throws TransformerException {
> if (href.startsWith("data:")) {
> @@ -52,7 +52,7 @@
> * Parses inline data URIs as generated by MS Word's XML export and FO
> * stylesheet.
> *
> - * @see <a href="http://www.ietf.org/rfc/rfc2397">RFC 2397</a>
> + * @inheritDoc <a href="http://www.ietf.org/rfc/rfc2397">RFC 2397</a>
^^^^^^^^^^^^^
Careful!!!!
> */
> private Source parseDataURI(String href) {
> int commaPos = href.indexOf(',');
>
<snip/>
Jeremias Maerki