stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8149593: Change <code>foo</code> to {@code foo} in TIFF plugin classes

Browse Source 
Change <code>foo</code> to {@code foo} in TIFF plugin classes and 2015 to 2016 where needed.

Reviewed-by: prr, darcy
This commit is contained in:
Brian Burkhalter 2016-02-11 13:42:53 -08:00
parent 5b56cd34c1
commit 3e6267d50c
33 changed files with 743 additions and 743 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFBaseJPEGCompressor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -86,16 +86,16 @@ public abstract class TIFFBaseJPEGCompressor extends TIFFCompressor {
/** /**
* Whether to write abbreviated JPEG streams (default == false). * Whether to write abbreviated JPEG streams (default == false).
* A subclass which sets this to <code>true</code> should also * A subclass which sets this to {@code true} should also
* initialized {@link #JPEGStreamMetadata}. * initialized {@link #JPEGStreamMetadata}.
*/ */
protected boolean writeAbbreviatedStream = false; protected boolean writeAbbreviatedStream = false;
/** /**
* Stream metadata equivalent to a tables-only stream such as in * Stream metadata equivalent to a tables-only stream such as in
* the <code>JPEGTables</code>. Default value is <code>null</code>. * the {@code JPEGTables}. Default value is {@code null}.
* This should be set by any subclass which sets * This should be set by any subclass which sets
* {@link writeAbbreviatedStream} to <code>true</code>. * {@link writeAbbreviatedStream} to {@code true}.
*/ */
protected IIOMetadata JPEGStreamMetadata = null; protected IIOMetadata JPEGStreamMetadata = null;
@ -108,15 +108,15 @@ public abstract class TIFFBaseJPEGCompressor extends TIFFCompressor {
/** /**
* Removes nonessential nodes from a JPEG native image metadata tree. * Removes nonessential nodes from a JPEG native image metadata tree.
* All nodes derived from JPEG marker segments other than DHT, DQT, * All nodes derived from JPEG marker segments other than DHT, DQT,
* SOF, SOS segments are removed unless <code>pruneTables</code> is * SOF, SOS segments are removed unless {@code pruneTables} is
* <code>true</code> in which case the nodes derived from the DHT and * {@code true} in which case the nodes derived from the DHT and
* DQT marker segments are also removed. * DQT marker segments are also removed.
* *
* @param tree A <tt>javax_imageio_jpeg_image_1.0</tt> tree. * @param tree A <tt>javax_imageio_jpeg_image_1.0</tt> tree.
* @param pruneTables Whether to prune Huffman and quantization tables. * @param pruneTables Whether to prune Huffman and quantization tables.
* @throws NullPointerException if <code>tree</code> is * @throws NullPointerException if {@code tree} is
* <code>null</code>. * {@code null}.
* @throws IllegalArgumentException if <code>tree</code> is not the root * @throws IllegalArgumentException if {@code tree} is not the root
* of a JPEG native image metadata tree. * of a JPEG native image metadata tree.
*/ */
private static void pruneNodes(Node tree, boolean pruneTables) { private static void pruneNodes(Node tree, boolean pruneTables) {
@ -182,8 +182,8 @@ public abstract class TIFFBaseJPEGCompressor extends TIFFCompressor {
} }
/** /**
* A <code>ByteArrayOutputStream</code> which allows writing to an * A {@code ByteArrayOutputStream} which allows writing to an
* <code>ImageOutputStream</code>. * {@code ImageOutputStream}.
*/ */
private static class IIOByteArrayOutputStream extends ByteArrayOutputStream { private static class IIOByteArrayOutputStream extends ByteArrayOutputStream {
IIOByteArrayOutputStream() { IIOByteArrayOutputStream() {

24
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFColorConverter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -31,39 +31,39 @@ package com.sun.imageio.plugins.tiff;
public abstract class TIFFColorConverter { public abstract class TIFFColorConverter {
/** /**
* Constructs an instance of a <code>TIFFColorConverter</code>. * Constructs an instance of a {@code TIFFColorConverter}.
*/ */
public TIFFColorConverter() {} public TIFFColorConverter() {}
/** /**
* Converts an RGB triple into the native color space of this * Converts an RGB triple into the native color space of this
* TIFFColorConverter, and stores the result in the first three * TIFFColorConverter, and stores the result in the first three
* entries of the <code>result</code> array. * entries of the {@code result} array.
* *
* @param r the red value. * @param r the red value.
* @param g the green value. * @param g the green value.
* @param b the blue value. * @param b the blue value.
* @param result an array of <code>float</code>s containing three elements. * @param result an array of {@code float}s containing three elements.
* @throws NullPointerException if <code>result</code> is * @throws NullPointerException if {@code result} is
* <code>null</code>. * {@code null}.
* @throws ArrayIndexOutOfBoundsException if * @throws ArrayIndexOutOfBoundsException if
* <code>result.length&nbsp;&lt;&nbsp;3</code>. * {@code result.length&nbsp;&lt;&nbsp;3}.
*/ */
public abstract void fromRGB(float r, float g, float b, float[] result); public abstract void fromRGB(float r, float g, float b, float[] result);
/** /**
* Converts a triple in the native color space of this * Converts a triple in the native color space of this
* TIFFColorConverter into an RGB triple, and stores the result in * TIFFColorConverter into an RGB triple, and stores the result in
* the first three entries of the <code>rgb</code> array. * the first three entries of the {@code rgb} array.
* *
* @param x0 the value of channel 0. * @param x0 the value of channel 0.
* @param x1 the value of channel 1. * @param x1 the value of channel 1.
* @param x2 the value of channel 2. * @param x2 the value of channel 2.
* @param rgb an array of <code>float</code>s containing three elements. * @param rgb an array of {@code float}s containing three elements.
* @throws NullPointerException if <code>rgb</code> is * @throws NullPointerException if {@code rgb} is
* <code>null</code>. * {@code null}.
* @throws ArrayIndexOutOfBoundsException if * @throws ArrayIndexOutOfBoundsException if
* <code>rgb.length&nbsp;&lt;&nbsp;3</code>. * {@code rgb.length&nbsp;&lt;&nbsp;3}.
*/ */
public abstract void toRGB(float x0, float x1, float x2, float[] rgb); public abstract void toRGB(float x0, float x1, float x2, float[] rgb);
} }

64
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFCompressor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -35,13 +35,13 @@ import javax.imageio.stream.ImageOutputStream;
public abstract class TIFFCompressor { public abstract class TIFFCompressor {
/** /**
* The <code>ImageWriter</code> calling this * The {@code ImageWriter} calling this
* <code>TIFFCompressor</code>. * {@code TIFFCompressor}.
*/ */
protected ImageWriter writer; protected ImageWriter writer;
/** /**
* The <code>IIOMetadata</code> object containing metadata for the * The {@code IIOMetadata} object containing metadata for the
* current image. * current image.
*/ */
protected IIOMetadata metadata; protected IIOMetadata metadata;
@ -63,7 +63,7 @@ public abstract class TIFFCompressor {
protected boolean isCompressionLossless; protected boolean isCompressionLossless;
/** /**
* The <code>ImageOutputStream</code> to be written. * The {@code ImageOutputStream} to be written.
*/ */
protected ImageOutputStream stream; protected ImageOutputStream stream;
@ -75,26 +75,26 @@ public abstract class TIFFCompressor {
* to provide the implementation of the compression algorithm of an * to provide the implementation of the compression algorithm of an
* unsupported compression type. * unsupported compression type.
* *
* <p>The parameters <code>compressionTagValue</code> and * <p>The parameters {@code compressionTagValue} and
* <code>isCompressionLossless</code> are provided to accomodate * {@code isCompressionLossless} are provided to accomodate
* compression types which are unknown. A compression type is * compression types which are unknown. A compression type is
* "known" if it is either among those already supported by the * "known" if it is either among those already supported by the
* TIFF writer (see {@link TIFFImageWriteParam}), or is listed in * TIFF writer (see {@link TIFFImageWriteParam}), or is listed in
* the TIFF 6.0 specification but not supported. If the compression * the TIFF 6.0 specification but not supported. If the compression
* type is unknown, the <code>compressionTagValue</code> and * type is unknown, the {@code compressionTagValue} and
* <code>isCompressionLossless</code> parameters are ignored.</p> * {@code isCompressionLossless} parameters are ignored.</p>
* *
* @param compressionType The name of the compression type. * @param compressionType The name of the compression type.
* @param compressionTagValue The value to be assigned to the TIFF * @param compressionTagValue The value to be assigned to the TIFF
* <i>Compression</i> tag in the TIFF image metadata; ignored if * <i>Compression</i> tag in the TIFF image metadata; ignored if
* <code>compressionType</code> is a known type. * {@code compressionType} is a known type.
* @param isCompressionLossless Whether the compression is lossless; * @param isCompressionLossless Whether the compression is lossless;
* ignored if <code>compressionType</code> is a known type. * ignored if {@code compressionType} is a known type.
* *
* @throws NullPointerException if <code>compressionType</code> is * @throws NullPointerException if {@code compressionType} is
* <code>null</code>. * {@code null}.
* @throws IllegalArgumentException if <code>compressionTagValue</code> is * @throws IllegalArgumentException if {@code compressionTagValue} is
* less <code>1</code>. * less {@code 1}.
*/ */
public TIFFCompressor(String compressionType, public TIFFCompressor(String compressionType,
int compressionTagValue, int compressionTagValue,
@ -163,9 +163,9 @@ public abstract class TIFFCompressor {
} }
/** /**
* Sets the <code>ImageOutputStream</code> to be written. * Sets the {@code ImageOutputStream} to be written.
* *
* @param stream an <code>ImageOutputStream</code> to be written. * @param stream an {@code ImageOutputStream} to be written.
* *
* @see #getStream * @see #getStream
*/ */
@ -174,9 +174,9 @@ public abstract class TIFFCompressor {
} }
/** /**
* Returns the <code>ImageOutputStream</code> that will be written. * Returns the {@code ImageOutputStream} that will be written.
* *
* @return an <code>ImageOutputStream</code>. * @return an {@code ImageOutputStream}.
* *
* @see #setStream(ImageOutputStream) * @see #setStream(ImageOutputStream)
*/ */
@ -185,9 +185,9 @@ public abstract class TIFFCompressor {
} }
/** /**
* Sets the value of the <code>writer</code> field. * Sets the value of the {@code writer} field.
* *
* @param writer the current <code>ImageWriter</code>. * @param writer the current {@code ImageWriter}.
* *
* @see #getWriter() * @see #getWriter()
*/ */
@ -196,9 +196,9 @@ public abstract class TIFFCompressor {
} }
/** /**
* Returns the current <code>ImageWriter</code>. * Returns the current {@code ImageWriter}.
* *
* @return an <code>ImageWriter</code>. * @return an {@code ImageWriter}.
* *
* @see #setWriter(ImageWriter) * @see #setWriter(ImageWriter)
*/ */
@ -207,9 +207,9 @@ public abstract class TIFFCompressor {
} }
/** /**
* Sets the value of the <code>metadata</code> field. * Sets the value of the {@code metadata} field.
* *
* @param metadata the <code>IIOMetadata</code> object for the * @param metadata the {@code IIOMetadata} object for the
* image being written. * image being written.
* *
* @see #getMetadata() * @see #getMetadata()
@ -219,9 +219,9 @@ public abstract class TIFFCompressor {
} }
/** /**
* Returns the current <code>IIOMetadata</code> object. * Returns the current {@code IIOMetadata} object.
* *
* @return the <code>IIOMetadata</code> object for the image being * @return the {@code IIOMetadata} object for the image being
* written. * written.
* *
* @see #setMetadata(IIOMetadata) * @see #setMetadata(IIOMetadata)
@ -232,15 +232,15 @@ public abstract class TIFFCompressor {
/** /**
* Encodes the supplied image data, writing to the currently set * Encodes the supplied image data, writing to the currently set
* <code>ImageOutputStream</code>. * {@code ImageOutputStream}.
* *
* @param b an array of <code>byte</code>s containing the packed * @param b an array of {@code byte}s containing the packed
* but uncompressed image data. * but uncompressed image data.
* @param off the starting offset of the data to be written in the * @param off the starting offset of the data to be written in the
* array <code>b</code>. * array {@code b}.
* @param width the width of the rectangle of pixels to be written. * @param width the width of the rectangle of pixels to be written.
* @param height the height of the rectangle of pixels to be written. * @param height the height of the rectangle of pixels to be written.
* @param bitsPerSample an array of <code>int</code>s indicting * @param bitsPerSample an array of {@code int}s indicting
* the number of bits used to represent each image sample within * the number of bits used to represent each image sample within
* a pixel. * a pixel.
* @param scanlineStride the number of bytes separating each * @param scanlineStride the number of bytes separating each
@ -249,7 +249,7 @@ public abstract class TIFFCompressor {
* @return the number of bytes written. * @return the number of bytes written.
* *
* @throws IOException if the supplied data cannot be encoded by * @throws IOException if the supplied data cannot be encoded by
* this <code>TIFFCompressor</code>, or if any I/O error occurs * this {@code TIFFCompressor}, or if any I/O error occurs
* during writing. * during writing.
*/ */
public abstract int encode(byte[] b, int off, public abstract int encode(byte[] b, int off,

504
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDecompressor.java
View File

File diff suppressed because it is too large Load Diff

4
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFExifJPEGCompressor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -29,7 +29,7 @@ import javax.imageio.metadata.IIOMetadata;
import javax.imageio.plugins.tiff.BaselineTIFFTagSet; import javax.imageio.plugins.tiff.BaselineTIFFTagSet;
/** /**
* A <code>TIFFCompressor</code> for the JPEG variant of Exif. * A {@code TIFFCompressor} for the JPEG variant of Exif.
*/ */
public class TIFFExifJPEGCompressor extends TIFFBaseJPEGCompressor { public class TIFFExifJPEGCompressor extends TIFFBaseJPEGCompressor {
public TIFFExifJPEGCompressor(ImageWriteParam param) { public TIFFExifJPEGCompressor(ImageWriteParam param) {

10
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxCompressor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -232,12 +232,12 @@ abstract class TIFFFaxCompressor extends TIFFCompressor {
} }
/** /**
* Sets the value of the <code>metadata</code> field. * Sets the value of the {@code metadata} field.
* *
* <p> The implementation in this class also sets local options * <p> The implementation in this class also sets local options
* from the FILL_ORDER field if it exists.</p> * from the FILL_ORDER field if it exists.</p>
* *
* @param metadata the <code>IIOMetadata</code> object for the * @param metadata the {@code IIOMetadata} object for the
* image being written. * image being written.
* *
* @see #getMetadata() * @see #getMetadata()
@ -253,8 +253,8 @@ abstract class TIFFFaxCompressor extends TIFFCompressor {
} }
/** /**
* Return min of <code>maxOffset</code> or offset of first pixel * Return min of {@code maxOffset} or offset of first pixel
* different from pixel at <code>bitOffset</code>. * different from pixel at {@code bitOffset}.
*/ */
public int nextState(byte[] data, public int nextState(byte[] data,
int base, int base,

2
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFieldNode.java
View File

@ -34,7 +34,7 @@ import javax.imageio.plugins.tiff.TIFFTag;
import javax.imageio.plugins.tiff.TIFFTagSet; import javax.imageio.plugins.tiff.TIFFTagSet;
/** /**
* The <code>Node</code> representation of a <code>TIFFField</code> * The {@code Node} representation of a {@code TIFFField}
* wherein the child node is procedural rather than buffered. * wherein the child node is procedural rather than buffered.
*/ */
public class TIFFFieldNode extends IIOMetadataNode { public class TIFFFieldNode extends IIOMetadataNode {

10
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -153,7 +153,7 @@ public class TIFFIFD extends TIFFDirectory {
} }
/** /**
* Returns an <code>Iterator</code> over the TIFF fields. The * Returns an {@code Iterator} over the TIFF fields. The
* traversal is in the order of increasing tag number. * traversal is in the order of increasing tag number.
*/ */
// Note: the sort is guaranteed for low fields by the use of an // Note: the sort is guaranteed for low fields by the use of an
@ -164,7 +164,7 @@ public class TIFFIFD extends TIFFDirectory {
} }
/** /**
* Read the value of a field. The <code>data</code> parameter should be * Read the value of a field. The {@code data} parameter should be
* an array of length 1 of Object. * an array of length 1 of Object.
* *
* @param stream the input stream * @param stream the input stream
@ -762,8 +762,8 @@ public class TIFFIFD extends TIFFDirectory {
} }
/** /**
* Returns a <code>TIFFIFD</code> wherein all fields from the * Returns a {@code TIFFIFD} wherein all fields from the
* <code>BaselineTIFFTagSet</code> are copied by value and all other * {@code BaselineTIFFTagSet} are copied by value and all other
* fields copied by reference. * fields copied by reference.
*/ */
public TIFFIFD getShallowClone() { public TIFFIFD getShallowClone() {

6
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -1620,8 +1620,8 @@ public class TIFFImageMetadata extends IIOMetadata {
} }
/** /**
* Returns a <code>TIFFImageMetadata</code> wherein all fields in the * Returns a {@code TIFFImageMetadata} wherein all fields in the
* root IFD from the <code>BaselineTIFFTagSet</code> are copied by value * root IFD from the {@code BaselineTIFFTagSet} are copied by value
* and all other fields copied by reference. * and all other fields copied by reference.
*/ */
public TIFFImageMetadata getShallowClone() { public TIFFImageMetadata getShallowClone() {

4
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -83,7 +83,7 @@ public class TIFFImageReader extends ImageReader {
// Metadata for image at 'currIndex', or null. // Metadata for image at 'currIndex', or null.
private TIFFImageMetadata imageMetadata = null; private TIFFImageMetadata imageMetadata = null;
// A <code>List</code> of <code>Long</code>s indicating the stream // A {@code List} of {@code Long}s indicating the stream
// positions of the start of the IFD for each image. Entries // positions of the start of the IFD for each image. Entries
// are added as needed. // are added as needed.
private List<Long> imageStartPosition = new ArrayList<Long>(); private List<Long> imageStartPosition = new ArrayList<Long>();

18
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -122,11 +122,11 @@ import javax.imageio.ImageWriteParam;
* quality value is passed directly to the JPEG writer plug-in which * quality value is passed directly to the JPEG writer plug-in which
* interprets it in the usual way.</p> * interprets it in the usual way.</p>
* *
* <p> The <code>canWriteTiles</code> and * <p> The {@code canWriteTiles} and
* <code>canWriteCompressed</code> methods will return * {@code canWriteCompressed} methods will return
* <code>true</code>; the <code>canOffsetTiles</code> and * {@code true}; the {@code canOffsetTiles} and
* <code>canWriteProgressive</code> methods will return * {@code canWriteProgressive} methods will return
* <code>false</code>.</p> * {@code false}.</p>
* *
* <p> If tiles are being written, then each of their dimensions will be * <p> If tiles are being written, then each of their dimensions will be
* rounded to the nearest multiple of 16 per the TIFF specification. If * rounded to the nearest multiple of 16 per the TIFF specification. If
@ -140,10 +140,10 @@ import javax.imageio.ImageWriteParam;
public class TIFFImageWriteParam extends ImageWriteParam { public class TIFFImageWriteParam extends ImageWriteParam {
/** /**
* Constructs a <code>TIFFImageWriteParam</code> instance * Constructs a {@code TIFFImageWriteParam} instance
* for a given <code>Locale</code>. * for a given {@code Locale}.
* *
* @param locale the <code>Locale</code> for which messages * @param locale the {@code Locale} for which messages
* should be localized. * should be localized.
*/ */
public TIFFImageWriteParam(Locale locale) { public TIFFImageWriteParam(Locale locale) {

52
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -221,11 +221,11 @@ public class TIFFImageWriter extends ImageWriter {
* relative to a given tile grid layout specified by its X offset * relative to a given tile grid layout specified by its X offset
* and tile width. * and tile width.
* *
* <p> If <code>tileWidth < 0</code>, the results of this method * <p> If {@code tileWidth < 0}, the results of this method
* are undefined. If <code>tileWidth == 0</code>, an * are undefined. If {@code tileWidth == 0}, an
* <code>ArithmeticException</code> will be thrown. * {@code ArithmeticException} will be thrown.
* *
* @throws ArithmeticException If <code>tileWidth == 0</code>. * @throws ArithmeticException If {@code tileWidth == 0}.
*/ */
public static int XToTileX(int x, int tileGridXOffset, int tileWidth) { public static int XToTileX(int x, int tileGridXOffset, int tileWidth) {
x -= tileGridXOffset; x -= tileGridXOffset;
@ -240,11 +240,11 @@ public class TIFFImageWriter extends ImageWriter {
* relative to a given tile grid layout specified by its Y offset * relative to a given tile grid layout specified by its Y offset
* and tile height. * and tile height.
* *
* <p> If <code>tileHeight < 0</code>, the results of this method * <p> If {@code tileHeight < 0}, the results of this method
* are undefined. If <code>tileHeight == 0</code>, an * are undefined. If {@code tileHeight == 0}, an
* <code>ArithmeticException</code> will be thrown. * {@code ArithmeticException} will be thrown.
* *
* @throws ArithmeticException If <code>tileHeight == 0</code>. * @throws ArithmeticException If {@code tileHeight == 0}.
*/ */
public static int YToTileY(int y, int tileGridYOffset, int tileHeight) { public static int YToTileY(int y, int tileGridYOffset, int tileHeight) {
y -= tileGridYOffset; y -= tileGridYOffset;
@ -424,17 +424,17 @@ public class TIFFImageWriter extends ImageWriter {
} }
/** /**
* Converts a standard <code>javax_imageio_1.0</code> tree to a * Converts a standard {@code javax_imageio_1.0} tree to a
* <code>TIFFImageMetadata</code> object. * {@code TIFFImageMetadata} object.
* *
* @param inData The metadata object. * @param inData The metadata object.
* @return a <code>TIFFImageMetadata</code> or <code>null</code> if * @return a {@code TIFFImageMetadata} or {@code null} if
* the standard tree derived from the input object is <code>null</code>. * the standard tree derived from the input object is {@code null}.
* @throws IllegalArgumentException if <code>inData</code> is * @throws IllegalArgumentException if {@code inData} is
* <code>null</code>. * {@code null}.
* @throws IllegalArgumentException if <code>inData</code> does not support * @throws IllegalArgumentException if {@code inData} does not support
* the standard metadata format. * the standard metadata format.
* @throws IIOInvalidTreeException if <code>inData</code> generates an * @throws IIOInvalidTreeException if {@code inData} generates an
* invalid standard metadata tree. * invalid standard metadata tree.
*/ */
private TIFFImageMetadata convertStandardImageMetadata(IIOMetadata inData) private TIFFImageMetadata convertStandardImageMetadata(IIOMetadata inData)
@ -463,15 +463,15 @@ public class TIFFImageWriter extends ImageWriter {
/** /**
* Converts a native * Converts a native
* <code>javax_imageio_tiff_image_1.0</code> tree to a * {@code javax_imageio_tiff_image_1.0} tree to a
* <code>TIFFImageMetadata</code> object. * {@code TIFFImageMetadata} object.
* *
* @param inData The metadata object. * @param inData The metadata object.
* @return a <code>TIFFImageMetadata</code> or <code>null</code> if * @return a {@code TIFFImageMetadata} or {@code null} if
* the native tree derived from the input object is <code>null</code>. * the native tree derived from the input object is {@code null}.
* @throws IllegalArgumentException if <code>inData</code> is * @throws IllegalArgumentException if {@code inData} is
* <code>null</code> or does not support the native metadata format. * {@code null} or does not support the native metadata format.
* @throws IIOInvalidTreeException if <code>inData</code> generates an * @throws IIOInvalidTreeException if {@code inData} generates an
* invalid native metadata tree. * invalid native metadata tree.
*/ */
private TIFFImageMetadata convertNativeImageMetadata(IIOMetadata inData) private TIFFImageMetadata convertNativeImageMetadata(IIOMetadata inData)
@ -504,8 +504,8 @@ public class TIFFImageWriter extends ImageWriter {
* as needed. The destination image dimensions are provided as parameters * as needed. The destination image dimensions are provided as parameters
* because these might differ from those of the source due to subsampling. * because these might differ from those of the source due to subsampling.
* *
* @param cm The <code>ColorModel</code> of the image being written. * @param cm The {@code ColorModel} of the image being written.
* @param sm The <code>SampleModel</code> of the image being written. * @param sm The {@code SampleModel} of the image being written.
* @param destWidth The width of the written image after subsampling. * @param destWidth The width of the written image after subsampling.
* @param destHeight The height of the written image after subsampling. * @param destHeight The height of the written image after subsampling.
*/ */

6
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGCompressor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -102,14 +102,14 @@ public class TIFFJPEGCompressor extends TIFFBaseJPEGCompressor {
} }
/** /**
* Sets the value of the <code>metadata</code> field. * Sets the value of the {@code metadata} field.
* *
* <p>The implementation in this class also adds the TIFF fields * <p>The implementation in this class also adds the TIFF fields
* JPEGTables, YCbCrSubSampling, YCbCrPositioning, and * JPEGTables, YCbCrSubSampling, YCbCrPositioning, and
* ReferenceBlackWhite superseding any prior settings of those * ReferenceBlackWhite superseding any prior settings of those
* fields.</p> * fields.</p>
* *
* @param metadata the <code>IIOMetadata</code> object for the * @param metadata the {@code IIOMetadata} object for the
* image being written. * image being written.
* *
* @see #getMetadata() * @see #getMetadata()

4
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -245,7 +245,7 @@ class TIFFLZWDecompressor extends TIFFDecompressor {
} }
/** /**
* Append <code>newString</code> to the end of <code>oldString</code>. * Append {@code newString} to the end of {@code oldString}.
*/ */
public byte[] composeString(byte oldString[], byte newString) { public byte[] composeString(byte oldString[], byte newString) {
int length = oldString.length; int length = oldString.length;

4
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWUtil.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -188,7 +188,7 @@ class TIFFLZWUtil {
} }
/** /**
* Append <code>newString</code> to the end of <code>oldString</code>. * Append {@code newString} to the end of {@code oldString}.
*/ */
public byte[] composeString(byte oldString[], byte newString) { public byte[] composeString(byte oldString[], byte newString) {
int length = oldString.length; int length = oldString.length;

10
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -34,16 +34,16 @@ public class TIFFNullDecompressor extends TIFFDecompressor {
*/ */
private boolean isReadActiveOnly = false; private boolean isReadActiveOnly = false;
/** The original value of <code>srcMinX</code>. */ /** The original value of {@code srcMinX}. */
private int originalSrcMinX; private int originalSrcMinX;
/** The original value of <code>srcMinY</code>. */ /** The original value of {@code srcMinY}. */
private int originalSrcMinY; private int originalSrcMinY;
/** The original value of <code>srcWidth</code>. */ /** The original value of {@code srcWidth}. */
private int originalSrcWidth; private int originalSrcWidth;
/** The original value of <code>srcHeight</code>. */ /** The original value of {@code srcHeight}. */
private int originalSrcHeight; private int originalSrcHeight;
public TIFFNullDecompressor() {} public TIFFNullDecompressor() {}

4
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFOldJPEGDecompressor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -34,7 +34,7 @@ import javax.imageio.plugins.tiff.BaselineTIFFTagSet;
import javax.imageio.plugins.tiff.TIFFField; import javax.imageio.plugins.tiff.TIFFField;
/** /**
* <code>TIFFDecompressor</code> for "Old JPEG" compression. * {@code TIFFDecompressor} for "Old JPEG" compression.
*/ */
public class TIFFOldJPEGDecompressor extends TIFFJPEGDecompressor { public class TIFFOldJPEGDecompressor extends TIFFJPEGDecompressor {

6
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRLECompressor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -42,8 +42,8 @@ public class TIFFRLECompressor extends TIFFFaxCompressor {
* CCITT RLE (Run Lenth Encoding). * CCITT RLE (Run Lenth Encoding).
* *
* @param data The row of data to compress. * @param data The row of data to compress.
* @param rowOffset Starting index in <code>data</code>. * @param rowOffset Starting index in {@code data}.
* @param colOffset Bit offset within first <code>data[rowOffset]</code>. * @param colOffset Bit offset within first {@code data[rowOffset]}.
* @param rowLength Number of bits in the row. * @param rowLength Number of bits in the row.
* @param compData The compressed data. * @param compData The compressed data.
* *

14
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFRenderedImage.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -85,15 +85,15 @@ public class TIFFRenderedImage implements RenderedImage {
} }
/** /**
* Creates a copy of <code>param</code>. The source subsampling and * Creates a copy of {@code param}. The source subsampling and
* and bands settings and the destination bands and offset settings * and bands settings and the destination bands and offset settings
* are copied. If <code>param</code> is a <code>TIFFImageReadParam</code> * are copied. If {@code param} is a {@code TIFFImageReadParam}
* then the <code>TIFFDecompressor</code> and * then the {@code TIFFDecompressor} and
* <code>TIFFColorConverter</code> settings are also copied; otherwise * {@code TIFFColorConverter} settings are also copied; otherwise
* they are explicitly set to <code>null</code>. * they are explicitly set to {@code null}.
* *
* @param param the parameters to be copied. * @param param the parameters to be copied.
* @param copyTagSets whether the <code>TIFFTagSet</code> settings * @param copyTagSets whether the {@code TIFFTagSet} settings
* should be copied if set. * should be copied if set.
* @return copied parameters. * @return copied parameters.
*/ */

8
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT4Compressor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -41,13 +41,13 @@ public class TIFFT4Compressor extends TIFFFaxCompressor {
} }
/** /**
* Sets the value of the <code>metadata</code> field. * Sets the value of the {@code metadata} field.
* *
* <p> The implementation in this class also sets local options * <p> The implementation in this class also sets local options
* from the T4_OPTIONS field if it exists, and if it doesn't, adds * from the T4_OPTIONS field if it exists, and if it doesn't, adds
* it with default values.</p> * it with default values.</p>
* *
* @param metadata the <code>IIOMetadata</code> object for the * @param metadata the {@code IIOMetadata} object for the
* image being written. * image being written.
* *
* @see #getMetadata() * @see #getMetadata()
@ -86,7 +86,7 @@ public class TIFFT4Compressor extends TIFFFaxCompressor {
* @param isEOLAligned Whether EOL bit sequences should be padded. * @param isEOLAligned Whether EOL bit sequences should be padded.
* @param data The row of data to compress. * @param data The row of data to compress.
* @param lineStride Byte step between the same sample in different rows. * @param lineStride Byte step between the same sample in different rows.
* @param colOffset Bit offset within first <code>data[rowOffset]</code>. * @param colOffset Bit offset within first {@code data[rowOffset]}.
* @param width Number of bits in the row. * @param width Number of bits in the row.
* @param height Number of rows in the buffer. * @param height Number of rows in the buffer.
* @param compData The compressed data. * @param compData The compressed data.

4
jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFT6Compressor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -42,7 +42,7 @@ public class TIFFT6Compressor extends TIFFFaxCompressor {
* *
* @param data The row of data to compress. * @param data The row of data to compress.
* @param lineStride Byte step between the same sample in different rows. * @param lineStride Byte step between the same sample in different rows.
* @param colOffset Bit offset within first <code>data[rowOffset]</code>. * @param colOffset Bit offset within first {@code data[rowOffset]}.
* @param width Number of bits in the row. * @param width Number of bits in the row.
* @param height Number of rows in the buffer. * @param height Number of rows in the buffer.
* @param compData The compressed data. * @param compData The compressed data.

6
jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/BaselineTIFFTagSet.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -2175,9 +2175,9 @@ public class BaselineTIFFTagSet extends TIFFTagSet {
} }
/** /**
* Returns a shared instance of a <code>BaselineTIFFTagSet</code>. * Returns a shared instance of a {@code BaselineTIFFTagSet}.
* *
* @return a <code>BaselineTIFFTagSet</code> instance. * @return a {@code BaselineTIFFTagSet} instance.
*/ */
public synchronized static BaselineTIFFTagSet getInstance() { public synchronized static BaselineTIFFTagSet getInstance() {
if (theInstance == null) { if (theInstance == null) {

8
jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifGPSTagSet.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -51,7 +51,7 @@ public class ExifGPSTagSet extends TIFFTagSet {
/** /**
* A value to be used with the "GPSVersionID" tag to indicate GPS version * A value to be used with the "GPSVersionID" tag to indicate GPS version
* 2.2. The value equals the US-ASCII encoding of the byte array * 2.2. The value equals the US-ASCII encoding of the byte array
* <code>{'2', '2', '0', '0'}</code>. * {@code {'2', '2', '0', '0'}}.
* *
* @see #TAG_GPS_VERSION_ID * @see #TAG_GPS_VERSION_ID
*/ */
@ -711,9 +711,9 @@ public class ExifGPSTagSet extends TIFFTagSet {
} }
/** /**
* Returns a shared instance of an <code>ExifGPSTagSet</code>. * Returns a shared instance of an {@code ExifGPSTagSet}.
* *
* @return an <code>ExifGPSTagSet</code> instance. * @return an {@code ExifGPSTagSet} instance.
*/ */
public synchronized static ExifGPSTagSet getInstance() { public synchronized static ExifGPSTagSet getInstance() {
if (theInstance == null) { if (theInstance == null) {

6
jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifInteroperabilityTagSet.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -88,9 +88,9 @@ public class ExifInteroperabilityTagSet extends TIFFTagSet {
/** /**
* Returns the shared instance of * Returns the shared instance of
* <code>ExifInteroperabilityTagSet</code>. * {@code ExifInteroperabilityTagSet}.
* *
* @return the <code>ExifInteroperabilityTagSet</code> instance. * @return the {@code ExifInteroperabilityTagSet} instance.
*/ */
public synchronized static ExifInteroperabilityTagSet getInstance() { public synchronized static ExifInteroperabilityTagSet getInstance() {
if (theInstance == null) { if (theInstance == null) {

6
jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifParentTIFFTagSet.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -80,9 +80,9 @@ public class ExifParentTIFFTagSet extends TIFFTagSet {
} }
/** /**
* Returns a shared instance of an <code>ExifParentTIFFTagSet</code>. * Returns a shared instance of an {@code ExifParentTIFFTagSet}.
* *
* @return an <code>ExifParentTIFFTagSet</code> instance. * @return an {@code ExifParentTIFFTagSet} instance.
*/ */
public synchronized static ExifParentTIFFTagSet getInstance() { public synchronized static ExifParentTIFFTagSet getInstance() {
if (theInstance == null) { if (theInstance == null) {

12
jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/ExifTIFFTagSet.java
View File

@ -33,7 +33,7 @@ import java.util.List;
* standard for annotating images used by most digital camera * standard for annotating images used by most digital camera
* manufacturers. The Exif specification may be found at * manufacturers. The Exif specification may be found at
* <a href="http://www.exif.org/Exif2-2.PDF"> * <a href="http://www.exif.org/Exif2-2.PDF">
* <code>http://www.exif.org/Exif2-2.PDF</code> * {@code http://www.exif.org/Exif2-2.PDF}
* </a>. * </a>.
* *
* <p> The definitions of the data types referenced by the field * <p> The definitions of the data types referenced by the field
@ -67,7 +67,7 @@ public class ExifTIFFTagSet extends TIFFTagSet {
/** /**
* A value to be used with the "ExifVersion" tag to indicate Exif version * A value to be used with the "ExifVersion" tag to indicate Exif version
* 2.1. The value equals the US-ASCII encoding of the byte array * 2.1. The value equals the US-ASCII encoding of the byte array
* <code>{'0', '2', '1', '0'}</code>. * {@code {'0', '2', '1', '0'}}.
* *
* @see #TAG_EXIF_VERSION * @see #TAG_EXIF_VERSION
*/ */
@ -78,7 +78,7 @@ public class ExifTIFFTagSet extends TIFFTagSet {
/** /**
* A value to be used with the "ExifVersion" tag to indicate Exif version * A value to be used with the "ExifVersion" tag to indicate Exif version
* 2.2. The value equals the US-ASCII encoding of the byte array * 2.2. The value equals the US-ASCII encoding of the byte array
* <code>{'0', '2', '2', '0'}</code>. * {@code {'0', '2', '2', '0'}}.
* *
* @see #TAG_EXIF_VERSION * @see #TAG_EXIF_VERSION
*/ */
@ -94,7 +94,7 @@ public class ExifTIFFTagSet extends TIFFTagSet {
/** /**
* A tag indicating the color space information (type SHORT). The * A tag indicating the color space information (type SHORT). The
* legal values are given by the <code>COLOR_SPACE_*</code> * legal values are given by the {@code COLOR_SPACE_*}
* constants. * constants.
* *
* @see #COLOR_SPACE_SRGB * @see #COLOR_SPACE_SRGB
@ -1992,9 +1992,9 @@ public class ExifTIFFTagSet extends TIFFTagSet {
} }
/** /**
* Returns a shared instance of an <code>ExifTIFFTagSet</code>. * Returns a shared instance of an {@code ExifTIFFTagSet}.
* *
* @return an <code>ExifTIFFTagSet</code> instance. * @return an {@code ExifTIFFTagSet} instance.
*/ */
public synchronized static ExifTIFFTagSet getInstance() { public synchronized static ExifTIFFTagSet getInstance() {
if (theInstance == null) { if (theInstance == null) {

6
jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -131,9 +131,9 @@ public class FaxTIFFTagSet extends TIFFTagSet {
} }
/** /**
* Returns a shared instance of a <code>FaxTIFFTagSet</code>. * Returns a shared instance of a {@code FaxTIFFTagSet}.
* *
* @return a <code>FaxTIFFTagSet</code> instance. * @return a {@code FaxTIFFTagSet} instance.
*/ */
public synchronized static FaxTIFFTagSet getInstance() { public synchronized static FaxTIFFTagSet getInstance() {
if (theInstance == null) { if (theInstance == null) {

8
jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java
View File

@ -32,7 +32,7 @@ import java.util.List;
* standard for annotating georeferenced or geocoded raster imagery. * standard for annotating georeferenced or geocoded raster imagery.
* The GeoTIFF specification may be found at <a * The GeoTIFF specification may be found at <a
* href="http://www.remotesensing.org/geotiff/spec/geotiffhome.html"> * href="http://www.remotesensing.org/geotiff/spec/geotiffhome.html">
* <code>http://www.remotesensing.org/geotiff/spec/geotiffhome.html</code> * {@code http://www.remotesensing.org/geotiff/spec/geotiffhome.html}
* </a>. This class does <i>not</i> handle the <i>GeoKey</i>s referenced * </a>. This class does <i>not</i> handle the <i>GeoKey</i>s referenced
* from a <i>GeoKeyDirectoryTag</i> as those are not TIFF tags per se. * from a <i>GeoKeyDirectoryTag</i> as those are not TIFF tags per se.
* *
@ -63,7 +63,7 @@ public class GeoTIFFTagSet extends TIFFTagSet {
/** A tag used to store the <i>GeoKey</i> directory. */ /** A tag used to store the <i>GeoKey</i> directory. */
public static final int TAG_GEO_KEY_DIRECTORY = 34735; public static final int TAG_GEO_KEY_DIRECTORY = 34735;
/** A tag used to store all <code>double</code>-values <i>GeoKey</i>s. */ /** A tag used to store all {@code double}-values <i>GeoKey</i>s. */
public static final int TAG_GEO_DOUBLE_PARAMS = 34736; public static final int TAG_GEO_DOUBLE_PARAMS = 34736;
/** A tag used to store all ASCII-values <i>GeoKey</i>s. */ /** A tag used to store all ASCII-values <i>GeoKey</i>s. */
@ -137,9 +137,9 @@ public class GeoTIFFTagSet extends TIFFTagSet {
} }
/** /**
* Returns a shared instance of a <code>GeoTIFFTagSet</code>. * Returns a shared instance of a {@code GeoTIFFTagSet}.
* *
* @return a <code>GeoTIFFTagSet</code> instance. * @return a {@code GeoTIFFTagSet} instance.
*/ */
public synchronized static GeoTIFFTagSet getInstance() { public synchronized static GeoTIFFTagSet getInstance() {
if (theInstance == null) { if (theInstance == null) {

118
jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFDirectory.java
View File

@ -41,58 +41,58 @@ import com.sun.imageio.plugins.tiff.TIFFImageMetadata;
* image metadata. A TIFF image metadata tree represents an Image File * image metadata. A TIFF image metadata tree represents an Image File
* Directory (IFD) from a TIFF 6.0 stream. An IFD consists of a number of * Directory (IFD) from a TIFF 6.0 stream. An IFD consists of a number of
* IFD Entries each of which associates an identifying tag number with * IFD Entries each of which associates an identifying tag number with
* a compatible value. A <code>TIFFDirectory</code> instance corresponds * a compatible value. A {@code TIFFDirectory} instance corresponds
* to an IFD and contains a set of {@link TIFFField}s each of which * to an IFD and contains a set of {@link TIFFField}s each of which
* corresponds to an IFD Entry in the IFD. * corresponds to an IFD Entry in the IFD.
* *
* <p>When reading, a <code>TIFFDirectory</code> may be created by passing * <p>When reading, a {@code TIFFDirectory} may be created by passing
* the value returned by {@link javax.imageio.ImageReader#getImageMetadata * the value returned by {@link javax.imageio.ImageReader#getImageMetadata
* ImageReader.getImageMetadata()} to {@link #createFromMetadata * ImageReader.getImageMetadata()} to {@link #createFromMetadata
* createFromMetadata()}. The {@link TIFFField}s in the directory may then * createFromMetadata()}. The {@link TIFFField}s in the directory may then
* be obtained using the accessor methods provided in this class.</p> * be obtained using the accessor methods provided in this class.</p>
* *
* <p>When writing, an {@link IIOMetadata} object for use by one of the * <p>When writing, an {@link IIOMetadata} object for use by one of the
* <code>write()</code> methods of {@link javax.imageio.ImageWriter} may be * {@code write()} methods of {@link javax.imageio.ImageWriter} may be
* created from a <code>TIFFDirectory</code> by {@link #getAsMetadata()}. * created from a {@code TIFFDirectory} by {@link #getAsMetadata()}.
* The <code>TIFFDirectory</code> itself may be created by construction or * The {@code TIFFDirectory} itself may be created by construction or
* from the <code>IIOMetadata</code> object returned by * from the {@code IIOMetadata} object returned by
* {@link javax.imageio.ImageWriter#getDefaultImageMetadata * {@link javax.imageio.ImageWriter#getDefaultImageMetadata
* ImageWriter.getDefaultImageMetadata()}. The <code>TIFFField</code>s in the * ImageWriter.getDefaultImageMetadata()}. The {@code TIFFField}s in the
* directory may be set using the mutator methods provided in this class.</p> * directory may be set using the mutator methods provided in this class.</p>
* *
* <p>A <code>TIFFDirectory</code> is aware of the tag numbers in the * <p>A {@code TIFFDirectory} is aware of the tag numbers in the
* group of {@link TIFFTagSet}s associated with it. When * group of {@link TIFFTagSet}s associated with it. When
* a <code>TIFFDirectory</code> is created from a native image metadata * a {@code TIFFDirectory} is created from a native image metadata
* object, these tag sets are derived from the <tt>tagSets</tt> attribute * object, these tag sets are derived from the <tt>tagSets</tt> attribute
* of the <tt>TIFFIFD</tt> node.</p> * of the <tt>TIFFIFD</tt> node.</p>
* *
* <p>A <code>TIFFDirectory</code> might also have a parent {@link TIFFTag}. * <p>A {@code TIFFDirectory} might also have a parent {@link TIFFTag}.
* This will occur if the directory represents an IFD other than the root * This will occur if the directory represents an IFD other than the root
* IFD of the image. The parent tag is the tag of the IFD Entry which is a * IFD of the image. The parent tag is the tag of the IFD Entry which is a
* pointer to the IFD represented by this <code>TIFFDirectory</code>. The * pointer to the IFD represented by this {@code TIFFDirectory}. The
* {@link TIFFTag#isIFDPointer} method of this parent <code>TIFFTag</code> * {@link TIFFTag#isIFDPointer} method of this parent {@code TIFFTag}
* must return <code>true</code>. When a <code>TIFFDirectory</code> is * must return {@code true}. When a {@code TIFFDirectory} is
* created from a native image metadata object, the parent tag set is set * created from a native image metadata object, the parent tag set is set
* from the <tt>parentTagName</tt> attribute of the corresponding * from the <tt>parentTagName</tt> attribute of the corresponding
* <tt>TIFFIFD</tt> node. Note that a <code>TIFFDirectory</code> instance * <tt>TIFFIFD</tt> node. Note that a {@code TIFFDirectory} instance
* which has a non-<code>null</code> parent tag will be contained in the * which has a non-{@code null} parent tag will be contained in the
* data field of a <code>TIFFField</code> instance which has a tag field * data field of a {@code TIFFField} instance which has a tag field
* equal to the contained directory's parent tag.</p> * equal to the contained directory's parent tag.</p>
* *
* <p>As an example consider an Exif image. The <code>TIFFDirectory</code> * <p>As an example consider an Exif image. The {@code TIFFDirectory}
* instance corresponding to the Exif IFD in the Exif stream would have parent * instance corresponding to the Exif IFD in the Exif stream would have parent
* tag {@link ExifParentTIFFTagSet#TAG_EXIF_IFD_POINTER TAG_EXIF_IFD_POINTER} * tag {@link ExifParentTIFFTagSet#TAG_EXIF_IFD_POINTER TAG_EXIF_IFD_POINTER}
* and would include {@link ExifTIFFTagSet} in its group of known tag sets. * and would include {@link ExifTIFFTagSet} in its group of known tag sets.
* The <code>TIFFDirectory</code> corresponding to this Exif IFD will be * The {@code TIFFDirectory} corresponding to this Exif IFD will be
* contained in the data field of a <code>TIFFField</code> which will in turn * contained in the data field of a {@code TIFFField} which will in turn
* be contained in the <code>TIFFDirectory</code> corresponding to the primary * be contained in the {@code TIFFDirectory} corresponding to the primary
* IFD of the Exif image which will itself have a <code>null</code>-valued * IFD of the Exif image which will itself have a {@code null}-valued
* parent tag.</p> * parent tag.</p>
* *
* <p><b>Note that this implementation is not synchronized. </b>If multiple * <p><b>Note that this implementation is not synchronized. </b>If multiple
* threads use a <code>TIFFDirectory</code> instance concurrently, and at * threads use a {@code TIFFDirectory} instance concurrently, and at
* least one of the threads modifies the directory, for example, by adding * least one of the threads modifies the directory, for example, by adding
* or removing <code>TIFFField</code>s or <code>TIFFTagSet</code>s, it * or removing {@code TIFFField}s or {@code TIFFTagSet}s, it
* <i>must</i> be synchronized externally.</p> * <i>must</i> be synchronized externally.</p>
* *
* @since 9 * @since 9
@ -107,10 +107,10 @@ public class TIFFDirectory implements Cloneable {
private static final int MAX_LOW_FIELD_TAG_NUM = private static final int MAX_LOW_FIELD_TAG_NUM =
BaselineTIFFTagSet.TAG_REFERENCE_BLACK_WHITE; BaselineTIFFTagSet.TAG_REFERENCE_BLACK_WHITE;
/** The <code>TIFFTagSets</code> associated with this directory. */ /** The {@code TIFFTagSets} associated with this directory. */
private List<TIFFTagSet> tagSets; private List<TIFFTagSet> tagSets;
/** The parent <code>TIFFTag</code> of this directory. */ /** The parent {@code TIFFTag} of this directory. */
private TIFFTag parentTag; private TIFFTag parentTag;
/** /**
@ -123,13 +123,13 @@ public class TIFFDirectory implements Cloneable {
private int numLowFields = 0; private int numLowFields = 0;
/** /**
* A mapping of <code>Integer</code> tag numbers to <code>TIFFField</code>s * A mapping of {@code Integer} tag numbers to {@code TIFFField}s
* for fields which are not low tag numbered. * for fields which are not low tag numbered.
*/ */
private Map<Integer,TIFFField> highFields = new TreeMap<Integer,TIFFField>(); private Map<Integer,TIFFField> highFields = new TreeMap<Integer,TIFFField>();
/** /**
* Creates a <code>TIFFDirectory</code> instance from the contents of * Creates a {@code TIFFDirectory} instance from the contents of
* an image metadata object. The supplied object must support an image * an image metadata object. The supplied object must support an image
* metadata format supported by the TIFF {@link javax.imageio.ImageWriter} * metadata format supported by the TIFF {@link javax.imageio.ImageWriter}
* plug-in. This will usually be either the TIFF native image metadata * plug-in. This will usually be either the TIFF native image metadata
@ -139,12 +139,12 @@ public class TIFFDirectory implements Cloneable {
* @param tiffImageMetadata A metadata object which supports a compatible * @param tiffImageMetadata A metadata object which supports a compatible
* image metadata format. * image metadata format.
* *
* @return A <code>TIFFDirectory</code> populated from the contents of * @return A {@code TIFFDirectory} populated from the contents of
* the supplied metadata object. * the supplied metadata object.
* *
* @throws NullPointerException if <code>tiffImageMetadata</code> * @throws NullPointerException if {@code tiffImageMetadata}
* is <code>null</code>. * is {@code null}.
* @throws IllegalArgumentException if <code>tiffImageMetadata</code> * @throws IllegalArgumentException if {@code tiffImageMetadata}
* does not support a compatible image metadata format. * does not support a compatible image metadata format.
* @throws IIOInvalidTreeException if the supplied metadata object * @throws IIOInvalidTreeException if the supplied metadata object
* cannot be parsed. * cannot be parsed.
@ -204,7 +204,7 @@ public class TIFFDirectory implements Cloneable {
} }
/** /**
* Converts a <code>TIFFDirectory</code> to a <code>TIFFIFD</code>. * Converts a {@code TIFFDirectory} to a {@code TIFFIFD}.
*/ */
private static TIFFIFD getDirectoryAsIFD(TIFFDirectory dir) { private static TIFFIFD getDirectoryAsIFD(TIFFDirectory dir) {
if(dir instanceof TIFFIFD) { if(dir instanceof TIFFIFD) {
@ -242,16 +242,16 @@ public class TIFFDirectory implements Cloneable {
} }
/** /**
* Constructs a <code>TIFFDirectory</code> which is aware of a given * Constructs a {@code TIFFDirectory} which is aware of a given
* group of {@link TIFFTagSet}s. An optional parent {@link TIFFTag} * group of {@link TIFFTagSet}s. An optional parent {@link TIFFTag}
* may also be specified. * may also be specified.
* *
* @param tagSets The <code>TIFFTagSets</code> associated with this * @param tagSets The {@code TIFFTagSets} associated with this
* directory. * directory.
* @param parentTag The parent <code>TIFFTag</code> of this directory; * @param parentTag The parent {@code TIFFTag} of this directory;
* may be <code>null</code>. * may be {@code null}.
* @throws NullPointerException if <code>tagSets</code> is * @throws NullPointerException if {@code tagSets} is
* <code>null</code>. * {@code null}.
*/ */
public TIFFDirectory(TIFFTagSet[] tagSets, TIFFTag parentTag) { public TIFFDirectory(TIFFTagSet[] tagSets, TIFFTag parentTag) {
if(tagSets == null) { if(tagSets == null) {
@ -268,8 +268,8 @@ public class TIFFDirectory implements Cloneable {
/** /**
* Returns the {@link TIFFTagSet}s of which this directory is aware. * Returns the {@link TIFFTagSet}s of which this directory is aware.
* *
* @return The <code>TIFFTagSet</code>s associated with this * @return The {@code TIFFTagSet}s associated with this
* <code>TIFFDirectory</code>. * {@code TIFFDirectory}.
*/ */
public TIFFTagSet[] getTagSets() { public TIFFTagSet[] getTagSets() {
return tagSets.toArray(new TIFFTagSet[tagSets.size()]); return tagSets.toArray(new TIFFTagSet[tagSets.size()]);
@ -279,9 +279,9 @@ public class TIFFDirectory implements Cloneable {
* Adds an element to the group of {@link TIFFTagSet}s of which this * Adds an element to the group of {@link TIFFTagSet}s of which this
* directory is aware. * directory is aware.
* *
* @param tagSet The <code>TIFFTagSet</code> to add. * @param tagSet The {@code TIFFTagSet} to add.
* @throws NullPointerException if <code>tagSet</code> is * @throws NullPointerException if {@code tagSet} is
* <code>null</code>. * {@code null}.
*/ */
public void addTagSet(TIFFTagSet tagSet) { public void addTagSet(TIFFTagSet tagSet) {
if(tagSet == null) { if(tagSet == null) {
@ -297,9 +297,9 @@ public class TIFFDirectory implements Cloneable {
* Removes an element from the group of {@link TIFFTagSet}s of which this * Removes an element from the group of {@link TIFFTagSet}s of which this
* directory is aware. * directory is aware.
* *
* @param tagSet The <code>TIFFTagSet</code> to remove. * @param tagSet The {@code TIFFTagSet} to remove.
* @throws NullPointerException if <code>tagSet</code> is * @throws NullPointerException if {@code tagSet} is
* <code>null</code>. * {@code null}.
*/ */
public void removeTagSet(TIFFTagSet tagSet) { public void removeTagSet(TIFFTagSet tagSet) {
if(tagSet == null) { if(tagSet == null) {
@ -313,10 +313,10 @@ public class TIFFDirectory implements Cloneable {
/** /**
* Returns the parent {@link TIFFTag} of this directory if one * Returns the parent {@link TIFFTag} of this directory if one
* has been defined or <code>null</code> otherwise. * has been defined or {@code null} otherwise.
* *
* @return The parent <code>TIFFTag</code> of this * @return The parent {@code TIFFTag} of this
* <code>TIFFDiectory</code> or <code>null</code>. * {@code TIFFDiectory} or {@code null}.
*/ */
public TIFFTag getParentTag() { public TIFFTag getParentTag() {
return parentTag; return parentTag;
@ -324,12 +324,12 @@ public class TIFFDirectory implements Cloneable {
/** /**
* Returns the {@link TIFFTag} which has tag number equal to * Returns the {@link TIFFTag} which has tag number equal to
* <code>tagNumber</code> or <code>null</code> if no such tag * {@code tagNumber} or {@code null} if no such tag
* exists in the {@link TIFFTagSet}s associated with this * exists in the {@link TIFFTagSet}s associated with this
* directory. * directory.
* *
* @param tagNumber The tag number of interest. * @param tagNumber The tag number of interest.
* @return The corresponding <code>TIFFTag</code> or <code>null</code>. * @return The corresponding {@code TIFFTag} or {@code null}.
*/ */
public TIFFTag getTag(int tagNumber) { public TIFFTag getTag(int tagNumber) {
return TIFFIFD.getTag(tagNumber, tagSets); return TIFFIFD.getTag(tagNumber, tagSets);
@ -338,8 +338,8 @@ public class TIFFDirectory implements Cloneable {
/** /**
* Returns the number of {@link TIFFField}s in this directory. * Returns the number of {@link TIFFField}s in this directory.
* *
* @return The number of <code>TIFFField</code>s in this * @return The number of {@code TIFFField}s in this
* <code>TIFFDirectory</code>. * {@code TIFFDirectory}.
*/ */
public int getNumTIFFFields() { public int getNumTIFFFields() {
return numLowFields + highFields.size(); return numLowFields + highFields.size();
@ -351,7 +351,7 @@ public class TIFFDirectory implements Cloneable {
* *
* @param tagNumber The tag number. * @param tagNumber The tag number.
* @return Whether a {@link TIFFTag} with tag number equal to * @return Whether a {@link TIFFTag} with tag number equal to
* <code>tagNumber</code> is present in this <code>TIFFDirectory</code>. * {@code tagNumber} is present in this {@code TIFFDirectory}.
*/ */
public boolean containsTIFFField(int tagNumber) { public boolean containsTIFFField(int tagNumber) {
return (tagNumber >= 0 && tagNumber <= MAX_LOW_FIELD_TAG_NUM && return (tagNumber >= 0 && tagNumber <= MAX_LOW_FIELD_TAG_NUM &&
@ -363,7 +363,7 @@ public class TIFFDirectory implements Cloneable {
* Adds a TIFF field to the directory. * Adds a TIFF field to the directory.
* *
* @param f The field to add. * @param f The field to add.
* @throws NullPointerException if <code>f</code> is <code>null</code>. * @throws NullPointerException if {@code f} is {@code null}.
*/ */
public void addTIFFField(TIFFField f) { public void addTIFFField(TIFFField f) {
if(f == null) { if(f == null) {
@ -384,8 +384,8 @@ public class TIFFDirectory implements Cloneable {
* Retrieves a TIFF field from the directory. * Retrieves a TIFF field from the directory.
* *
* @param tagNumber The tag number of the tag associated with the field. * @param tagNumber The tag number of the tag associated with the field.
* @return A <code>TIFFField</code> with the requested tag number of * @return A {@code TIFFField} with the requested tag number of
* <code>null</code> if no such field is present. * {@code null} if no such field is present.
*/ */
public TIFFField getTIFFField(int tagNumber) { public TIFFField getTIFFField(int tagNumber) {
TIFFField f; TIFFField f;
@ -456,7 +456,7 @@ public class TIFFDirectory implements Cloneable {
* Converts the directory to a metadata object. * Converts the directory to a metadata object.
* *
* @return A metadata instance initialized from the contents of this * @return A metadata instance initialized from the contents of this
* <code>TIFFDirectory</code>. * {@code TIFFDirectory}.
*/ */
public IIOMetadata getAsMetadata() { public IIOMetadata getAsMetadata() {
return new TIFFImageMetadata(getDirectoryAsIFD(this)); return new TIFFImageMetadata(getDirectoryAsIFD(this));
@ -465,7 +465,7 @@ public class TIFFDirectory implements Cloneable {
/** /**
* Clones the directory and all the fields contained therein. * Clones the directory and all the fields contained therein.
* *
* @return A clone of this <code>TIFFDirectory</code>. * @return A clone of this {@code TIFFDirectory}.
* @throws CloneNotSupportedException if the instance cannot be cloned. * @throws CloneNotSupportedException if the instance cannot be cloned.
*/ */
@Override @Override

368
jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -35,7 +35,7 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* *
* <p> A field in a TIFF Image File Directory (IFD) is defined as a * <p> A field in a TIFF Image File Directory (IFD) is defined as a
* tag number accompanied by a sequence of values of identical data type. * tag number accompanied by a sequence of values of identical data type.
* TIFF 6.0 defines 12 data types; a 13th type <code>IFD</code> is * TIFF 6.0 defines 12 data types; a 13th type {@code IFD} is
* defined in TIFF Tech Note 1 of TIFF Specification Supplement 1. These * defined in TIFF Tech Note 1 of TIFF Specification Supplement 1. These
* TIFF data types are referred to by Java constants and mapped internally * TIFF data types are referred to by Java constants and mapped internally
* onto Java language data types and type names as follows: * onto Java language data types and type names as follows:
@ -68,10 +68,10 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* {@link TIFFTag#TIFF_BYTE} * {@link TIFFTag#TIFF_BYTE}
* </td> * </td>
* <td> * <td>
* <code>byte</code> * {@code byte}
* </td> * </td>
* <td> * <td>
* <code>"Byte"</code> * {@code "Byte"}
* </td> * </td>
* </tr> * </tr>
* *
@ -83,10 +83,10 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* {@link TIFFTag#TIFF_ASCII} * {@link TIFFTag#TIFF_ASCII}
* </td> * </td>
* <td> * <td>
* <code>String</code> * {@code String}
* </td> * </td>
* <td> * <td>
* <code>"Ascii"</code> * {@code "Ascii"}
* </td> * </td>
* </tr> * </tr>
* *
@ -98,10 +98,10 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* {@link TIFFTag#TIFF_SHORT} * {@link TIFFTag#TIFF_SHORT}
* </td> * </td>
* <td> * <td>
* <code>char</code> * {@code char}
* </td> * </td>
* <td> * <td>
* <code>"Short"</code> * {@code "Short"}
* </td> * </td>
* </tr> * </tr>
* *
@ -113,10 +113,10 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* {@link TIFFTag#TIFF_LONG} * {@link TIFFTag#TIFF_LONG}
* </td> * </td>
* <td> * <td>
* <code>long</code> * {@code long}
* </td> * </td>
* <td> * <td>
* <code>"Long"</code> * {@code "Long"}
* </td> * </td>
* </tr> * </tr>
* *
@ -128,10 +128,10 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* {@link TIFFTag#TIFF_RATIONAL} * {@link TIFFTag#TIFF_RATIONAL}
* </td> * </td>
* <td> * <td>
* <code>long[2]</code> {numerator, denominator} * {@code long[2]} {numerator, denominator}
* </td> * </td>
* <td> * <td>
* <code>"Rational"</code> * {@code "Rational"}
* </td> * </td>
* </tr> * </tr>
* *
@ -143,10 +143,10 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* {@link TIFFTag#TIFF_SBYTE} * {@link TIFFTag#TIFF_SBYTE}
* </td> * </td>
* <td> * <td>
* <code>byte</code> * {@code byte}
* </td> * </td>
* <td> * <td>
* <code>"SByte"</code> * {@code "SByte"}
* </td> * </td>
* </tr> * </tr>
* *
@ -158,10 +158,10 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* {@link TIFFTag#TIFF_UNDEFINED} * {@link TIFFTag#TIFF_UNDEFINED}
* </td> * </td>
* <td> * <td>
* <code>byte</code> * {@code byte}
* </td> * </td>
* <td> * <td>
* <code>"Undefined"</code> * {@code "Undefined"}
* </td> * </td>
* </tr> * </tr>
* *
@ -173,10 +173,10 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* {@link TIFFTag#TIFF_SSHORT} * {@link TIFFTag#TIFF_SSHORT}
* </td> * </td>
* <td> * <td>
* <code>short</code> * {@code short}
* </td> * </td>
* <td> * <td>
* <code>"SShort"</code> * {@code "SShort"}
* </td> * </td>
* </tr> * </tr>
* *
@ -188,10 +188,10 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* {@link TIFFTag#TIFF_SLONG} * {@link TIFFTag#TIFF_SLONG}
* </td> * </td>
* <td> * <td>
* <code>int</code> * {@code int}
* </td> * </td>
* <td> * <td>
* <code>"SLong"</code> * {@code "SLong"}
* </td> * </td>
* </tr> * </tr>
* *
@ -203,10 +203,10 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* {@link TIFFTag#TIFF_SRATIONAL} * {@link TIFFTag#TIFF_SRATIONAL}
* </td> * </td>
* <td> * <td>
* <code>int[2]</code> {numerator, denominator} * {@code int[2]} {numerator, denominator}
* </td> * </td>
* <td> * <td>
* <code>"SRational"</code> * {@code "SRational"}
* </td> * </td>
* </tr> * </tr>
* *
@ -218,10 +218,10 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* {@link TIFFTag#TIFF_FLOAT} * {@link TIFFTag#TIFF_FLOAT}
* </td> * </td>
* <td> * <td>
* <code>float</code> * {@code float}
* </td> * </td>
* <td> * <td>
* <code>"Float"</code> * {@code "Float"}
* </td> * </td>
* </tr> * </tr>
* *
@ -233,10 +233,10 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* {@link TIFFTag#TIFF_DOUBLE} * {@link TIFFTag#TIFF_DOUBLE}
* </td> * </td>
* <td> * <td>
* <code>double</code> * {@code double}
* </td> * </td>
* <td> * <td>
* <code>"Double"</code> * {@code "Double"}
* </td> * </td>
* </tr> * </tr>
* *
@ -248,10 +248,10 @@ import com.sun.imageio.plugins.tiff.TIFFIFD;
* {@link TIFFTag#TIFF_IFD_POINTER} * {@link TIFFTag#TIFF_IFD_POINTER}
* </td> * </td>
* <td> * <td>
* <code>long</code> * {@code long}
* </td> * </td>
* <td> * <td>
* <code>"IFDPointer"</code> * {@code "IFDPointer"}
* </td> * </td>
* </tr> * </tr>
* *
@ -411,19 +411,19 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Creates a <code>TIFFField</code> from a TIFF native image * Creates a {@code TIFFField} from a TIFF native image
* metadata node. If the value of the <tt>"tagNumber"</tt> attribute * metadata node. If the value of the <tt>"tagNumber"</tt> attribute
* of the node is not found in <code>tagSet</code> then a new * of the node is not found in {@code tagSet} then a new
* <code>TIFFTag</code> with name <code>TIFFTag.UNKNOWN_TAG_NAME</code> * {@code TIFFTag} with name {@code TIFFTag.UNKNOWN_TAG_NAME}
* will be created and assigned to the field. * will be created and assigned to the field.
* *
* @param tagSet The <code>TIFFTagSet</code> to which the * @param tagSet The {@code TIFFTagSet} to which the
* <code>TIFFTag</code> of the field belongs. * {@code TIFFTag} of the field belongs.
* @param node A native TIFF image metadata <code>TIFFField</code> node. * @param node A native TIFF image metadata {@code TIFFField} node.
* @throws NullPointerException if <code>node</code> is * @throws NullPointerException if {@code node} is
* <code>null</code>. * {@code null}.
* @throws IllegalArgumentException if the name of the node is not * @throws IllegalArgumentException if the name of the node is not
* <code>"TIFFField"</code>. * {@code "TIFFField"}.
* @return A new {@code TIFFField}. * @return A new {@code TIFFField}.
*/ */
public static TIFFField createFromMetadataNode(TIFFTagSet tagSet, public static TIFFField createFromMetadataNode(TIFFTagSet tagSet,
@ -487,14 +487,14 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Constructs a <code>TIFFField</code> with arbitrary data. The * Constructs a {@code TIFFField} with arbitrary data. The
* <code>type</code> parameter must be a value for which * {@code type} parameter must be a value for which
* {@link TIFFTag#isDataTypeOK tag.isDataTypeOK()} * {@link TIFFTag#isDataTypeOK tag.isDataTypeOK()}
* returns <code>true</code>. The <code>data</code> parameter must * returns {@code true}. The {@code data} parameter must
* be an array of a Java type appropriate for the type of the TIFF * be an array of a Java type appropriate for the type of the TIFF
* field. * field.
* *
* <p>Note that the value (data) of the <code>TIFFField</code> * <p>Note that the value (data) of the {@code TIFFField}
* will always be the actual field value regardless of the number of * will always be the actual field value regardless of the number of
* bytes required for that value. This is the case despite the fact * bytes required for that value. This is the case despite the fact
* that the TIFF <i>IFD Entry</i> corresponding to the field may * that the TIFF <i>IFD Entry</i> corresponding to the field may
@ -503,29 +503,29 @@ public class TIFFField implements Cloneable {
* value fits into 4 bytes). In other words, the value of the * value fits into 4 bytes). In other words, the value of the
* field will already have been read from the TIFF stream. (An exception * field will already have been read from the TIFF stream. (An exception
* to this case may occur when the field represents the contents of a * to this case may occur when the field represents the contents of a
* non-baseline IFD. In that case the data will be a <code>long[]</code> * non-baseline IFD. In that case the data will be a {@code long[]}
* containing the offset to the IFD and the <code>TIFFDirectory</code> * containing the offset to the IFD and the {@code TIFFDirectory}
* returned by {@link #getDirectory()} will be its contents.) * returned by {@link #getDirectory()} will be its contents.)
* *
* @param tag The tag to associated with this field. * @param tag The tag to associated with this field.
* @param type One of the <code>TIFFTag.TIFF_*</code> constants * @param type One of the {@code TIFFTag.TIFF_*} constants
* indicating the data type of the field as written to the TIFF stream. * indicating the data type of the field as written to the TIFF stream.
* @param count The number of data values. * @param count The number of data values.
* @param data The actual data content of the field. * @param data The actual data content of the field.
* *
* @throws NullPointerException if <code>tag&nbsp;==&nbsp;null</code>. * @throws NullPointerException if {@code tag&nbsp;==&nbsp;null}.
* @throws IllegalArgumentException if <code>type</code> is not * @throws IllegalArgumentException if {@code type} is not
* one of the <code>TIFFTag.TIFF_*</code> data type constants. * one of the {@code TIFFTag.TIFF_*} data type constants.
* @throws IllegalArgumentException if <code>type</code> is an unacceptable * @throws IllegalArgumentException if {@code type} is an unacceptable
* data type for the supplied <code>TIFFTag</code>. * data type for the supplied {@code TIFFTag}.
* @throws IllegalArgumentException if <code>count&nbsp;&lt;&nbsp;0</code>. * @throws IllegalArgumentException if {@code count&nbsp;&lt;&nbsp;0}.
* @throws IllegalArgumentException if <code>count&nbsp;&lt;&nbsp;1</code> * @throws IllegalArgumentException if {@code count&nbsp;&lt;&nbsp;1}
* and <code>type</code> is <code>TIFF_RATIONAL</code> or * and {@code type} is {@code TIFF_RATIONAL} or
* <code>TIFF_SRATIONAL</code>. * {@code TIFF_SRATIONAL}.
* @throws IllegalArgumentException if <code>count&nbsp;&ne;&nbsp;1</code> * @throws IllegalArgumentException if {@code count&nbsp;&ne;&nbsp;1}
* and <code>type</code> is <code>TIFF_IFD_POINTER</code>. * and {@code type} is {@code TIFF_IFD_POINTER}.
* @throws NullPointerException if <code>data&nbsp;==&nbsp;null</code>. * @throws NullPointerException if {@code data&nbsp;==&nbsp;null}.
* @throws IllegalArgumentException if <code>data</code> is an instance of * @throws IllegalArgumentException if {@code data} is an instance of
* a class incompatible with the specified type. * a class incompatible with the specified type.
* @throws IllegalArgumentException if the size of the data array is wrong. * @throws IllegalArgumentException if the size of the data array is wrong.
*/ */
@ -625,15 +625,15 @@ public class TIFFField implements Cloneable {
* parameters and the created array. * parameters and the created array.
* *
* @param tag The tag to associated with this field. * @param tag The tag to associated with this field.
* @param type One of the <code>TIFFTag.TIFF_*</code> constants * @param type One of the {@code TIFFTag.TIFF_*} constants
* indicating the data type of the field as written to the TIFF stream. * indicating the data type of the field as written to the TIFF stream.
* @param count The number of data values. * @param count The number of data values.
* @throws NullPointerException if <code>tag&nbsp;==&nbsp;null</code>. * @throws NullPointerException if {@code tag&nbsp;==&nbsp;null}.
* @throws IllegalArgumentException if <code>type</code> is not * @throws IllegalArgumentException if {@code type} is not
* one of the <code>TIFFTag.TIFF_*</code> data type constants. * one of the {@code TIFFTag.TIFF_*} data type constants.
* @throws IllegalArgumentException if <code>type</code> is an unacceptable * @throws IllegalArgumentException if {@code type} is an unacceptable
* data type for the supplied <code>TIFFTag</code>. * data type for the supplied {@code TIFFTag}.
* @throws IllegalArgumentException if <code>count&nbsp;&lt;&nbsp;0</code>. * @throws IllegalArgumentException if {@code count&nbsp;&lt;&nbsp;0}.
* @see #TIFFField(TIFFTag,int,int,Object) * @see #TIFFField(TIFFTag,int,int,Object)
*/ */
public TIFFField(TIFFTag tag, int type, int count) { public TIFFField(TIFFTag tag, int type, int count) {
@ -641,20 +641,20 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Constructs a <code>TIFFField</code> with a single non-negative integral * Constructs a {@code TIFFField} with a single non-negative integral
* value. * value.
* The field will have type * The field will have type
* {@link TIFFTag#TIFF_SHORT TIFF_SHORT} if * {@link TIFFTag#TIFF_SHORT TIFF_SHORT} if
* <code>val&nbsp;&lt;&nbsp;65536</code> and type * {@code val&nbsp;&lt;&nbsp;65536} and type
* {@link TIFFTag#TIFF_LONG TIFF_LONG} otherwise. The count * {@link TIFFTag#TIFF_LONG TIFF_LONG} otherwise. The count
* of the field will be unity. * of the field will be unity.
* *
* @param tag The tag to associate with this field. * @param tag The tag to associate with this field.
* @param value The value to associate with this field. * @param value The value to associate with this field.
* @throws NullPointerException if <code>tag&nbsp;==&nbsp;null</code>. * @throws NullPointerException if {@code tag&nbsp;==&nbsp;null}.
* @throws IllegalArgumentException if the derived type is unacceptable * @throws IllegalArgumentException if the derived type is unacceptable
* for the supplied <code>TIFFTag</code>. * for the supplied {@code TIFFTag}.
* @throws IllegalArgumentException if <code>value&nbsp;&lt;&nbsp;0</code>. * @throws IllegalArgumentException if {@code value&nbsp;&lt;&nbsp;0}.
*/ */
public TIFFField(TIFFTag tag, int value) { public TIFFField(TIFFTag tag, int value) {
if(tag == null) { if(tag == null) {
@ -690,24 +690,24 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Constructs a <code>TIFFField</code> with an IFD offset and contents. * Constructs a {@code TIFFField} with an IFD offset and contents.
* The offset will be stored as the data of this field as * The offset will be stored as the data of this field as
* <code>long[] {offset}</code>. The directory will not be cloned. The count * {@code long[] {offset}}. The directory will not be cloned. The count
* of the field will be unity. * of the field will be unity.
* *
* @param tag The tag to associated with this field. * @param tag The tag to associated with this field.
* @param type One of the constants <code>TIFFTag.TIFF_LONG</code> or * @param type One of the constants {@code TIFFTag.TIFF_LONG} or
* <code>TIFFTag.TIFF_IFD_POINTER</code>. * {@code TIFFTag.TIFF_IFD_POINTER}.
* @param offset The IFD offset. * @param offset The IFD offset.
* @param dir The directory. * @param dir The directory.
* *
* @throws NullPointerException if <code>tag&nbsp;==&nbsp;null</code>. * @throws NullPointerException if {@code tag&nbsp;==&nbsp;null}.
* @throws IllegalArgumentException if <code>type</code> is neither * @throws IllegalArgumentException if {@code type} is neither
* <code>TIFFTag.TIFF_LONG</code> nor <code>TIFFTag.TIFF_IFD_POINTER</code>. * {@code TIFFTag.TIFF_LONG} nor {@code TIFFTag.TIFF_IFD_POINTER}.
* @throws IllegalArgumentException if <code>type</code> is an unacceptable * @throws IllegalArgumentException if {@code type} is an unacceptable
* data type for the supplied <code>TIFFTag</code>. * data type for the supplied {@code TIFFTag}.
* @throws IllegalArgumentException if <code>offset</code> is non-positive. * @throws IllegalArgumentException if {@code offset} is non-positive.
* @throws NullPointerException if <code>dir&nbsp;==&nbsp;null</code>. * @throws NullPointerException if {@code dir&nbsp;==&nbsp;null}.
* *
* @see #TIFFField(TIFFTag,int,int,Object) * @see #TIFFField(TIFFTag,int,int,Object)
*/ */
@ -728,14 +728,14 @@ public class TIFFField implements Cloneable {
/** /**
* Retrieves the tag associated with this field. * Retrieves the tag associated with this field.
* *
* @return The associated <code>TIFFTag</code>. * @return The associated {@code TIFFTag}.
*/ */
public TIFFTag getTag() { public TIFFTag getTag() {
return tag; return tag;
} }
/** /**
* Retrieves the tag number in the range <code>[0,&nbsp;65535]</code>. * Retrieves the tag number in the range {@code [0,&nbsp;65535]}.
* *
* @return The tag number. * @return The tag number.
*/ */
@ -745,7 +745,7 @@ public class TIFFField implements Cloneable {
/** /**
* Returns the type of the data stored in the field. For a TIFF 6.0 * Returns the type of the data stored in the field. For a TIFF 6.0
* stream, the value will equal one of the <code>TIFFTag.TIFF_*</code> * stream, the value will equal one of the {@code TIFFTag.TIFF_*}
* constants. For future revisions of TIFF, higher values are possible. * constants. For future revisions of TIFF, higher values are possible.
* *
* @return The data type of the field value. * @return The data type of the field value.
@ -757,11 +757,11 @@ public class TIFFField implements Cloneable {
/** /**
* Returns the name of the supplied data type constant. * Returns the name of the supplied data type constant.
* *
* @param dataType One of the <code>TIFFTag.TIFF_*</code> constants * @param dataType One of the {@code TIFFTag.TIFF_*} constants
* indicating the data type of the field as written to the TIFF stream. * indicating the data type of the field as written to the TIFF stream.
* @return The type name corresponding to the supplied type constant. * @return The type name corresponding to the supplied type constant.
* @throws IllegalArgumentException if <code>dataType</code> is not * @throws IllegalArgumentException if {@code dataType} is not
* one of the <code>TIFFTag.TIFF_*</code> data type constants. * one of the {@code TIFFTag.TIFF_*} data type constants.
*/ */
public static String getTypeName(int dataType) { public static String getTypeName(int dataType) {
if (dataType < TIFFTag.MIN_DATATYPE || if (dataType < TIFFTag.MIN_DATATYPE ||
@ -774,11 +774,11 @@ public class TIFFField implements Cloneable {
/** /**
* Returns the data type constant corresponding to the supplied data * Returns the data type constant corresponding to the supplied data
* type name. If the name is unknown <code>-1</code> will be returned. * type name. If the name is unknown {@code -1} will be returned.
* *
* @param typeName The type name. * @param typeName The type name.
* @return One of the <code>TIFFTag.TIFF_*</code> constants or * @return One of the {@code TIFFTag.TIFF_*} constants or
* <code>-1</code> if the name is not recognized. * {@code -1} if the name is not recognized.
*/ */
public static int getTypeByName(String typeName) { public static int getTypeByName(String typeName) {
for (int i = TIFFTag.MIN_DATATYPE; i <= TIFFTag.MAX_DATATYPE; i++) { for (int i = TIFFTag.MIN_DATATYPE; i <= TIFFTag.MAX_DATATYPE; i++) {
@ -793,14 +793,14 @@ public class TIFFField implements Cloneable {
/** /**
* Creates an array appropriate for the indicated data type. * Creates an array appropriate for the indicated data type.
* *
* @param dataType One of the <code>TIFFTag.TIFF_*</code> data type * @param dataType One of the {@code TIFFTag.TIFF_*} data type
* constants. * constants.
* @param count The number of values in the array. * @param count The number of values in the array.
* @return An array appropriate for the specified data type. * @return An array appropriate for the specified data type.
* *
* @throws IllegalArgumentException if <code>dataType</code> is not * @throws IllegalArgumentException if {@code dataType} is not
* one of the <code>TIFFTag.TIFF_*</code> data type constants. * one of the {@code TIFFTag.TIFF_*} data type constants.
* @throws IllegalArgumentException if <code>count&nbsp;&lt;&nbsp;0</code>. * @throws IllegalArgumentException if {@code count&nbsp;&lt;&nbsp;0}.
*/ */
public static Object createArrayForType(int dataType, int count) { public static Object createArrayForType(int dataType, int count) {
if(count < 0) { if(count < 0) {
@ -836,15 +836,15 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns the <code>TIFFField</code> as a node named either * Returns the {@code TIFFField} as a node named either
* <tt>"TIFFField"</tt> or <tt>"TIFFIFD"</tt> as described in the * <tt>"TIFFField"</tt> or <tt>"TIFFIFD"</tt> as described in the
* TIFF native image metadata specification. The node will be named * TIFF native image metadata specification. The node will be named
* <tt>"TIFFIFD"</tt> if and only if the field's data object is an * <tt>"TIFFIFD"</tt> if and only if the field's data object is an
* instance of {@link TIFFDirectory} or equivalently * instance of {@link TIFFDirectory} or equivalently
* {@link TIFFTag#isIFDPointer getTag.isIFDPointer()} returns * {@link TIFFTag#isIFDPointer getTag.isIFDPointer()} returns
* <code>true</code>. * {@code true}.
* *
* @return a <code>Node</code> named <tt>"TIFFField"</tt> or * @return a {@code Node} named <tt>"TIFFField"</tt> or
* <tt>"TIFFIFD"</tt>. * <tt>"TIFFIFD"</tt>.
*/ */
public Node getAsNativeNode() { public Node getAsNativeNode() {
@ -863,8 +863,8 @@ public class TIFFField implements Cloneable {
/** /**
* Returns the number of data items present in the field. For * Returns the number of data items present in the field. For
* <code>TIFFTag.TIFF_ASCII</code> fields, the value returned is the * {@code TIFFTag.TIFF_ASCII} fields, the value returned is the
* number of <code>String</code>s, not the total length of the * number of {@code String}s, not the total length of the
* data as in the file representation. * data as in the file representation.
* *
* @return The number of data items present in the field. * @return The number of data items present in the field.
@ -884,17 +884,17 @@ public class TIFFField implements Cloneable {
/** /**
* Returns the data as an uninterpreted array of * Returns the data as an uninterpreted array of
* <code>byte</code>s. The type of the field must be one of * {@code byte}s. The type of the field must be one of
* <code>TIFFTag.TIFF_BYTE</code>, <code>TIFF_SBYTE</code>, or * {@code TIFFTag.TIFF_BYTE}, {@code TIFF_SBYTE}, or
* <code>TIFF_UNDEFINED</code>. * {@code TIFF_UNDEFINED}.
* *
* <p> For data in <code>TIFFTag.TIFF_BYTE</code> format, the application * <p> For data in {@code TIFFTag.TIFF_BYTE} format, the application
* must take care when promoting the data to longer integral types * must take care when promoting the data to longer integral types
* to avoid sign extension. * to avoid sign extension.
* *
* @throws ClassCastException if the field is not of type * @throws ClassCastException if the field is not of type
* <code>TIFF_BYTE</code>, <code>TIFF_SBYTE</code>, or * {@code TIFF_BYTE}, {@code TIFF_SBYTE}, or
* <code>TIFF_UNDEFINED</code>. * {@code TIFF_UNDEFINED}.
* @return The data as an uninterpreted array of bytes. * @return The data as an uninterpreted array of bytes.
*/ */
public byte[] getAsBytes() { public byte[] getAsBytes() {
@ -902,11 +902,11 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns <code>TIFFTag.TIFF_SHORT</code> data as an array of * Returns {@code TIFFTag.TIFF_SHORT} data as an array of
* <code>char</code>s (unsigned 16-bit integers). * {@code char}s (unsigned 16-bit integers).
* *
* @throws ClassCastException if the field is not of type * @throws ClassCastException if the field is not of type
* <code>TIFF_SHORT</code>. * {@code TIFF_SHORT}.
* @return The data as an array of {@code char}s. * @return The data as an array of {@code char}s.
*/ */
public char[] getAsChars() { public char[] getAsChars() {
@ -914,11 +914,11 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns <code>TIFFTag.TIFF_SSHORT</code> data as an array of * Returns {@code TIFFTag.TIFF_SSHORT} data as an array of
* <code>short</code>s (signed 16-bit integers). * {@code short}s (signed 16-bit integers).
* *
* @throws ClassCastException if the field is not of type * @throws ClassCastException if the field is not of type
* <code>TIFF_SSHORT</code>. * {@code TIFF_SSHORT}.
* @return The data as an array of {@code short}s. * @return The data as an array of {@code short}s.
*/ */
public short[] getAsShorts() { public short[] getAsShorts() {
@ -926,12 +926,12 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns <code>TIFFTag.TIFF_SLONG</code> data as an array of * Returns {@code TIFFTag.TIFF_SLONG} data as an array of
* <code>int</code>s (signed 32-bit integers). * {@code int}s (signed 32-bit integers).
* *
* @throws ClassCastException if the field is not of type * @throws ClassCastException if the field is not of type
* <code>TIFF_SHORT</code>, <code>TIFF_SSHORT</code>, or * {@code TIFF_SHORT}, {@code TIFF_SSHORT}, or
* <code>TIFF_SLONG</code>. * {@code TIFF_SLONG}.
* @return The data as an array of {@code int}s. * @return The data as an array of {@code int}s.
*/ */
public int[] getAsInts() { public int[] getAsInts() {
@ -957,12 +957,12 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns <code>TIFFTag.TIFF_LONG</code> or * Returns {@code TIFFTag.TIFF_LONG} or
* <code>TIFF_IFD_POINTER</code> data as an array of * {@code TIFF_IFD_POINTER} data as an array of
* <code>long</code>s (signed 64-bit integers). * {@code long}s (signed 64-bit integers).
* *
* @throws ClassCastException if the field is not of type * @throws ClassCastException if the field is not of type
* <code>TIFF_LONG</code> or <code>TIFF_IFD_POINTER</code>. * {@code TIFF_LONG} or {@code TIFF_IFD_POINTER}.
* @return The data as an array of {@code long}s. * @return The data as an array of {@code long}s.
*/ */
public long[] getAsLongs() { public long[] getAsLongs() {
@ -970,11 +970,11 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns <code>TIFFTag.TIFF_FLOAT</code> data as an array of * Returns {@code TIFFTag.TIFF_FLOAT} data as an array of
* <code>float</code>s (32-bit floating-point values). * {@code float}s (32-bit floating-point values).
* *
* @throws ClassCastException if the field is not of type * @throws ClassCastException if the field is not of type
* <code>TIFF_FLOAT</code>. * {@code TIFF_FLOAT}.
* @return The data as an array of {@code float}s. * @return The data as an array of {@code float}s.
*/ */
public float[] getAsFloats() { public float[] getAsFloats() {
@ -982,11 +982,11 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns <code>TIFFTag.TIFF_DOUBLE</code> data as an array of * Returns {@code TIFFTag.TIFF_DOUBLE} data as an array of
* <code>double</code>s (64-bit floating-point values). * {@code double}s (64-bit floating-point values).
* *
* @throws ClassCastException if the field is not of type * @throws ClassCastException if the field is not of type
* <code>TIFF_DOUBLE</code>. * {@code TIFF_DOUBLE}.
* @return The data as an array of {@code double}s. * @return The data as an array of {@code double}s.
*/ */
public double[] getAsDoubles() { public double[] getAsDoubles() {
@ -994,11 +994,11 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns <code>TIFFTag.TIFF_SRATIONAL</code> data as an array of * Returns {@code TIFFTag.TIFF_SRATIONAL} data as an array of
* 2-element arrays of <code>int</code>s. * 2-element arrays of {@code int}s.
* *
* @throws ClassCastException if the field is not of type * @throws ClassCastException if the field is not of type
* <code>TIFF_SRATIONAL</code>. * {@code TIFF_SRATIONAL}.
* @return The data as an array of signed rationals. * @return The data as an array of signed rationals.
*/ */
public int[][] getAsSRationals() { public int[][] getAsSRationals() {
@ -1006,11 +1006,11 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns <code>TIFFTag.TIFF_RATIONAL</code> data as an array of * Returns {@code TIFFTag.TIFF_RATIONAL} data as an array of
* 2-element arrays of <code>long</code>s. * 2-element arrays of {@code long}s.
* *
* @throws ClassCastException if the field is not of type * @throws ClassCastException if the field is not of type
* <code>TIFF_RATIONAL</code>. * {@code TIFF_RATIONAL}.
* @return The data as an array of unsigned rationals. * @return The data as an array of unsigned rationals.
*/ */
public long[][] getAsRationals() { public long[][] getAsRationals() {
@ -1018,30 +1018,30 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns data in any format as an <code>int</code>. * Returns data in any format as an {@code int}.
* *
* <p> <code>TIFFTag.TIFF_BYTE</code> values are treated as unsigned; that * <p> {@code TIFFTag.TIFF_BYTE} values are treated as unsigned; that
* is, no sign extension will take place and the returned value * is, no sign extension will take place and the returned value
* will be in the range [0, 255]. <code>TIFF_SBYTE</code> data * will be in the range [0, 255]. {@code TIFF_SBYTE} data
* will be returned in the range [-128, 127]. * will be returned in the range [-128, 127].
* *
* <p> A <code>TIFF_UNDEFINED</code> value is treated as though * <p> A {@code TIFF_UNDEFINED} value is treated as though
* it were a <code>TIFF_BYTE</code>. * it were a {@code TIFF_BYTE}.
* *
* <p> Data in <code>TIFF_SLONG</code>, <code>TIFF_LONG</code>, * <p> Data in {@code TIFF_SLONG}, {@code TIFF_LONG},
* <code>TIFF_FLOAT</code>, <code>TIFF_DOUBLE</code> or * {@code TIFF_FLOAT}, {@code TIFF_DOUBLE} or
* <code>TIFF_IFD_POINTER</code> format are simply cast to * {@code TIFF_IFD_POINTER} format are simply cast to
* <code>int</code> and may suffer from truncation. * {@code int} and may suffer from truncation.
* *
* <p> Data in <code>TIFF_SRATIONAL</code> or * <p> Data in {@code TIFF_SRATIONAL} or
* <code>TIFF_RATIONAL</code> format are evaluated by dividing the * {@code TIFF_RATIONAL} format are evaluated by dividing the
* numerator into the denominator using double-precision * numerator into the denominator using double-precision
* arithmetic and then casting to <code>int</code>. Loss of * arithmetic and then casting to {@code int}. Loss of
* precision and truncation may occur. * precision and truncation may occur.
* *
* <p> Data in <code>TIFF_ASCII</code> format will be parsed as by * <p> Data in {@code TIFF_ASCII} format will be parsed as by
* the <code>Double.parseDouble</code> method, with the result * the {@code Double.parseDouble} method, with the result
* case to <code>int</code>. * case to {@code int}.
* *
* @param index The index of the data. * @param index The index of the data.
* @return The data at the given index as an {@code int}. * @return The data at the given index as an {@code int}.
@ -1081,17 +1081,17 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns data in any format as a <code>long</code>. * Returns data in any format as a {@code long}.
* *
* <p> <code>TIFFTag.TIFF_BYTE</code> and <code>TIFF_UNDEFINED</code> data * <p> {@code TIFFTag.TIFF_BYTE} and {@code TIFF_UNDEFINED} data
* are treated as unsigned; that is, no sign extension will take * are treated as unsigned; that is, no sign extension will take
* place and the returned value will be in the range [0, 255]. * place and the returned value will be in the range [0, 255].
* <code>TIFF_SBYTE</code> data will be returned in the range * {@code TIFF_SBYTE} data will be returned in the range
* [-128, 127]. * [-128, 127].
* *
* <p> Data in <code>TIFF_ASCII</code> format will be parsed as by * <p> Data in {@code TIFF_ASCII} format will be parsed as by
* the <code>Double.parseDouble</code> method, with the result * the {@code Double.parseDouble} method, with the result
* cast to <code>long</code>. * cast to {@code long}.
* *
* @param index The index of the data. * @param index The index of the data.
* @return The data at the given index as a {@code long}. * @return The data at the given index as a {@code long}.
@ -1127,27 +1127,27 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns data in any format as a <code>float</code>. * Returns data in any format as a {@code float}.
* *
* <p> <code>TIFFTag.TIFF_BYTE</code> and <code>TIFF_UNDEFINED</code> data * <p> {@code TIFFTag.TIFF_BYTE} and {@code TIFF_UNDEFINED} data
* are treated as unsigned; that is, no sign extension will take * are treated as unsigned; that is, no sign extension will take
* place and the returned value will be in the range [0, 255]. * place and the returned value will be in the range [0, 255].
* <code>TIFF_SBYTE</code> data will be returned in the range * {@code TIFF_SBYTE} data will be returned in the range
* [-128, 127]. * [-128, 127].
* *
* <p> Data in <code>TIFF_SLONG</code>, <code>TIFF_LONG</code>, * <p> Data in {@code TIFF_SLONG}, {@code TIFF_LONG},
* <code>TIFF_DOUBLE</code>, or <code>TIFF_IFD_POINTER</code> format are * {@code TIFF_DOUBLE}, or {@code TIFF_IFD_POINTER} format are
* simply cast to <code>float</code> and may suffer from * simply cast to {@code float} and may suffer from
* truncation. * truncation.
* *
* <p> Data in <code>TIFF_SRATIONAL</code> or * <p> Data in {@code TIFF_SRATIONAL} or
* <code>TIFF_RATIONAL</code> format are evaluated by dividing the * {@code TIFF_RATIONAL} format are evaluated by dividing the
* numerator into the denominator using double-precision * numerator into the denominator using double-precision
* arithmetic and then casting to <code>float</code>. * arithmetic and then casting to {@code float}.
* *
* <p> Data in <code>TIFF_ASCII</code> format will be parsed as by * <p> Data in {@code TIFF_ASCII} format will be parsed as by
* the <code>Double.parseDouble</code> method, with the result * the {@code Double.parseDouble} method, with the result
* cast to <code>float</code>. * cast to {@code float}.
* *
* @param index The index of the data. * @param index The index of the data.
* @return The data at the given index as a {@code float}. * @return The data at the given index as a {@code float}.
@ -1187,21 +1187,21 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns data in any format as a <code>double</code>. * Returns data in any format as a {@code double}.
* *
* <p> <code>TIFFTag.TIFF_BYTE</code> and <code>TIFF_UNDEFINED</code> data * <p> {@code TIFFTag.TIFF_BYTE} and {@code TIFF_UNDEFINED} data
* are treated as unsigned; that is, no sign extension will take * are treated as unsigned; that is, no sign extension will take
* place and the returned value will be in the range [0, 255]. * place and the returned value will be in the range [0, 255].
* <code>TIFF_SBYTE</code> data will be returned in the range * {@code TIFF_SBYTE} data will be returned in the range
* [-128, 127]. * [-128, 127].
* *
* <p> Data in <code>TIFF_SRATIONAL</code> or * <p> Data in {@code TIFF_SRATIONAL} or
* <code>TIFF_RATIONAL</code> format are evaluated by dividing the * {@code TIFF_RATIONAL} format are evaluated by dividing the
* numerator into the denominator using double-precision * numerator into the denominator using double-precision
* arithmetic. * arithmetic.
* *
* <p> Data in <code>TIFF_ASCII</code> format will be parsed as by * <p> Data in {@code TIFF_ASCII} format will be parsed as by
* the <code>Double.parseDouble</code> method. * the {@code Double.parseDouble} method.
* *
* @param index The index of the data. * @param index The index of the data.
* @return The data at the given index as a {@code double}. * @return The data at the given index as a {@code double}.
@ -1241,11 +1241,11 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns a <code>TIFFTag.TIFF_ASCII</code> value as a * Returns a {@code TIFFTag.TIFF_ASCII} value as a
* <code>String</code>. * {@code String}.
* *
* @throws ClassCastException if the field is not of type * @throws ClassCastException if the field is not of type
* <code>TIFF_ASCII</code>. * {@code TIFF_ASCII}.
* *
* @param index The index of the data. * @param index The index of the data.
* @return The data at the given index as a {@code String}. * @return The data at the given index as a {@code String}.
@ -1255,13 +1255,13 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns a <code>TIFFTag.TIFF_SRATIONAL</code> data item as a * Returns a {@code TIFFTag.TIFF_SRATIONAL} data item as a
* two-element array of <code>int</code>s. * two-element array of {@code int}s.
* *
* @param index The index of the data. * @param index The index of the data.
* @return The data at the given index as a signed rational. * @return The data at the given index as a signed rational.
* @throws ClassCastException if the field is not of type * @throws ClassCastException if the field is not of type
* <code>TIFF_SRATIONAL</code>. * {@code TIFF_SRATIONAL}.
*/ */
public int[] getAsSRational(int index) { public int[] getAsSRational(int index) {
return ((int[][])data)[index]; return ((int[][])data)[index];
@ -1274,7 +1274,7 @@ public class TIFFField implements Cloneable {
* @param index The index of the data. * @param index The index of the data.
* @return The data at the given index as an unsigned rational. * @return The data at the given index as an unsigned rational.
* @throws ClassCastException if the field is not of type * @throws ClassCastException if the field is not of type
* <code>TIFF_RATIONAL</code>. * {@code TIFF_RATIONAL}.
*/ */
public long[] getAsRational(int index) { public long[] getAsRational(int index) {
return ((long[][])data)[index]; return ((long[][])data)[index];
@ -1282,11 +1282,11 @@ public class TIFFField implements Cloneable {
/** /**
* Returns a <code>String</code> containing a human-readable * Returns a {@code String} containing a human-readable
* version of the data item. Data of type * version of the data item. Data of type
* <code>TIFFTag.TIFF_RATIONAL</code> or <code>TIFF_SRATIONAL</code> are * {@code TIFFTag.TIFF_RATIONAL} or {@code TIFF_SRATIONAL} are
* represented as a pair of integers separated by a * represented as a pair of integers separated by a
* <code>'/'</code> character. * {@code '/'} character.
* *
* @param index The index of the data. * @param index The index of the data.
* @return The data at the given index as a {@code String}. * @return The data at the given index as a {@code String}.
@ -1355,7 +1355,7 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns whether the field has a <code>TIFFDirectory</code>. * Returns whether the field has a {@code TIFFDirectory}.
* *
* @return true if and only if getDirectory() returns non-null. * @return true if and only if getDirectory() returns non-null.
*/ */
@ -1364,8 +1364,8 @@ public class TIFFField implements Cloneable {
} }
/** /**
* Returns the associated <code>TIFFDirectory</code>, if available. If no * Returns the associated {@code TIFFDirectory}, if available. If no
* directory is set, then <code>null</code> will be returned. * directory is set, then {@code null} will be returned.
* *
* @return the TIFFDirectory instance or null. * @return the TIFFDirectory instance or null.
*/ */
@ -1376,7 +1376,7 @@ public class TIFFField implements Cloneable {
/** /**
* Clones the field and all the information contained therein. * Clones the field and all the information contained therein.
* *
* @return A clone of this <code>TIFFField</code>. * @return A clone of this {@code TIFFField}.
* @throws CloneNotSupportedException if the instance cannot be cloned. * @throws CloneNotSupportedException if the instance cannot be cloned.
*/ */
@Override @Override

44
jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFImageReadParam.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -39,11 +39,11 @@ import javax.imageio.ImageReadParam;
* be provided by this interface. * be provided by this interface.
* *
* <p> Additional TIFF tags must be organized into * <p> Additional TIFF tags must be organized into
* <code>TIFFTagSet</code>s. A <code>TIFFTagSet</code> may be * {@code TIFFTagSet}s. A {@code TIFFTagSet} may be
* provided to the reader by means of the * provided to the reader by means of the
* <code>addAllowedTagSet</code> method. By default, the tag sets * {@code addAllowedTagSet} method. By default, the tag sets
* <code>BaselineTIFFTagSet</code>, <code>FaxTIFFTagSet</code>, * {@code BaselineTIFFTagSet}, {@code FaxTIFFTagSet},
* <code>ExifParentTIFFTagSet</code>, and <code>GeoTIFFTagSet</code> * {@code ExifParentTIFFTagSet}, and {@code GeoTIFFTagSet}
* are included. * are included.
* *
* @since 9 * @since 9
@ -53,10 +53,10 @@ public class TIFFImageReadParam extends ImageReadParam {
private List<TIFFTagSet> allowedTagSets = new ArrayList<TIFFTagSet>(4); private List<TIFFTagSet> allowedTagSets = new ArrayList<TIFFTagSet>(4);
/** /**
* Constructs a <code>TIFFImageReadParam</code>. Tags defined by * Constructs a {@code TIFFImageReadParam}. Tags defined by
* the <code>TIFFTagSet</code>s <code>BaselineTIFFTagSet</code>, * the {@code TIFFTagSet}s {@code BaselineTIFFTagSet},
* <code>FaxTIFFTagSet</code>, <code>ExifParentTIFFTagSet</code>, and * {@code FaxTIFFTagSet}, {@code ExifParentTIFFTagSet}, and
* <code>GeoTIFFTagSet</code> will be supported. * {@code GeoTIFFTagSet} will be supported.
* *
* @see BaselineTIFFTagSet * @see BaselineTIFFTagSet
* @see FaxTIFFTagSet * @see FaxTIFFTagSet
@ -71,13 +71,13 @@ public class TIFFImageReadParam extends ImageReadParam {
} }
/** /**
* Adds a <code>TIFFTagSet</code> object to the list of allowed * Adds a {@code TIFFTagSet} object to the list of allowed
* tag sets. * tag sets.
* *
* @param tagSet a <code>TIFFTagSet</code>. * @param tagSet a {@code TIFFTagSet}.
* *
* @throws IllegalArgumentException if <code>tagSet</code> is * @throws IllegalArgumentException if {@code tagSet} is
* <code>null</code>. * {@code null}.
*/ */
public void addAllowedTagSet(TIFFTagSet tagSet) { public void addAllowedTagSet(TIFFTagSet tagSet) {
if (tagSet == null) { if (tagSet == null) {
@ -87,15 +87,15 @@ public class TIFFImageReadParam extends ImageReadParam {
} }
/** /**
* Removes a <code>TIFFTagSet</code> object from the list of * Removes a {@code TIFFTagSet} object from the list of
* allowed tag sets. Removal is based on the <code>equals</code> * allowed tag sets. Removal is based on the {@code equals}
* method of the <code>TIFFTagSet</code>, which is normally * method of the {@code TIFFTagSet}, which is normally
* defined as reference equality. * defined as reference equality.
* *
* @param tagSet a <code>TIFFTagSet</code>. * @param tagSet a {@code TIFFTagSet}.
* *
* @throws IllegalArgumentException if <code>tagSet</code> is * @throws IllegalArgumentException if {@code tagSet} is
* <code>null</code>. * {@code null}.
*/ */
public void removeAllowedTagSet(TIFFTagSet tagSet) { public void removeAllowedTagSet(TIFFTagSet tagSet) {
if (tagSet == null) { if (tagSet == null) {
@ -105,10 +105,10 @@ public class TIFFImageReadParam extends ImageReadParam {
} }
/** /**
* Returns a <code>List</code> containing the allowed * Returns a {@code List} containing the allowed
* <code>TIFFTagSet</code> objects. * {@code TIFFTagSet} objects.
* *
* @return a <code>List</code> of <code>TIFFTagSet</code>s. * @return a {@code List} of {@code TIFFTagSet}s.
*/ */
public List<TIFFTagSet> getAllowedTagSets() { public List<TIFFTagSet> getAllowedTagSets() {
return allowedTagSets; return allowedTagSets;

84
jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTag.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -105,7 +105,7 @@ public class TIFFTag {
* The name assigned to a tag with an unknown tag number. Such * The name assigned to a tag with an unknown tag number. Such
* a tag may be created for example when reading an IFD and a * a tag may be created for example when reading an IFD and a
* tag number is encountered which is not in any of the * tag number is encountered which is not in any of the
* <code>TIFFTagSet</code>s known to the reader. * {@code TIFFTagSet}s known to the reader.
*/ */
public static final String UNKNOWN_TAG_NAME = "UnknownTag"; public static final String UNKNOWN_TAG_NAME = "UnknownTag";
@ -141,12 +141,12 @@ public class TIFFTag {
private SortedMap<Integer,String> valueNames = null; private SortedMap<Integer,String> valueNames = null;
/** /**
* Constructs a <code>TIFFTag</code> with a given name, tag number, set * Constructs a {@code TIFFTag} with a given name, tag number, set
* of legal data types, and value count. A negative value count signifies * of legal data types, and value count. A negative value count signifies
* that either an arbitrary number of values is legal or the required count * that either an arbitrary number of values is legal or the required count
* is determined by the values of other fields in the IFD. A non-negative * is determined by the values of other fields in the IFD. A non-negative
* count specifies the number of values which an associated field must * count specifies the number of values which an associated field must
* contain. The tag will have no associated <code>TIFFTagSet</code>. * contain. The tag will have no associated {@code TIFFTagSet}.
* *
* <p> If there are mnemonic names to be associated with the legal * <p> If there are mnemonic names to be associated with the legal
* data values for the tag, {@link #addValueName(int, String) * data values for the tag, {@link #addValueName(int, String)
@ -183,18 +183,18 @@ public class TIFFTag {
} }
/** /**
* Constructs a <code>TIFFTag</code> with a given name, tag number and * Constructs a {@code TIFFTag} with a given name, tag number and
* <code>TIFFTagSet</code> to which it refers. The legal data types are * {@code TIFFTagSet} to which it refers. The legal data types are
* set to include {@link #TIFF_LONG} and {@link #TIFF_IFD_POINTER} and the * set to include {@link #TIFF_LONG} and {@link #TIFF_IFD_POINTER} and the
* value count is unity. The <code>TIFFTagSet</code> will * value count is unity. The {@code TIFFTagSet} will
* represent the set of <code>TIFFTag</code>s which appear in the IFD * represent the set of {@code TIFFTag}s which appear in the IFD
* pointed to. A <code>TIFFTag</code> represents an IFD pointer if and * pointed to. A {@code TIFFTag} represents an IFD pointer if and
* only if <code>tagSet</code> is non-<code>null</code> or the data * only if {@code tagSet} is non-{@code null} or the data
* type <code>TIFF_IFD_POINTER</code> is legal. * type {@code TIFF_IFD_POINTER} is legal.
* *
* @param name the name of the tag. * @param name the name of the tag.
* @param number the number used to represent the tag. * @param number the number used to represent the tag.
* @param tagSet the <code>TIFFTagSet</code> to which this tag belongs. * @param tagSet the {@code TIFFTagSet} to which this tag belongs.
* @throws NullPointerException if name or tagSet is null. * @throws NullPointerException if name or tagSet is null.
* @throws IllegalArgumentException if number is negative. * @throws IllegalArgumentException if number is negative.
* *
@ -210,9 +210,9 @@ public class TIFFTag {
} }
/** /**
* Constructs a <code>TIFFTag</code> with a given name, tag number, * Constructs a {@code TIFFTag} with a given name, tag number,
* and set of legal data types. The value count of the tag will be * and set of legal data types. The value count of the tag will be
* undefined and it will have no associated <code>TIFFTagSet</code>. * undefined and it will have no associated {@code TIFFTagSet}.
* *
* @param name the name of the tag. * @param name the name of the tag.
* @param number the number used to represent the tag. * @param number the number used to represent the tag.
@ -236,9 +236,9 @@ public class TIFFTag {
* *
* @return the number of bytes used to store the given data type. * @return the number of bytes used to store the given data type.
* *
* @throws IllegalArgumentException if <code>datatype</code> is * @throws IllegalArgumentException if {@code datatype} is
* less than <code>MIN_DATATYPE</code> or greater than * less than {@code MIN_DATATYPE} or greater than
* <code>MAX_DATATYPE</code>. * {@code MAX_DATATYPE}.
*/ */
public static int getSizeOfType(int dataType) { public static int getSizeOfType(int dataType) {
if (dataType < MIN_DATATYPE ||dataType > MAX_DATATYPE) { if (dataType < MIN_DATATYPE ||dataType > MAX_DATATYPE) {
@ -251,7 +251,7 @@ public class TIFFTag {
/** /**
* Returns the name of the tag, as it will appear in image metadata. * Returns the name of the tag, as it will appear in image metadata.
* *
* @return the tag name, as a <code>String</code>. * @return the tag name, as a {@code String}.
*/ */
public String getName() { public String getName() {
return name; return name;
@ -260,7 +260,7 @@ public class TIFFTag {
/** /**
* Returns the integer used to represent the tag. * Returns the integer used to represent the tag.
* *
* @return the tag number, as an <code>int</code>. * @return the tag number, as an {@code int}.
*/ */
public int getNumber() { public int getNumber() {
return number; return number;
@ -276,7 +276,7 @@ public class TIFFTag {
* (1 &lt;&lt; TIFFTag.TIFF_SHORT) | (1 &lt;&lt; TIFFTag.TIFF_LONG) * (1 &lt;&lt; TIFFTag.TIFF_SHORT) | (1 &lt;&lt; TIFFTag.TIFF_LONG)
* </pre> * </pre>
* *
* @return an <code>int</code> containing a bitmask encoding the * @return an {@code int} containing a bitmask encoding the
* set of valid data types. * set of valid data types.
*/ */
public int getDataTypes() { public int getDataTypes() {
@ -285,11 +285,11 @@ public class TIFFTag {
/** /**
* Returns the value count of this tag. If this value is positive, it * Returns the value count of this tag. If this value is positive, it
* represents the required number of values for a <code>TIFFField</code> * represents the required number of values for a {@code TIFFField}
* which has this tag. If the value is negative, the count is undefined. * which has this tag. If the value is negative, the count is undefined.
* In the latter case the count may be derived, e.g., the number of values * In the latter case the count may be derived, e.g., the number of values
* of the <code>BitsPerSample</code> field is <code>SamplesPerPixel</code>, * of the {@code BitsPerSample} field is {@code SamplesPerPixel},
* or it may be variable as in the case of most <code>US-ASCII</code> * or it may be variable as in the case of most {@code US-ASCII}
* fields. * fields.
* *
* @return the value count of this tag. * @return the value count of this tag.
@ -299,18 +299,18 @@ public class TIFFTag {
} }
/** /**
* Returns <code>true</code> if the given data type * Returns {@code true} if the given data type
* may be used for the data associated with this tag. * may be used for the data associated with this tag.
* *
* @param dataType the data type to be queried, one of * @param dataType the data type to be queried, one of
* <code>TIFF_BYTE</code>, <code>TIFF_SHORT</code>, etc. * {@code TIFF_BYTE}, {@code TIFF_SHORT}, etc.
* *
* @return a <code>boolean</code> indicating whether the given * @return a {@code boolean} indicating whether the given
* data type may be used with this tag. * data type may be used with this tag.
* *
* @throws IllegalArgumentException if <code>datatype</code> is * @throws IllegalArgumentException if {@code datatype} is
* less than <code>MIN_DATATYPE</code> or greater than * less than {@code MIN_DATATYPE} or greater than
* <code>MAX_DATATYPE</code>. * {@code MAX_DATATYPE}.
*/ */
public boolean isDataTypeOK(int dataType) { public boolean isDataTypeOK(int dataType) {
if (dataType < MIN_DATATYPE || dataType > MAX_DATATYPE) { if (dataType < MIN_DATATYPE || dataType > MAX_DATATYPE) {
@ -320,38 +320,38 @@ public class TIFFTag {
} }
/** /**
* Returns the <code>TIFFTagSet</code> of which this tag is a part. * Returns the {@code TIFFTagSet} of which this tag is a part.
* *
* @return the containing <code>TIFFTagSet</code>. * @return the containing {@code TIFFTagSet}.
*/ */
public TIFFTagSet getTagSet() { public TIFFTagSet getTagSet() {
return tagSet; return tagSet;
} }
/** /**
* Returns <code>true</code> if this tag is used to point to an IFD * Returns {@code true} if this tag is used to point to an IFD
* structure containing additional tags. A <code>TIFFTag</code> represents * structure containing additional tags. A {@code TIFFTag} represents
* an IFD pointer if and only if its <code>TIFFTagSet</code> is * an IFD pointer if and only if its {@code TIFFTagSet} is
* non-<code>null</code> or the data type <code>TIFF_IFD_POINTER</code> is * non-{@code null} or the data type {@code TIFF_IFD_POINTER} is
* legal. This condition will be satisfied if and only if either * legal. This condition will be satisfied if and only if either
* <code>getTagSet()&nbsp;!=&nbsp;null</code> or * {@code getTagSet()&nbsp;!=&nbsp;null} or
* <code>isDataTypeOK(TIFF_IFD_POINTER)&nbsp;==&nbsp;true</code>. * {@code isDataTypeOK(TIFF_IFD_POINTER)&nbsp;==&nbsp;true}.
* *
* <p>Many TIFF extensions use the IFD mechanism in order to limit the * <p>Many TIFF extensions use the IFD mechanism in order to limit the
* number of new tags that may appear in the root IFD.</p> * number of new tags that may appear in the root IFD.</p>
* *
* @return <code>true</code> if this tag points to an IFD. * @return {@code true} if this tag points to an IFD.
*/ */
public boolean isIFDPointer() { public boolean isIFDPointer() {
return tagSet != null || isDataTypeOK(TIFF_IFD_POINTER); return tagSet != null || isDataTypeOK(TIFF_IFD_POINTER);
} }
/** /**
* Returns <code>true</code> if there are mnemonic names associated with * Returns {@code true} if there are mnemonic names associated with
* the set of legal values for the data associated with this tag. Mnemonic * the set of legal values for the data associated with this tag. Mnemonic
* names apply only to tags which have integral data type. * names apply only to tags which have integral data type.
* *
* @return <code>true</code> if mnemonic value names are available. * @return {@code true} if mnemonic value names are available.
*/ */
public boolean hasValueNames() { public boolean hasValueNames() {
return valueNames != null; return valueNames != null;
@ -373,14 +373,14 @@ public class TIFFTag {
/** /**
* Returns the mnemonic name associated with a particular value * Returns the mnemonic name associated with a particular value
* that this tag's data may take on, or <code>null</code> if * that this tag's data may take on, or {@code null} if
* no name is present. Mnemonic names apply only to tags which have * no name is present. Mnemonic names apply only to tags which have
* integral data type. * integral data type.
* *
* @param value the data value. * @param value the data value.
* *
* @return the mnemonic name associated with the value, as a * @return the mnemonic name associated with the value, as a
* <code>String</code>. * {@code String}.
*/ */
public String getValueName(int value) { public String getValueName(int value) {
if (valueNames == null) { if (valueNames == null) {

40
jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTagSet.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -39,7 +39,7 @@ import java.util.TreeSet;
* specification itself). * specification itself).
* *
* <p> This class and its subclasses are responsible for mapping * <p> This class and its subclasses are responsible for mapping
* between raw tag numbers and <code>TIFFTag</code> objects, which * between raw tag numbers and {@code TIFFTag} objects, which
* contain additional information about each tag, such as the tag's * contain additional information about each tag, such as the tag's
* name, legal data types, and mnemonic names for some or all of ts * name, legal data types, and mnemonic names for some or all of ts
* data values. * data values.
@ -59,15 +59,15 @@ public class TIFFTagSet {
private TIFFTagSet() {} private TIFFTagSet() {}
/** /**
* Constructs a <code>TIFFTagSet</code>, given a <code>List</code> * Constructs a {@code TIFFTagSet}, given a {@code List}
* of <code>TIFFTag</code> objects. * of {@code TIFFTag} objects.
* *
* @param tags a <code>List</code> object containing * @param tags a {@code List} object containing
* <code>TIFFTag</code> objects to be added to this tag set. * {@code TIFFTag} objects to be added to this tag set.
* *
* @throws IllegalArgumentException if <code>tags</code> is * @throws IllegalArgumentException if {@code tags} is
* <code>null</code>, or contains objects that are not instances * {@code null}, or contains objects that are not instances
* of the <code>TIFFTag</code> class. * of the {@code TIFFTag} class.
*/ */
public TIFFTagSet(List<TIFFTag> tags) { public TIFFTagSet(List<TIFFTag> tags) {
if (tags == null) { if (tags == null) {
@ -88,29 +88,29 @@ public class TIFFTagSet {
} }
/** /**
* Returns the <code>TIFFTag</code> from this set that is * Returns the {@code TIFFTag} from this set that is
* associated with the given tag number, or <code>null</code> if * associated with the given tag number, or {@code null} if
* no tag exists for that number. * no tag exists for that number.
* *
* @param tagNumber the number of the tag to be retrieved. * @param tagNumber the number of the tag to be retrieved.
* *
* @return the numbered <code>TIFFTag</code>, or <code>null</code>. * @return the numbered {@code TIFFTag}, or {@code null}.
*/ */
public TIFFTag getTag(int tagNumber) { public TIFFTag getTag(int tagNumber) {
return allowedTagsByNumber.get(Integer.valueOf(tagNumber)); return allowedTagsByNumber.get(Integer.valueOf(tagNumber));
} }
/** /**
* Returns the <code>TIFFTag</code> having the given tag name, or * Returns the {@code TIFFTag} having the given tag name, or
* <code>null</code> if the named tag does not belong to this tag set. * {@code null} if the named tag does not belong to this tag set.
* *
* @param tagName the name of the tag to be retrieved, as a * @param tagName the name of the tag to be retrieved, as a
* <code>String</code>. * {@code String}.
* *
* @return the named <code>TIFFTag</code>, or <code>null</code>. * @return the named {@code TIFFTag}, or {@code null}.
* *
* @throws IllegalArgumentException if <code>tagName</code> is * @throws IllegalArgumentException if {@code tagName} is
* <code>null</code>. * {@code null}.
*/ */
public TIFFTag getTag(String tagName) { public TIFFTag getTag(String tagName) {
if (tagName == null) { if (tagName == null) {
@ -123,7 +123,7 @@ public class TIFFTagSet {
* Retrieves an unmodifiable numerically increasing set of tag numbers. * Retrieves an unmodifiable numerically increasing set of tag numbers.
* *
* <p>The returned object is unmodifiable and contains the tag * <p>The returned object is unmodifiable and contains the tag
* numbers of all <code>TIFFTag</code>s in this <code>TIFFTagSet</code> * numbers of all {@code TIFFTag}s in this {@code TIFFTagSet}
* sorted into ascending order according to * sorted into ascending order according to
* {@link Integer#compareTo(Object)}.</p> * {@link Integer#compareTo(Object)}.</p>
* *
@ -145,7 +145,7 @@ public class TIFFTagSet {
* Retrieves an unmodifiable lexicographically increasing set of tag names. * Retrieves an unmodifiable lexicographically increasing set of tag names.
* *
* <p>The returned object is unmodifiable and contains the tag * <p>The returned object is unmodifiable and contains the tag
* names of all <code>TIFFTag</code>s in this <code>TIFFTagSet</code> * names of all {@code TIFFTag}s in this {@code TIFFTagSet}
* sorted into ascending order according to * sorted into ascending order according to
* {@link String#compareTo(Object)}.</p> * {@link String#compareTo(Object)}.</p>
* *