Correction of premature javadoc commit in r557035

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@557272 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 68 insertions, 68 deletions

diff --git a/src/java/org/apache/fop/util/CMYKColorSpace.java b/src/java/org/apache/fop/util/CMYKColorSpace.java
index 3d4a949ad..26de8aa97 100644
--- a/src/java/org/apache/fop/util/CMYKColorSpace.java
+++ b/src/java/org/apache/fop/util/CMYKColorSpace.java
@@ -48,7 +48,7 @@ public class CMYKColorSpace extends ColorSpace {
     }
 
     /**
-     * @inheritDoc java.awt.color.ColorSpace#toRGB(float[])
+     * {@inheritDoc}
      */
     public float[] toRGB(float[] colorvalue) {
         return new float [] {
@@ -58,21 +58,21 @@ public class CMYKColorSpace extends ColorSpace {
     }
 
     /**
-     * @inheritDoc java.awt.color.ColorSpace#fromRGB(float[])
+     * {@inheritDoc}
      */
     public float[] fromRGB(float[] rgbvalue) {
         throw new UnsupportedOperationException("NYI");
     }
 
     /**
-     * @inheritDoc java.awt.color.ColorSpace#toCIEXYZ(float[])
+     * {@inheritDoc}
      */
     public float[] toCIEXYZ(float[] colorvalue) {
         throw new UnsupportedOperationException("NYI");
     }
 
     /**
-     * @inheritDoc java.awt.color.ColorSpace#fromCIEXYZ(float[])
+     * {@inheritDoc}
      */
     public float[] fromCIEXYZ(float[] colorvalue) {
         throw new UnsupportedOperationException("NYI");
diff --git a/src/java/org/apache/fop/util/CloseBlockerOutputStream.java b/src/java/org/apache/fop/util/CloseBlockerOutputStream.java
index 0dda4fe7a..7192e76d2 100644
--- a/src/java/org/apache/fop/util/CloseBlockerOutputStream.java
+++ b/src/java/org/apache/fop/util/CloseBlockerOutputStream.java
@@ -36,7 +36,7 @@ public class CloseBlockerOutputStream extends FilterOutputStream {
     }
 
     /**
-     * @inheritDoc java.io.OutputStream#close()
+     * {@inheritDoc}
      */
     public void close() throws IOException {
         try {
diff --git a/src/java/org/apache/fop/util/ColorUtil.java b/src/java/org/apache/fop/util/ColorUtil.java
index 73568104f..37762b1e8 100644
--- a/src/java/org/apache/fop/util/ColorUtil.java
+++ b/src/java/org/apache/fop/util/ColorUtil.java
@@ -157,7 +157,7 @@ public final class ColorUtil {
      * @return a color if possible
      * @throws PropertyException
      *             if the format is wrong.
-     * @inheritDoc java.awt.Color#toString()
+     * @see java.awt.Color#toString()
      */
     private static Color parseAsJavaAWTColor(String value)
             throws PropertyException {
diff --git a/src/java/org/apache/fop/util/CommandLineLogger.java b/src/java/org/apache/fop/util/CommandLineLogger.java
index 08ee32cf1..beb82ab03 100644
--- a/src/java/org/apache/fop/util/CommandLineLogger.java
+++ b/src/java/org/apache/fop/util/CommandLineLogger.java
@@ -74,49 +74,49 @@ public class CommandLineLogger implements Log {
     }
     
     /**
-     * @inheritDoc org.apache.commons.logging.Log#isTraceEnabled()
+     * {@inheritDoc}
      */
     public final boolean isTraceEnabled() {
         return logLevel <= LOG_LEVEL_TRACE;
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#isDebugEnabled()
+     * {@inheritDoc}
      */
     public final boolean isDebugEnabled() {
         return logLevel <= LOG_LEVEL_DEBUG;
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#isInfoEnabled()
+     * {@inheritDoc}
      */
     public final boolean isInfoEnabled() {
         return logLevel <= LOG_LEVEL_INFO;
     }
     
     /**
-     * @inheritDoc org.apache.commons.logging.Log#isWarnEnabled()
+     * {@inheritDoc}
      */
     public final boolean isWarnEnabled() {
         return logLevel <= LOG_LEVEL_WARN;
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#isErrorEnabled()
+     * {@inheritDoc}
      */
     public final boolean isErrorEnabled() {
         return logLevel <= LOG_LEVEL_ERROR;
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#isFatalEnabled()
+     * {@inheritDoc}
      */
     public final boolean isFatalEnabled() {
         return logLevel <= LOG_LEVEL_FATAL;
     }
     
     /**
-     * @inheritDoc org.apache.commons.logging.Log#trace(java.lang.Object)
+     * {@inheritDoc}
      */
     public final void trace(Object message) {
         if (isTraceEnabled()) {
@@ -125,7 +125,7 @@ public class CommandLineLogger implements Log {
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#trace(java.lang.Object, java.lang.Throwable)
+     * {@inheritDoc}
      */
     public final void trace(Object message, Throwable t) {
         if (isTraceEnabled()) {
@@ -134,7 +134,7 @@ public class CommandLineLogger implements Log {
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#debug(java.lang.Object)
+     * {@inheritDoc}
      */
     public final void debug(Object message) {
         if (isDebugEnabled()) {
@@ -143,7 +143,7 @@ public class CommandLineLogger implements Log {
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#debug(java.lang.Object, java.lang.Throwable)
+     * {@inheritDoc}
      */
     public final void debug(Object message, Throwable t) {
         if (isDebugEnabled()) {
@@ -152,7 +152,7 @@ public class CommandLineLogger implements Log {
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#info(java.lang.Object)
+     * {@inheritDoc}
      */
     public final void info(Object message) {
         if (isInfoEnabled()) {
@@ -161,7 +161,7 @@ public class CommandLineLogger implements Log {
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#info(java.lang.Object, java.lang.Throwable)
+     * {@inheritDoc}
      */
     public final void info(Object message, Throwable t) {
         if (isInfoEnabled()) {
@@ -170,7 +170,7 @@ public class CommandLineLogger implements Log {
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#warn(java.lang.Object)
+     * {@inheritDoc}
      */
     public final void warn(Object message) {
         if (isWarnEnabled()) {
@@ -179,7 +179,7 @@ public class CommandLineLogger implements Log {
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#warn(java.lang.Object, java.lang.Throwable)
+     * {@inheritDoc}
      */
     public final void warn(Object message, Throwable t) {
         if (isWarnEnabled()) {
@@ -188,7 +188,7 @@ public class CommandLineLogger implements Log {
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#error(java.lang.Object)
+     * {@inheritDoc}
      */
     public final void error(Object message) {
         if (isErrorEnabled()) {
@@ -197,7 +197,7 @@ public class CommandLineLogger implements Log {
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#error(java.lang.Object, java.lang.Throwable)
+     * {@inheritDoc}
      */
     public final void error(Object message, Throwable t) {
         if (isErrorEnabled()) {
@@ -206,7 +206,7 @@ public class CommandLineLogger implements Log {
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#fatal(java.lang.Object)
+     * {@inheritDoc}
      */
     public final void fatal(Object message) {
         if (isFatalEnabled()) {
@@ -215,7 +215,7 @@ public class CommandLineLogger implements Log {
     }
 
     /**
-     * @inheritDoc org.apache.commons.logging.Log#fatal(java.lang.Object, java.lang.Throwable)
+     * {@inheritDoc}
      */
     public final void fatal(Object message, Throwable t) {
         if (isFatalEnabled()) {
diff --git a/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java b/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java
index 50bcbb5cf..5ad127021 100644
--- a/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java
+++ b/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java
@@ -52,12 +52,12 @@ public class DOMBuilderContentHandlerFactory implements ContentHandlerFactory {
         this.domImplementation = domImplementation;
     }
     
-    /** @inheritDoc org.apache.fop.util.ContentHandlerFactory#getSupportedNamespaces() */
+    /** {@inheritDoc} */
     public String[] getSupportedNamespaces() {
         return new String[] {namespaceURI};
     }
 
-    /** @inheritDoc org.apache.fop.util.ContentHandlerFactory#createContentHandler() */
+    /** {@inheritDoc} */
     public ContentHandler createContentHandler() throws SAXException {
         return new Handler();
     }
@@ -77,21 +77,21 @@ public class DOMBuilderContentHandlerFactory implements ContentHandlerFactory {
         }
         
         /**
-         * @inheritDoc org.apache.fop.util.ContentHandlerFactory.ObjectSource#getObject()
+         * {@inheritDoc}
          */
         public Object getObject() {
             return getDocument();
         }
 
         /**
-         * @inheritDoc org.apache.fop.util.ContentHandlerFactory.ObjectSource
+         * {@inheritDoc}
          */
         public void setObjectBuiltListener(ObjectBuiltListener listener) {
             this.obListener = listener;
         }
         
         /**
-         * @inheritDoc org.apache.fop.util.DelegatingContentHandler#startDocument()
+         * {@inheritDoc}
          */
         public void startDocument() throws SAXException {
             //Suppress startDocument() call if doc has not been set, yet. It will be done later.
@@ -101,7 +101,7 @@ public class DOMBuilderContentHandlerFactory implements ContentHandlerFactory {
         }
 
         /**
-         * @inheritDoc org.apache.fop.util.DelegatingContentHandler
+         * {@inheritDoc}
          */
         public void startElement(String uri, String localName, String qName, Attributes atts) 
                     throws SAXException {
@@ -125,7 +125,7 @@ public class DOMBuilderContentHandlerFactory implements ContentHandlerFactory {
         }
 
         /**
-         * @inheritDoc org.apache.fop.util.DelegatingContentHandler#endDocument()
+         * {@inheritDoc}
          */
         public void endDocument() throws SAXException {
             super.endDocument();
diff --git a/src/java/org/apache/fop/util/DataURIResolver.java b/src/java/org/apache/fop/util/DataURIResolver.java
index ec23e5187..699659f7e 100644
--- a/src/java/org/apache/fop/util/DataURIResolver.java
+++ b/src/java/org/apache/fop/util/DataURIResolver.java
@@ -38,7 +38,7 @@ import org.apache.xmlgraphics.util.io.Base64DecodeStream;
 public class DataURIResolver implements URIResolver {
 
     /**
-     * @inheritDoc javax.xml.transform.URIResolver#resolve(java.lang.String, java.lang.String)
+     * {@inheritDoc}
      */
     public Source resolve(String href, String base) throws TransformerException {
         if (href.startsWith("data:")) {
@@ -52,7 +52,7 @@ public class DataURIResolver implements URIResolver {
      * Parses inline data URIs as generated by MS Word's XML export and FO
      * stylesheet.
      * 
-     * @inheritDoc <a href="http://www.ietf.org/rfc/rfc2397">RFC 2397</a>
+     * @see <a href="http://www.ietf.org/rfc/rfc2397">RFC 2397</a>
      */
     private Source parseDataURI(String href) {
         int commaPos = href.indexOf(',');
diff --git a/src/java/org/apache/fop/util/DefaultErrorListener.java b/src/java/org/apache/fop/util/DefaultErrorListener.java
index bf2a687a3..3717d3192 100644
--- a/src/java/org/apache/fop/util/DefaultErrorListener.java
+++ b/src/java/org/apache/fop/util/DefaultErrorListener.java
@@ -41,21 +41,21 @@ public class DefaultErrorListener implements ErrorListener {
     }
     
     /**
-     * @inheritDoc javax.xml.transform.ErrorListener#warning(javax.xml.transform.TransformerException)
+     * {@inheritDoc}
      */
     public void warning(TransformerException exc) {
         log.warn(exc.toString());
     }
 
     /**
-     * @inheritDoc javax.xml.transform.ErrorListener#error(javax.xml.transform.TransformerException)
+     * {@inheritDoc}
      */
     public void error(TransformerException exc) throws TransformerException {
         throw exc;
     }
 
     /**
-     * @inheritDoc javax.xml.transform.ErrorListener#fatalError(javax.xml.transform.TransformerException)
+     * {@inheritDoc}
      */
     public void fatalError(TransformerException exc)
             throws TransformerException {
diff --git a/src/java/org/apache/fop/util/DelegatingContentHandler.java b/src/java/org/apache/fop/util/DelegatingContentHandler.java
index 4856f5052..d6c772735 100644
--- a/src/java/org/apache/fop/util/DelegatingContentHandler.java
+++ b/src/java/org/apache/fop/util/DelegatingContentHandler.java
@@ -106,7 +106,7 @@ public class DelegatingContentHandler
     // ==== EntityResolver
     
     /**
-     * @inheritDoc org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
+     * {@inheritDoc}
      */
     public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
         if (entityResolver != null) {
@@ -119,7 +119,7 @@ public class DelegatingContentHandler
     // ==== DTDHandler
 
     /**
-     * @inheritDoc org.xml.sax.DTDHandler#notationDecl(java.lang.String, java.lang.String, java.lang.String)
+     * {@inheritDoc}
      */
     public void notationDecl(String name, String publicId, String systemId) throws SAXException {
         if (dtdHandler != null) {
@@ -128,7 +128,7 @@ public class DelegatingContentHandler
     }
 
     /**
-     * @inheritDoc org.xml.sax.DTDHandler#unparsedEntityDecl(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+     * {@inheritDoc}
      */
     public void unparsedEntityDecl(String name, String publicId, String systemId, 
             String notationName) throws SAXException {
@@ -140,42 +140,42 @@ public class DelegatingContentHandler
     // ==== ContentHandler
     
     /**
-     * @inheritDoc org.xml.sax.ContentHandler#setDocumentLocator(org.xml.sax.Locator)
+     * {@inheritDoc}
      */
     public void setDocumentLocator(Locator locator) {
         delegate.setDocumentLocator(locator);
     }
 
     /**
-     * @inheritDoc org.xml.sax.ContentHandler#startDocument()
+     * {@inheritDoc}
      */
     public void startDocument() throws SAXException {
         delegate.startDocument();
     }
 
     /**
-     * @inheritDoc org.xml.sax.ContentHandler#endDocument()
+     * {@inheritDoc}
      */
     public void endDocument() throws SAXException {
         delegate.endDocument();
     }
 
     /**
-     * @inheritDoc org.xml.sax.ContentHandler#startPrefixMapping(java.lang.String, java.lang.String)
+     * {@inheritDoc}
      */
     public void startPrefixMapping(String prefix, String uri) throws SAXException {
         delegate.startPrefixMapping(prefix, uri);
     }
 
     /**
-     * @inheritDoc org.xml.sax.ContentHandler#endPrefixMapping(java.lang.String)
+     * {@inheritDoc}
      */
     public void endPrefixMapping(String prefix) throws SAXException {
         delegate.endPrefixMapping(prefix);
     }
 
     /**
-     * @inheritDoc org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
+     * {@inheritDoc}
      */
     public void startElement(String uri, String localName, String qName, 
                 Attributes atts) throws SAXException {
@@ -183,35 +183,35 @@ public class DelegatingContentHandler
     }
 
     /**
-     * @inheritDoc org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
+     * {@inheritDoc}
      */
     public void endElement(String uri, String localName, String qName) throws SAXException {
         delegate.endElement(uri, localName, qName);
     }
 
     /**
-     * @inheritDoc org.xml.sax.ContentHandler#characters(char[], int, int)
+     * {@inheritDoc}
      */
     public void characters(char[] ch, int start, int length) throws SAXException {
         delegate.characters(ch, start, length);
     }
 
     /**
-     * @inheritDoc org.xml.sax.ContentHandler#ignorableWhitespace(char[], int, int)
+     * {@inheritDoc}
      */
     public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
         delegate.ignorableWhitespace(ch, start, length);
     }
 
     /**
-     * @inheritDoc org.xml.sax.ContentHandler#processingInstruction(java.lang.String, java.lang.String)
+     * {@inheritDoc}
      */
     public void processingInstruction(String target, String data) throws SAXException {
         delegate.processingInstruction(target, data);
     }
 
     /**
-     * @inheritDoc org.xml.sax.ContentHandler#skippedEntity(java.lang.String)
+     * {@inheritDoc}
      */
     public void skippedEntity(String name) throws SAXException {
         delegate.skippedEntity(name);
@@ -220,7 +220,7 @@ public class DelegatingContentHandler
     // ==== LexicalHandler
     
     /**
-     * @inheritDoc org.xml.sax.ext.LexicalHandler#startDTD(java.lang.String, java.lang.String, java.lang.String)
+     * {@inheritDoc}
      */
     public void startDTD(String name, String publicId, String systemId) throws SAXException {
         if (lexicalHandler != null) {
@@ -230,7 +230,7 @@ public class DelegatingContentHandler
     }
 
     /**
-     * @inheritDoc org.xml.sax.ext.LexicalHandler#endDTD()
+     * {@inheritDoc}
      */
     public void endDTD() throws SAXException {
         if (lexicalHandler != null) {
@@ -239,7 +239,7 @@ public class DelegatingContentHandler
     }
 
     /**
-     * @inheritDoc org.xml.sax.ext.LexicalHandler#startEntity(java.lang.String)
+     * {@inheritDoc}
      */
     public void startEntity(String name) throws SAXException {
         if (lexicalHandler != null) {
@@ -248,7 +248,7 @@ public class DelegatingContentHandler
     }
 
     /**
-     * @inheritDoc org.xml.sax.ext.LexicalHandler#endEntity(java.lang.String)
+     * {@inheritDoc}
      */
     public void endEntity(String name) throws SAXException {
         if (lexicalHandler != null) {
@@ -257,7 +257,7 @@ public class DelegatingContentHandler
     }
 
     /**
-     * @inheritDoc org.xml.sax.ext.LexicalHandler#startCDATA()
+     * {@inheritDoc}
      */
     public void startCDATA() throws SAXException {
         if (lexicalHandler != null) {
@@ -266,7 +266,7 @@ public class DelegatingContentHandler
     }
 
     /**
-     * @inheritDoc org.xml.sax.ext.LexicalHandler#endCDATA()
+     * {@inheritDoc}
      */
     public void endCDATA() throws SAXException {
         if (lexicalHandler != null) {
@@ -275,7 +275,7 @@ public class DelegatingContentHandler
     }
 
     /**
-     * @inheritDoc org.xml.sax.ext.LexicalHandler#comment(char[], int, int)
+     * {@inheritDoc} int, int)
      */
     public void comment(char[] ch, int start, int length) throws SAXException {
         if (lexicalHandler != null) {
@@ -286,7 +286,7 @@ public class DelegatingContentHandler
     // ==== ErrorHandler
 
     /**
-     * @inheritDoc org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
+     * {@inheritDoc}
      */
     public void warning(SAXParseException exception) throws SAXException {
         if (errorHandler != null) {
@@ -295,7 +295,7 @@ public class DelegatingContentHandler
     }
 
     /**
-     * @inheritDoc org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
+     * {@inheritDoc}
      */
     public void error(SAXParseException exception) throws SAXException {
         if (errorHandler != null) {
@@ -304,7 +304,7 @@ public class DelegatingContentHandler
     }
 
     /**
-     * @inheritDoc org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
+     * {@inheritDoc}
      */
     public void fatalError(SAXParseException exception) throws SAXException {
         if (errorHandler != null) {
diff --git a/src/java/org/apache/fop/util/QName.java b/src/java/org/apache/fop/util/QName.java
index d7247223e..0794d3088 100644
--- a/src/java/org/apache/fop/util/QName.java
+++ b/src/java/org/apache/fop/util/QName.java
@@ -99,12 +99,12 @@ public class QName implements Serializable {
         return getPrefix() != null ? getPrefix() + ':' + getLocalName() : getLocalName();

     }

 

-    /** @inheritDoc java.lang.Object#hashCode() */

+    /** {@inheritDoc} */

     public int hashCode() {

         return this.hashCode;

     }

 

-    /** @inheritDoc java.lang.Object#equals(java.lang.Object) */

+    /** {@inheritDoc} */

     public boolean equals(Object obj) {

         if (obj == null) {

             return false;

@@ -122,7 +122,7 @@ public class QName implements Serializable {
         return false;

     }

 

-    /** @inheritDoc java.lang.Object#toString() */

+    /** {@inheritDoc} */

     public String toString() {

         return prefix != null

                 ? (prefix + ":" + localName)

diff --git a/src/java/org/apache/fop/util/WriterOutputStream.java b/src/java/org/apache/fop/util/WriterOutputStream.java
index 0cbebef17..d399b60dc 100644
--- a/src/java/org/apache/fop/util/WriterOutputStream.java
+++ b/src/java/org/apache/fop/util/WriterOutputStream.java
@@ -50,21 +50,21 @@ public class WriterOutputStream extends OutputStream {
     }
 
     /**
-     * @inheritDoc java.io.OutputStream#close()
+     * {@inheritDoc}
      */
     public void close() throws IOException {
         writer.close();
     }
 
     /**
-     * @inheritDoc java.io.OutputStream#flush()
+     * {@inheritDoc}
      */
     public void flush() throws IOException {
         writer.flush();
     }
 
     /**
-     * @inheritDoc java.io.OutputStream#write(byte[], int, int)
+     * {@inheritDoc}
      */
     public void write(byte[] buf, int offset, int length) throws IOException {
         if (encoding != null) {
@@ -75,14 +75,14 @@ public class WriterOutputStream extends OutputStream {
     }
 
     /**
-     * @inheritDoc java.io.OutputStream#write(byte[])
+     * {@inheritDoc}
      */
     public void write(byte[] buf) throws IOException {
         write(buf, 0, buf.length);
     }
 
     /**
-     * @inheritDoc java.io.OutputStream#write(int)
+     * {@inheritDoc}
      */
     public void write(int b) throws IOException {
         write(new byte[] {(byte)b});