You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ss...@apache.org on 2014/05/30 16:55:01 UTC

svn commit: r1598621 - in /xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics: image/codec/png/ image/codec/tiff/ image/loader/cache/ image/loader/spi/ io/ java2d/ java2d/color/ ps/ util/ util/i18n/

Author: ssteiner
Date: Fri May 30 14:55:00 2014
New Revision: 1598621

URL: http://svn.apache.org/r1598621
Log:
XGC-90 Javadocs fails on Java 8

Modified:
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/spi/ImageImplRegistry.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/io/ResourceResolver.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GenericGraphicsDevice.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSGenerator.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSProcSet.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSResource.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/Service.java
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/i18n/LocalizableSupport.java

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGDecodeParam.java Fri May 30 14:55:00 2014
@@ -208,7 +208,7 @@ public class PNGDecodeParam implements I
      * </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 @@ public class PNGDecodeParam implements I
      * </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.
      *

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/png/PNGEncodeParam.java Fri May 30 14:55:00 2014
@@ -1348,9 +1348,9 @@ public abstract class PNGEncodeParam imp
      * 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 &lt; bytesPerRow + bytesPerPixel; i++) {
+     *     int curr = currRow[i] &amp; 0xff;
+     *     int left = currRow[i - bytesPerPixel] &amp; 0xff;
      *     scratchRow[PNG_FILTER_SUB][i] = (byte)(curr - left);
      * }
      * return PNG_FILTER_SUB;

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFDecodeParam.java Fri May 30 14:55:00 2014
@@ -42,8 +42,8 @@ import  org.apache.xmlgraphics.image.cod
  * <code>
  *       byte b;
  *       short s;
- *       s = s & 0xffff;
- *       b = (byte)((s >> 8) & 0xff);
+ *       s = s &amp; 0xffff;
+ *       b = (byte)((s &gt;&gt; 8) &amp; 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 @@ import  org.apache.xmlgraphics.image.cod
  * <code>
  *       byte b;
  *       short s;
- *       b = (byte)((s + Short.MIN_VALUE) >> 8);
+ *       b = (byte)((s + Short.MIN_VALUE) &gt;&gt; 8);
  * </code>
  * In order to use a different algorithm for the dithering, this class
  * should be subclassed and the method overridden.

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java Fri May 30 14:55:00 2014
@@ -99,7 +99,7 @@ public class TIFFField implements Compar
      * 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>

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java Fri May 30 14:55:00 2014
@@ -137,16 +137,16 @@ public class ImageCacheStatistics implem
     }
 
     /**
-     * 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&lt;ImageKey, Integer&gt; with the number of cache hits.
+     * @return a Map&lt;ImageKey, Integer&gt; 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&lt;ImageKey, Integer&gt; with the number of cache misses.
+     * @return a Map&lt;ImageKey, Integer&gt; with the number of cache misses
      */
     public Map getImageCacheMissMap() {
         return Collections.unmodifiableMap(imageCacheMissMap);

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/spi/ImageImplRegistry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/spi/ImageImplRegistry.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/spi/ImageImplRegistry.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/spi/ImageImplRegistry.java Fri May 30 14:55:00 2014
@@ -82,7 +82,6 @@ public class ImageImplRegistry {
 
     /**
      * Main constructor.
-     * @see #getDefaultInstance()
      */
     public ImageImplRegistry() {
         this(true);
@@ -223,7 +222,7 @@ public class ImageImplRegistry {
 
     /**
      * Returns the Collection of registered ImageConverter instances.
-     * @return a Collection<ImageConverter>
+     * @return a Collection&lt;ImageConverter&gt;
      */
     public Collection getImageConverters() {
         return Collections.unmodifiableList(this.converters);

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/io/ResourceResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/io/ResourceResolver.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/io/ResourceResolver.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/io/ResourceResolver.java Fri May 30 14:55:00 2014
@@ -26,7 +26,7 @@ import java.net.URI;
 /**
  * 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 {
 

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GenericGraphicsDevice.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GenericGraphicsDevice.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GenericGraphicsDevice.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GenericGraphicsDevice.java Fri May 30 14:55:00 2014
@@ -37,7 +37,7 @@ public class GenericGraphicsDevice exten
     /**
      * Create a new graphics2D device.
      *
-     * @param The gc we should reference
+     * @param gc we should reference
      */
     public GenericGraphicsDevice(GraphicsConfiguration gc) {
         this.gc = gc;

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/color/ColorSpaceOrigin.java Fri May 30 14:55:00 2014
@@ -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 {

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSGenerator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSGenerator.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSGenerator.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSGenerator.java Fri May 30 14:55:00 2014
@@ -348,7 +348,7 @@ public class PSGenerator implements PSCo
     }
 
     /**
-     * Converts a <real> value for use in DSC comments.
+     * Converts a &lt;real&gt; value for use in DSC comments.
      * @param value the value to convert
      * @return String The resulting String
      */
@@ -863,7 +863,7 @@ public class PSGenerator implements PSCo
      * 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) {

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSProcSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSProcSet.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSProcSet.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSProcSet.java Fri May 30 14:55:00 2014
@@ -57,7 +57,7 @@ public class PSProcSet extends PSResourc
         return revision;
     }
 
-    /** @return the <resource> specification as defined in DSC v3.0 spec. */
+    /** @return the &lt;resource&gt; specification as defined in DSC v3.0 spec. */
     public String getResourceSpecification() {
         StringBuffer sb = new StringBuffer();
         sb.append(getType()).append(" ").append(PSGenerator.convertStringToDSC(getName()));

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSResource.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSResource.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSResource.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSResource.java Fri May 30 14:55:00 2014
@@ -64,7 +64,7 @@ public class PSResource implements Compa
         return this.name;
     }
 
-    /** @return the <resource> specification as defined in DSC v3.0 spec. */
+    /** @return the &lt;resource&gt; specification as defined in DSC v3.0 spec. */
     public String getResourceSpecification() {
         StringBuffer sb = new StringBuffer();
         sb.append(getType()).append(" ").append(PSGenerator.convertStringToDSC(getName()));

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/Service.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/Service.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/Service.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/Service.java Fri May 30 14:55:00 2014
@@ -36,7 +36,7 @@ import org.apache.commons.io.IOUtils;
  * 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 @@ public final class Service {
      *
      * @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));

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/i18n/LocalizableSupport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/i18n/LocalizableSupport.java?rev=1598621&r1=1598620&r2=1598621&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/i18n/LocalizableSupport.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/i18n/LocalizableSupport.java Fri May 30 14:55:00 2014
@@ -58,7 +58,7 @@ import java.util.ResourceBundle;
  *   <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 @@ import java.util.ResourceBundle;
  *   <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.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org