You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2018/08/25 10:40:56 UTC
[09/14] commons-imaging git commit: IMAGING-103: fix site report
checkstyle issues
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
index 7235f2e..6d215a2 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
@@ -16,6 +16,15 @@
*/
package org.apache.commons.imaging.formats.tiff;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_1D;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_JPEG;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_LZW;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_PACKBITS;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED_1;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED_2;
+
import java.awt.Dimension;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
@@ -35,8 +44,8 @@ import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.ImageBuilder;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.formats.tiff.TiffDirectory.ImageDataElement;
import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
@@ -53,8 +62,6 @@ import org.apache.commons.imaging.formats.tiff.photometricinterpreters.Photometr
import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreterYCbCr;
import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterLossy;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*;
-
public class TiffImageParser extends ImageParser {
private static final String DEFAULT_EXTENSION = ".tif";
private static final String[] ACCEPTED_EXTENSIONS = { ".tif", ".tiff", };
@@ -481,8 +488,7 @@ public class TiffImageParser extends ImageParser {
private Integer getIntegerParameter(
final String key, final Map<String, Object>params)
- throws ImageReadException
- {
+ throws ImageReadException {
if (params == null) {
return null;
}
@@ -501,8 +507,7 @@ public class TiffImageParser extends ImageParser {
private Rectangle checkForSubImage(
final Map<String, Object> params)
- throws ImageReadException
- {
+ throws ImageReadException {
final Integer ix0 = getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_X, params);
final Integer iy0 = getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_Y, params);
final Integer iwidth = getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, params);
@@ -535,8 +540,7 @@ public class TiffImageParser extends ImageParser {
protected BufferedImage getBufferedImage(final TiffDirectory directory,
final ByteOrder byteOrder, final Map<String, Object> params)
- throws ImageReadException, IOException
- {
+ throws ImageReadException, IOException {
final List<TiffField> entries = directory.entries;
if (entries == null) {
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
index 6150645..8e9ea25 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
@@ -286,11 +286,11 @@ public class TiffReader extends BinaryFileParser {
private final List<TiffField> fields = new ArrayList<>();
private final boolean readThumbnails;
- public Collector() {
+ Collector() {
this(null);
}
- public Collector(final Map<String, Object> params) {
+ Collector(final Map<String, Object> params) {
boolean tmpReadThumbnails = true;
if (params != null && params.containsKey(ImagingConstants.PARAM_KEY_READ_THUMBNAILS)) {
tmpReadThumbnails = Boolean.TRUE.equals(params.get(ImagingConstants.PARAM_KEY_READ_THUMBNAILS));
@@ -334,7 +334,7 @@ public class TiffReader extends BinaryFileParser {
private static class FirstDirectoryCollector extends Collector {
private final boolean readImageData;
- public FirstDirectoryCollector(final boolean readImageData) {
+ FirstDirectoryCollector(final boolean readImageData) {
this.readImageData = readImageData;
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java
index a3aab61..33c8b22 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java
@@ -32,15 +32,15 @@ import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoUndefineds;
*/
public final class AdobePhotoshopTagConstants {
- public final static TagInfoUndefineds EXIF_TAG_JPEGTABLES = new TagInfoUndefineds(
+ public static final TagInfoUndefineds EXIF_TAG_JPEGTABLES = new TagInfoUndefineds(
"JPEGTables", 0x015b, -1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public final static TagInfoUndefineds EXIF_TAG_IMAGE_SOURCE_DATA = new TagInfoUndefineds(
+ public static final TagInfoUndefineds EXIF_TAG_IMAGE_SOURCE_DATA = new TagInfoUndefineds(
"ImageSourceData", 0x935c, -1,
TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public final static List<TagInfo> ALL_ADOBE_PHOTOSHOP_TAGS =
+ public static final List<TagInfo> ALL_ADOBE_PHOTOSHOP_TAGS =
Collections.unmodifiableList(Arrays.<TagInfo> asList(
EXIF_TAG_JPEGTABLES,
EXIF_TAG_IMAGE_SOURCE_DATA
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/BitInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/BitInputStream.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/BitInputStream.java
index f20320c..045643f 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/BitInputStream.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/BitInputStream.java
@@ -32,7 +32,7 @@ class BitInputStream extends InputStream {
private int cacheBitsRemaining;
private long bytesRead;
- public BitInputStream(final InputStream is, final ByteOrder byteOrder) {
+ BitInputStream(final InputStream is, final ByteOrder byteOrder) {
this.is = is;
this.byteOrder = byteOrder;
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
index a44bf7d..113b978 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
@@ -221,8 +221,7 @@ public final class DataReaderStrips extends ImageDataReader {
@Override
public BufferedImage readImageData(final Rectangle subImage)
- throws ImageReadException, IOException
- {
+ throws ImageReadException, IOException {
// the legacy code is optimized to the reading of whole
// strips (except for the last strip in the image, which can
// be a partial). So create a working image with compatible
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
index dae6d1f..d6a206d 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
@@ -183,8 +183,7 @@ public final class DataReaderTiled extends ImageDataReader {
@Override
public BufferedImage readImageData(final Rectangle subImage)
- throws ImageReadException, IOException
- {
+ throws ImageReadException, IOException {
final int bitsPerRow = tileWidth * bitsPerPixel;
final int bytesPerRow = (bitsPerRow + 7) / 8;
final int bytesPerTile = bytesPerRow * tileLength;
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java
index 90715ea..ed63be6 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java
@@ -73,7 +73,7 @@ public final class TagInfoGpsText extends TagInfo {
final byte[] prefix;
public final String encodingName;
- public TextEncoding(final byte[] prefix, final String encodingName) {
+ TextEncoding(final byte[] prefix, final String encodingName) {
this.prefix = prefix;
this.encodingName = encodingName;
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoUndefineds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoUndefineds.java b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoUndefineds.java
index db198fb..34c6de0 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoUndefineds.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoUndefineds.java
@@ -23,4 +23,4 @@ public class TagInfoUndefineds extends TagInfoBytes {
public TagInfoUndefineds(final String name, final int tag, final int length, final TiffDirectoryType directoryType) {
super(name, tag, FieldType.UNDEFINED, length, directoryType);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
index 8b67f09..8a456d9 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
@@ -16,6 +16,19 @@
*/
package org.apache.commons.imaging.formats.tiff.write;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.DEFAULT_TIFF_BYTE_ORDER;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.PARAM_KEY_LZW_COMPRESSION_BLOCK_SIZE;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.PARAM_KEY_T4_OPTIONS;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.PARAM_KEY_T6_OPTIONS;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_1D;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_LZW;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_PACKBITS;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_FLAG_T6_OPTIONS_UNCOMPRESSED_MODE;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_HEADER_SIZE;
+
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.OutputStream;
@@ -42,8 +55,6 @@ import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryConstants;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*;
-
public abstract class TiffImageWriterBase {
protected final ByteOrder byteOrder;
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
index 729615a..8e2e80d 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.imaging.formats.tiff.write;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_HEADER_SIZE;
+
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteOrder;
@@ -43,8 +45,6 @@ import org.apache.commons.imaging.formats.tiff.TiffImageData;
import org.apache.commons.imaging.formats.tiff.TiffReader;
import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*;
-
public class TiffImageWriterLossless extends TiffImageWriterBase {
private final byte[] exifBytes;
private static final Comparator<TiffElement> ELEMENT_SIZE_COMPARATOR = new Comparator<TiffElement>() {
@@ -241,14 +241,14 @@ public class TiffImageWriterLossless extends TiffImageWriterBase {
}
if (null == bestFit) {
// we couldn't place this item. overflow.
- if ((overflowIndex & 1l) != 0) {
+ if ((overflowIndex & 1L) != 0) {
overflowIndex += 1;
}
outputItem.setOffset(overflowIndex);
overflowIndex += outputItemLength;
} else {
long offset = bestFit.offset;
- if ((offset & 1l) != 0) {
+ if ((offset & 1L) != 0) {
offset += 1;
}
outputItem.setOffset(offset);
@@ -274,7 +274,7 @@ public class TiffImageWriterLossless extends TiffImageWriterBase {
private final byte[] buffer;
private int index;
- public BufferOutputStream(final byte[] buffer, final int index) {
+ BufferOutputStream(final byte[] buffer, final int index) {
this.buffer = buffer;
this.index = index;
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java
index c83d990..2cbafb2 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.imaging.formats.tiff.write;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_HEADER_SIZE;
+
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteOrder;
@@ -24,8 +26,6 @@ import java.util.List;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*;
-
public class TiffImageWriterLossy extends TiffImageWriterBase {
public TiffImageWriterLossy() {
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
index c77d100..771a684 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.imaging.formats.tiff.write;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_ENTRY_MAX_VALUE_LENGTH;
+
import java.io.IOException;
import java.nio.ByteOrder;
import java.util.Arrays;
@@ -25,8 +27,6 @@ import org.apache.commons.imaging.common.BinaryOutputStream;
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*;
-
public class TiffOutputField {
public final int tag;
public final TagInfo tagInfo;
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java
index 37d486f..e97fe20 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java
@@ -45,7 +45,7 @@ abstract class TiffOutputItem {
private final byte[] bytes;
private final String name;
- public Value(final String name, final byte[] bytes) {
+ Value(final String name, final byte[] bytes) {
this.name = name;
this.bytes = bytes;
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
index d9f7075..ceca0b2 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.imaging.formats.tiff.write;
+import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.DEFAULT_TIFF_BYTE_ORDER;
+
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.List;
@@ -27,8 +29,6 @@ import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryConstants;
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo;
import org.apache.commons.imaging.internal.Debug;
-import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*;
-
public final class TiffOutputSet {
public final ByteOrder byteOrder;
private final List<TiffOutputDirectory> directories = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
index af91d7b..bc32ed6 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
@@ -31,7 +31,7 @@ class TiffOutputSummary {
private final List<OffsetItem> offsetItems = new ArrayList<>();
private final List<ImageDataOffsets> imageDataItems = new ArrayList<>();
- public TiffOutputSummary(final ByteOrder byteOrder,
+ TiffOutputSummary(final ByteOrder byteOrder,
final TiffOutputDirectory rootDirectory,
final Map<Integer, TiffOutputDirectory> directoryTypeMap) {
this.byteOrder = byteOrder;
@@ -43,8 +43,7 @@ class TiffOutputSummary {
public final TiffOutputItem item;
public final TiffOutputField itemOffsetField;
- public OffsetItem(final TiffOutputItem item,
- final TiffOutputField itemOffsetField) {
+ OffsetItem(final TiffOutputItem item, final TiffOutputField itemOffsetField) {
super();
this.itemOffsetField = itemOffsetField;
this.item = item;
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java b/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
index deea19e..61924ac 100644
--- a/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
@@ -105,7 +105,7 @@ public class WbmpImageParser extends ImageParser {
int width;
int height;
- public WbmpHeader(final int typeField, final byte fixHeaderField, final int width,
+ WbmpHeader(final int typeField, final byte fixHeaderField, final int width,
final int height) {
this.typeField = typeField;
this.fixHeaderField = fixHeaderField;
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java b/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
index 7ca8a43..c8198ae 100644
--- a/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
@@ -109,7 +109,7 @@ public class XbmImageParser extends ImageParser {
int xHot = -1;
int yHot = -1;
- public XbmHeader(final int width, final int height, final int xHot, final int yHot) {
+ XbmHeader(final int width, final int height, final int xHot, final int yHot) {
this.width = width;
this.height = height;
this.xHot = xHot;
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java b/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
index 8f098de..1320805 100644
--- a/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
@@ -182,7 +182,7 @@ public class XpmImageParser extends ImageParser {
Map<Object, PaletteEntry> palette = new HashMap<>();
- public XpmHeader(final int width, final int height, final int numColors,
+ XpmHeader(final int width, final int height, final int numColors,
final int numCharsPerPixel, final int xHotSpot, final int yHotSpot, final boolean xpmExt) {
this.width = width;
this.height = height;
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/icc/CachingInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/icc/CachingInputStream.java b/src/main/java/org/apache/commons/imaging/icc/CachingInputStream.java
index d580b8a..71bed46 100644
--- a/src/main/java/org/apache/commons/imaging/icc/CachingInputStream.java
+++ b/src/main/java/org/apache/commons/imaging/icc/CachingInputStream.java
@@ -24,7 +24,7 @@ class CachingInputStream extends InputStream {
private final InputStream is;
private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- public CachingInputStream(final InputStream is) {
+ CachingInputStream(final InputStream is) {
this.is = is;
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java b/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java
index 7e65a7a..9ea08b2 100644
--- a/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java
+++ b/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java
@@ -32,8 +32,7 @@ public enum IccTagDataTypes implements IccTagDataType {
"descType", 0x64657363) {
@Override
public void dump(final String prefix, final byte[] bytes)
- throws ImageReadException, IOException
- {
+ throws ImageReadException, IOException {
try (InputStream bis = new ByteArrayInputStream(bytes)) {
read4Bytes("type_signature", bis, "ICC: corrupt tag data", ByteOrder.BIG_ENDIAN);
@@ -53,8 +52,7 @@ public enum IccTagDataTypes implements IccTagDataType {
"dataType", 0x64617461) {
@Override
public void dump(final String prefix, final byte[] bytes)
- throws ImageReadException, IOException
- {
+ throws ImageReadException, IOException {
try (InputStream bis = new ByteArrayInputStream(bytes)) {
read4Bytes("type_signature", bis, "ICC: corrupt tag data", ByteOrder.BIG_ENDIAN);
}
@@ -66,8 +64,7 @@ public enum IccTagDataTypes implements IccTagDataType {
"multiLocalizedUnicodeType", (0x6D6C7563)) {
@Override
public void dump(final String prefix, final byte[] bytes)
- throws ImageReadException, IOException
- {
+ throws ImageReadException, IOException {
try (InputStream bis = new ByteArrayInputStream(bytes)) {
read4Bytes("type_signature", bis, "ICC: corrupt tag data", ByteOrder.BIG_ENDIAN);
}
@@ -79,8 +76,7 @@ public enum IccTagDataTypes implements IccTagDataType {
"signatureType", ((0x73696720))) {
@Override
public void dump(final String prefix, final byte[] bytes)
- throws ImageReadException, IOException
- {
+ throws ImageReadException, IOException {
try (InputStream bis = new ByteArrayInputStream(bytes)) {
read4Bytes("type_signature", bis, "ICC: corrupt tag data", ByteOrder.BIG_ENDIAN);
read4Bytes("ignore", bis, "ICC: corrupt tag data", ByteOrder.BIG_ENDIAN);
@@ -104,8 +100,7 @@ public enum IccTagDataTypes implements IccTagDataType {
"textType", 0x74657874) {
@Override
public void dump(final String prefix, final byte[] bytes)
- throws ImageReadException, IOException
- {
+ throws ImageReadException, IOException {
try (InputStream bis = new ByteArrayInputStream(bytes)) {
read4Bytes("type_signature", bis, "ICC: corrupt tag data", ByteOrder.BIG_ENDIAN);
read4Bytes("ignore", bis, "ICC: corrupt tag data", ByteOrder.BIG_ENDIAN);
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/palette/ColorComponent.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/palette/ColorComponent.java b/src/main/java/org/apache/commons/imaging/palette/ColorComponent.java
index ba39bd8..196def8 100644
--- a/src/main/java/org/apache/commons/imaging/palette/ColorComponent.java
+++ b/src/main/java/org/apache/commons/imaging/palette/ColorComponent.java
@@ -24,7 +24,7 @@ enum ColorComponent {
private final int shift;
- private ColorComponent(final int shift) {
+ ColorComponent(final int shift) {
this.shift = shift;
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/palette/ColorCount.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/palette/ColorCount.java b/src/main/java/org/apache/commons/imaging/palette/ColorCount.java
index ed48d4b..b7af6bf 100644
--- a/src/main/java/org/apache/commons/imaging/palette/ColorCount.java
+++ b/src/main/java/org/apache/commons/imaging/palette/ColorCount.java
@@ -24,7 +24,7 @@ class ColorCount {
public final int green;
public final int blue;
- public ColorCount(final int argb) {
+ ColorCount(final int argb) {
this.argb = argb;
alpha = 0xff & (argb >> 24);
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java b/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
index 9d87686..3db565d 100644
--- a/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
+++ b/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java
@@ -46,7 +46,7 @@ class ColorGroup {
public final int diffTotal;
public final int totalPoints;
- public ColorGroup(final List<ColorCount> colorCounts, final boolean ignoreAlpha) throws ImageWriteException {
+ ColorGroup(final List<ColorCount> colorCounts, final boolean ignoreAlpha) throws ImageWriteException {
this.colorCounts = colorCounts;
this.ignoreAlpha = ignoreAlpha;
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/palette/ColorGroupCut.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/palette/ColorGroupCut.java b/src/main/java/org/apache/commons/imaging/palette/ColorGroupCut.java
index f4c3e14..a25548f 100644
--- a/src/main/java/org/apache/commons/imaging/palette/ColorGroupCut.java
+++ b/src/main/java/org/apache/commons/imaging/palette/ColorGroupCut.java
@@ -22,7 +22,7 @@ class ColorGroupCut {
public final ColorComponent mode;
public final int limit;
- public ColorGroupCut(final ColorGroup less, final ColorGroup more, final ColorComponent mode, final int limit) {
+ ColorGroupCut(final ColorGroup less, final ColorGroup more, final ColorComponent mode, final int limit) {
this.less = less;
this.more = more;
this.mode = mode;
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/palette/MedianCutPalette.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/palette/MedianCutPalette.java b/src/main/java/org/apache/commons/imaging/palette/MedianCutPalette.java
index 8bb29b3..977f4b0 100644
--- a/src/main/java/org/apache/commons/imaging/palette/MedianCutPalette.java
+++ b/src/main/java/org/apache/commons/imaging/palette/MedianCutPalette.java
@@ -19,7 +19,7 @@ package org.apache.commons.imaging.palette;
class MedianCutPalette extends SimplePalette {
private final ColorGroup root;
- public MedianCutPalette(final ColorGroup root, final int[] palette) {
+ MedianCutPalette(final ColorGroup root, final int[] palette) {
super(palette);
this.root = root;
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java b/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java
index f8defe9..38647c1 100644
--- a/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java
+++ b/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java
@@ -140,7 +140,7 @@ public class MostPopulatedBoxesMedianCut implements MedianCut {
private final ColorComponent colorComponent;
- public ColorComparer(final ColorComponent colorComponent) {
+ ColorComparer(final ColorComponent colorComponent) {
this.colorComponent = colorComponent;
}
http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/b2eda69e/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java b/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
index d00c62a..0a08dcf 100644
--- a/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
+++ b/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
@@ -262,7 +262,7 @@ public class PaletteFactory {
private final ColorSpaceSubset dst_a;
private final ColorSpaceSubset dst_b;
- public DivisionCandidate(final ColorSpaceSubset dst_a, final ColorSpaceSubset dst_b) {
+ DivisionCandidate(final ColorSpaceSubset dst_a, final ColorSpaceSubset dst_b) {
// this.src = src;
this.dst_a = dst_a;
this.dst_b = dst_b;