XGC-90 Javadocs fails on Java 8
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/commons/trunk@1598621 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java b/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java
index d4f49ea..8619650 100644
--- a/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java
+++ b/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java
@@ -208,7 +208,7 @@
* </pre>
*
* where <code>gamma_from_file</code> is the gamma of the file
- * data, as determined by the <code>gAMA</code>, </code>sRGB</code>,
+ * data, as determined by the <code>gAMA</code>, <code>sRGB</code>,
* and/or <code>iCCP</code> chunks, and <code>display_exponent</code>
* is the exponent of the intrinsic transfer curve of the display,
* generally 2.2.
@@ -261,7 +261,7 @@
* </pre>
*
* where <code>gamma_from_file</code> is the gamma of the file
- * data, as determined by the <code>gAMA</code>, </code>sRGB</code>,
+ * data, as determined by the <code>gAMA</code>, <code>sRGB</code>,
* and/or <code>iCCP</code> chunks, and <code>user_exponent</code>
* is an additional user-supplied parameter.
*
diff --git a/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java b/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java
index 5e79eed..676f935 100644
--- a/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java
+++ b/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java
@@ -1348,9 +1348,9 @@
* could be implemented (non-optimally) as follows:
*
* <pre>
- * for (int i = bytesPerPixel; i < bytesPerRow + bytesPerPixel; i++) {
- * int curr = currRow[i] & 0xff;
- * int left = currRow[i - bytesPerPixel] & 0xff;
+ * for (int i = bytesPerPixel; i < bytesPerRow + bytesPerPixel; i++) {
+ * int curr = currRow[i] & 0xff;
+ * int left = currRow[i - bytesPerPixel] & 0xff;
* scratchRow[PNG_FILTER_SUB][i] = (byte)(curr - left);
* }
* return PNG_FILTER_SUB;
diff --git a/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java b/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java
index f113745..6c3ef7c 100644
--- a/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java
+++ b/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java
@@ -42,8 +42,8 @@
* <code>
* byte b;
* short s;
- * s = s & 0xffff;
- * b = (byte)((s >> 8) & 0xff);
+ * s = s & 0xffff;
+ * b = (byte)((s >> 8) & 0xff);
* </code>
* If a different algorithm is to be used for the dithering, this class
* should be subclassed and an appropriate implementation should be
@@ -56,7 +56,7 @@
* <code>
* byte b;
* short s;
- * b = (byte)((s + Short.MIN_VALUE) >> 8);
+ * b = (byte)((s + Short.MIN_VALUE) >> 8);
* </code>
* In order to use a different algorithm for the dithering, this class
* should be subclassed and the method overridden.
diff --git a/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java b/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java
index b5f49b7..a87d1e9 100644
--- a/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java
+++ b/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java
@@ -99,7 +99,7 @@
* unsigned datatype, long is used. The mapping between types is
* as follows:
*
- * <table border=1>
+ * <table border=1 summary="TIFF">
* <tr>
* <th> TIFF type </th> <th> Java type </th>
* <tr>
diff --git a/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java b/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java
index 793f4d6..d5d3b86 100644
--- a/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java
+++ b/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java
@@ -137,16 +137,16 @@
}
/**
- * Returns a Map<ImageKey, Integer> with the number of cache hits.
- * @return a Map<ImageKey, Integer> with the number of cache hits
+ * Returns a Map<ImageKey, Integer> with the number of cache hits.
+ * @return a Map<ImageKey, Integer> with the number of cache hits
*/
public Map getImageCacheHitMap() {
return Collections.unmodifiableMap(imageCacheHitMap);
}
/**
- * Returns a Map<ImageKey, Integer> with the number of cache misses.
- * @return a Map<ImageKey, Integer> with the number of cache misses
+ * Returns a Map<ImageKey, Integer> with the number of cache misses.
+ * @return a Map<ImageKey, Integer> with the number of cache misses
*/
public Map getImageCacheMissMap() {
return Collections.unmodifiableMap(imageCacheMissMap);
diff --git a/src/java/org/apache/xmlgraphics/image/loader/spi/ImageImplRegistry.java b/src/java/org/apache/xmlgraphics/image/loader/spi/ImageImplRegistry.java
index 6fae183..dc7afa8 100644
--- a/src/java/org/apache/xmlgraphics/image/loader/spi/ImageImplRegistry.java
+++ b/src/java/org/apache/xmlgraphics/image/loader/spi/ImageImplRegistry.java
@@ -82,7 +82,6 @@
/**
* Main constructor.
- * @see #getDefaultInstance()
*/
public ImageImplRegistry() {
this(true);
@@ -223,7 +222,7 @@
/**
* Returns the Collection of registered ImageConverter instances.
- * @return a Collection<ImageConverter>
+ * @return a Collection<ImageConverter>
*/
public Collection getImageConverters() {
return Collections.unmodifiableList(this.converters);
diff --git a/src/java/org/apache/xmlgraphics/io/ResourceResolver.java b/src/java/org/apache/xmlgraphics/io/ResourceResolver.java
index bbe5107..e02479b 100644
--- a/src/java/org/apache/xmlgraphics/io/ResourceResolver.java
+++ b/src/java/org/apache/xmlgraphics/io/ResourceResolver.java
@@ -26,7 +26,7 @@
/**
* Implementations of this resource resolver allow XGC users to control the URI resolution
* mechanism. All resource and output stream acquisition goes through this when its implementation
- * is given to the {@link org.apache.fop.apps.EnvironmentProfile}.
+ * is given to the org.apache.fop.apps.EnvironmentProfile.
*/
public interface ResourceResolver {
diff --git a/src/java/org/apache/xmlgraphics/java2d/GenericGraphicsDevice.java b/src/java/org/apache/xmlgraphics/java2d/GenericGraphicsDevice.java
index 739eca6..8baaea2 100644
--- a/src/java/org/apache/xmlgraphics/java2d/GenericGraphicsDevice.java
+++ b/src/java/org/apache/xmlgraphics/java2d/GenericGraphicsDevice.java
@@ -37,7 +37,7 @@
/**
* Create a new graphics2D device.
*
- * @param The gc we should reference
+ * @param gc we should reference
*/
public GenericGraphicsDevice(GraphicsConfiguration gc) {
this.gc = gc;
diff --git a/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java b/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java
index 6ff0c60..66bf7c8 100644
--- a/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java
+++ b/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java
@@ -20,7 +20,7 @@
package org.apache.xmlgraphics.java2d.color;
/**
- * Interface used to decorate {@link java.awt.color.ColorSpaces} subclasses
+ * Interface used to decorate java.awt.color.ColorSpaces subclasses
* to report the origin of the associated color profile.
*/
public interface ColorSpaceOrigin {
diff --git a/src/java/org/apache/xmlgraphics/ps/PSGenerator.java b/src/java/org/apache/xmlgraphics/ps/PSGenerator.java
index 350acc0..6aef119 100644
--- a/src/java/org/apache/xmlgraphics/ps/PSGenerator.java
+++ b/src/java/org/apache/xmlgraphics/ps/PSGenerator.java
@@ -348,7 +348,7 @@
}
/**
- * Converts a <real> value for use in DSC comments.
+ * Converts a <real> value for use in DSC comments.
* @param value the value to convert
* @return String The resulting String
*/
@@ -863,7 +863,7 @@
* Returns the PSResource instance corresponding to the CIDInit ProcSet
* resource.
*
- * @return the <q>ProcSet CIDInit</q> resource
+ * @return the ProcSet CIDInit resource
*/
public PSResource getProcsetCIDInitResource() {
if (procsetCIDInitResource == null) {
diff --git a/src/java/org/apache/xmlgraphics/ps/PSProcSet.java b/src/java/org/apache/xmlgraphics/ps/PSProcSet.java
index 9167b4f..23d566b 100644
--- a/src/java/org/apache/xmlgraphics/ps/PSProcSet.java
+++ b/src/java/org/apache/xmlgraphics/ps/PSProcSet.java
@@ -57,7 +57,7 @@
return revision;
}
- /** @return the <resource> specification as defined in DSC v3.0 spec. */
+ /** @return the <resource> specification as defined in DSC v3.0 spec. */
public String getResourceSpecification() {
StringBuffer sb = new StringBuffer();
sb.append(getType()).append(" ").append(PSGenerator.convertStringToDSC(getName()));
diff --git a/src/java/org/apache/xmlgraphics/ps/PSResource.java b/src/java/org/apache/xmlgraphics/ps/PSResource.java
index 153dd11..de8a4d4 100644
--- a/src/java/org/apache/xmlgraphics/ps/PSResource.java
+++ b/src/java/org/apache/xmlgraphics/ps/PSResource.java
@@ -64,7 +64,7 @@
return this.name;
}
- /** @return the <resource> specification as defined in DSC v3.0 spec. */
+ /** @return the <resource> specification as defined in DSC v3.0 spec. */
public String getResourceSpecification() {
StringBuffer sb = new StringBuffer();
sb.append(getType()).append(" ").append(PSGenerator.convertStringToDSC(getName()));
diff --git a/src/java/org/apache/xmlgraphics/util/Service.java b/src/java/org/apache/xmlgraphics/util/Service.java
index fd6d714..819d562 100644
--- a/src/java/org/apache/xmlgraphics/util/Service.java
+++ b/src/java/org/apache/xmlgraphics/util/Service.java
@@ -36,7 +36,7 @@
* This class handles looking up service providers on the class path.
* It implements the system described in:
*
- * <a href='http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#Service Provider'>JAR
+ * <a href='http://docs.oracle.com/javase/6/docs/technotes/guides/jar/jar.html#Service%20Provider'>JAR
* File Specification Under Service Provider</a>. Note that this
* interface is very similar to the one they describe which seems to
* be missing in the JDK.
@@ -131,7 +131,7 @@
*
* @param cls The class/interface to search for providers of.
* @param returnInstances true if the iterator should return instances rather than class names.
- * @deprecated use the type-safe methods providers(Class<?>) or providerNames(Class<?>) instead.
+ * @deprecated use the type-safe methods providers(Class) or providerNames(Class) instead.
*/
public static Iterator<?> providers(Class<?> cls, boolean returnInstances) {
return (returnInstances ? providers(cls) : providerNames(cls));
diff --git a/src/java/org/apache/xmlgraphics/util/i18n/LocalizableSupport.java b/src/java/org/apache/xmlgraphics/util/i18n/LocalizableSupport.java
index 1951702..a0cd76e 100644
--- a/src/java/org/apache/xmlgraphics/util/i18n/LocalizableSupport.java
+++ b/src/java/org/apache/xmlgraphics/util/i18n/LocalizableSupport.java
@@ -58,7 +58,7 @@
* <li>
* if a Locale has been set by a call to setLocale(), use this Locale,
* else,
- * <li/>
+ * </li>
* <li>
* if a Locale has been set by a call to the setDefaultLocale() method
* of a LocalizableSupport object in the current LocaleGroup, use this
@@ -67,7 +67,7 @@
* <li>
* use the object returned by Locale.getDefault() (and set by
* Locale.setDefault()).
- * <li/>
+ * </li>
* </ul>
* This offers the possibility to have a different Locale for each object,
* a Locale for a group of object and/or a Locale for the JVM instance.
