The next step IMO would be to break the ant-pattern for good and change types like ImagingConstants from interfaces to classes (or enums if appropriate).
If you are willing to add that to your already Herculean effort, Emannuel, feel free ;) Gary On Wed, Nov 27, 2013 at 1:38 PM, <ebo...@apache.org> wrote: > Author: ebourg > Date: Wed Nov 27 18:38:50 2013 > New Revision: 1546156 > > URL: http://svn.apache.org/r1546156 > Log: > Use static imports instead of interface inheritance > > Modified: > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java > > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -95,7 +95,7 @@ import org.apache.commons.imaging.format > * <p>Additionally, developers creating or enhancing classes derived > * from ImageParser are encouraged to include such checks in their code. > */ > -public abstract class ImageParser extends BinaryFileParser implements > ImagingConstants { > +public abstract class ImageParser extends BinaryFileParser { > > /** > * Gets an array of new instances of all image parsers. > @@ -979,9 +979,9 @@ public abstract class ImageParser extend > * otherwise, false. > */ > public static boolean isStrict(final Map<String, Object> params) { > - if (params == null || !params.containsKey(PARAM_KEY_STRICT)) { > + if (params == null || > !params.containsKey(ImagingConstants.PARAM_KEY_STRICT)) { > return false; > } > - return ((Boolean) params.get(PARAM_KEY_STRICT)).booleanValue(); > + return ((Boolean) > params.get(ImagingConstants.PARAM_KEY_STRICT)).booleanValue(); > } > } > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java > Wed Nov 27 18:38:50 2013 > @@ -40,6 +40,8 @@ import org.apache.commons.imaging.icc.Ic > import org.apache.commons.imaging.icc.IccProfileParser; > import org.apache.commons.imaging.util.IoUtils; > > +import static org.apache.commons.imaging.ImagingConstants.*; > + > /** > * The primary application programming interface (API) to the Imaging > library. > * <p> > @@ -84,7 +86,7 @@ import org.apache.commons.imaging.util.I > * href=" > https://svn.apache.org/repos/asf/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java > ">org.apache.commons.imaging.examples.SampleUsage</a> > * @see <a href="http://commons.apache.org/imaging/formatsupport.html";>Format > Support</a> > */ > -public abstract class Imaging implements ImagingConstants { > +public abstract class Imaging { > private static final int[] MAGIC_NUMBERS_GIF = { 0x47, 0x49, }; > private static final int[] MAGIC_NUMBERS_PNG = { 0x89, 0x50, }; > private static final int[] MAGIC_NUMBERS_JPEG = { 0xff, 0xd8, }; > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -52,6 +52,7 @@ import org.apache.commons.imaging.palett > import org.apache.commons.imaging.palette.SimplePalette; > import org.apache.commons.imaging.util.IoUtils; > > +import static org.apache.commons.imaging.ImagingConstants.*; > import static org.apache.commons.imaging.common.BinaryFunctions.*; > > public class BmpImageParser extends ImageParser { > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -43,6 +43,7 @@ import org.apache.commons.imaging.format > import org.apache.commons.imaging.formats.pcx.PcxImageParser; > import org.apache.commons.imaging.util.IoUtils; > > +import static org.apache.commons.imaging.ImagingConstants.*; > import static org.apache.commons.imaging.common.BinaryFunctions.*; > > public class DcxImageParser extends ImageParser { > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -47,6 +47,7 @@ import org.apache.commons.imaging.palett > import org.apache.commons.imaging.palette.PaletteFactory; > import org.apache.commons.imaging.util.IoUtils; > > +import static org.apache.commons.imaging.ImagingConstants.*; > import static org.apache.commons.imaging.common.BinaryFunctions.*; > > public class GifImageParser extends ImageParser { > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -39,6 +39,7 @@ import org.apache.commons.imaging.common > import org.apache.commons.imaging.common.bytesource.ByteSource; > import org.apache.commons.imaging.util.IoUtils; > > +import static org.apache.commons.imaging.ImagingConstants.*; > import static org.apache.commons.imaging.common.BinaryFunctions.*; > > public class IcnsImageParser extends ImageParser { > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -46,6 +46,7 @@ import org.apache.commons.imaging.palett > import org.apache.commons.imaging.palette.SimplePalette; > import org.apache.commons.imaging.util.IoUtils; > > +import static org.apache.commons.imaging.ImagingConstants.*; > import static org.apache.commons.imaging.common.BinaryFunctions.*; > > public class IcoImageParser extends ImageParser { > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -57,6 +57,7 @@ import org.apache.commons.imaging.format > import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; > import org.apache.commons.imaging.util.Debug; > > +import static org.apache.commons.imaging.ImagingConstants.*; > import static org.apache.commons.imaging.common.BinaryFunctions.*; > > public class JpegImageParser extends ImageParser { > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -48,6 +48,7 @@ import org.apache.commons.imaging.common > import org.apache.commons.imaging.common.bytesource.ByteSource; > import org.apache.commons.imaging.util.IoUtils; > > +import static org.apache.commons.imaging.ImagingConstants.*; > import static org.apache.commons.imaging.common.BinaryFunctions.*; > import static org.apache.commons.imaging.common.ByteConversions.*; > > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -61,6 +61,7 @@ import org.apache.commons.imaging.format > import org.apache.commons.imaging.icc.IccProfileParser; > import org.apache.commons.imaging.util.IoUtils; > > +import static org.apache.commons.imaging.ImagingConstants.*; > import static org.apache.commons.imaging.common.BinaryFunctions.*; > > public class PngImageParser extends ImageParser { > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -41,6 +41,7 @@ import org.apache.commons.imaging.common > import org.apache.commons.imaging.palette.PaletteFactory; > import org.apache.commons.imaging.util.IoUtils; > > +import static org.apache.commons.imaging.ImagingConstants.*; > import static org.apache.commons.imaging.common.BinaryFunctions.*; > > public class PnmImageParser extends ImageParser { > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java > Wed Nov 27 18:38:50 2013 > @@ -51,8 +51,7 @@ import org.apache.commons.imaging.format > import org.apache.commons.imaging.formats.tiff.write.TiffOutputField; > import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet; > > -public class TiffImageMetadata extends ImageMetadata implements > - TiffDirectoryConstants { > +public class TiffImageMetadata extends ImageMetadata { > public final TiffContents contents; > private static final Map<Object, Integer> TAG_COUNTS = > countTags(AllTagConstants.ALL_TAGS); > > @@ -467,7 +466,7 @@ public class TiffImageMetadata extends I > } > > public GPSInfo getGPS() throws ImageReadException { > - final TiffDirectory gpsDirectory = > findDirectory(DIRECTORY_TYPE_GPS); > + final TiffDirectory gpsDirectory = > findDirectory(TiffDirectoryConstants.DIRECTORY_TYPE_GPS); > if (null == gpsDirectory) { > return null; > } > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -53,7 +53,9 @@ import org.apache.commons.imaging.format > import > org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreterYCbCr; > import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterLossy; > > -public class TiffImageParser extends ImageParser implements TiffConstants > { > +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", }; > > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java > Wed Nov 27 18:38:50 2013 > @@ -31,7 +31,6 @@ import org.apache.commons.imaging.common > import org.apache.commons.imaging.common.bytesource.ByteSourceFile; > import org.apache.commons.imaging.formats.jpeg.JpegConstants; > import > org.apache.commons.imaging.formats.tiff.TiffDirectory.ImageDataElement; > -import org.apache.commons.imaging.formats.tiff.constants.TiffConstants; > import > org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryConstants; > import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; > import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType; > @@ -39,8 +38,9 @@ import org.apache.commons.imaging.format > import org.apache.commons.imaging.util.IoUtils; > > import static org.apache.commons.imaging.common.BinaryFunctions.*; > +import static > org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*; > > -public class TiffReader extends BinaryFileParser implements TiffConstants > { > +public class TiffReader extends BinaryFileParser { > > private final boolean strict; > > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java > Wed Nov 27 18:38:50 2013 > @@ -22,7 +22,7 @@ import java.util.List; > import org.apache.commons.imaging.common.BinaryConstant; > import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo; > > -public final class TagConstantsUtils implements TiffDirectoryConstants { > +public final class TagConstantsUtils { > private static final TiffDirectoryType[] TIFF_DIRECTORY_TYPES = > TiffDirectoryType > .values(); > > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java > Wed Nov 27 18:38:50 2013 > @@ -30,11 +30,12 @@ import org.apache.commons.imaging.common > import org.apache.commons.imaging.common.mylzw.MyLzwDecompressor; > import org.apache.commons.imaging.formats.tiff.TiffDirectory; > import org.apache.commons.imaging.formats.tiff.TiffField; > -import org.apache.commons.imaging.formats.tiff.constants.TiffConstants; > import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; > import > org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter; > > -public abstract class DataReader implements TiffConstants { > +import static > org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*; > + > +public abstract class DataReader { > protected final TiffDirectory directory; > protected final PhotometricInterpreter photometricInterpreter; > protected final int[] bitsPerSample; > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java > Wed Nov 27 18:38:50 2013 > @@ -37,10 +37,11 @@ import org.apache.commons.imaging.common > import org.apache.commons.imaging.formats.tiff.TiffElement; > import org.apache.commons.imaging.formats.tiff.TiffImageData; > import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants; > -import org.apache.commons.imaging.formats.tiff.constants.TiffConstants; > import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; > > -public abstract class TiffImageWriterBase implements TiffConstants { > +import static > org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*; > + > +public abstract class TiffImageWriterBase { > > protected final ByteOrder byteOrder; > > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java > Wed Nov 27 18:38:50 2013 > @@ -41,6 +41,8 @@ import org.apache.commons.imaging.format > import org.apache.commons.imaging.formats.tiff.TiffImageData; > import org.apache.commons.imaging.formats.tiff.TiffReader; > > +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>() { > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java > Wed Nov 27 18:38:50 2013 > @@ -24,6 +24,8 @@ 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() { > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java > Wed Nov 27 18:38:50 2013 > @@ -31,7 +31,6 @@ import org.apache.commons.imaging.format > import org.apache.commons.imaging.formats.tiff.TiffElement; > import org.apache.commons.imaging.formats.tiff.TiffImageData; > import > org.apache.commons.imaging.formats.tiff.constants.TagConstantsUtils; > -import org.apache.commons.imaging.formats.tiff.constants.TiffConstants; > import > org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType; > import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; > import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType; > @@ -56,8 +55,9 @@ import org.apache.commons.imaging.format > import > org.apache.commons.imaging.formats.tiff.taginfos.TagInfoShortOrRational; > import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoXpString; > > -public final class TiffOutputDirectory extends TiffOutputItem implements > - TiffConstants { > +import static > org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*; > + > +public final class TiffOutputDirectory extends TiffOutputItem { > public final int type; > private final List<TiffOutputField> fields = new > ArrayList<TiffOutputField>(); > private final ByteOrder byteOrder; > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java > Wed Nov 27 18:38:50 2013 > @@ -22,11 +22,12 @@ import java.util.Arrays; > > import org.apache.commons.imaging.ImageWriteException; > import org.apache.commons.imaging.common.BinaryOutputStream; > -import org.apache.commons.imaging.formats.tiff.constants.TiffConstants; > import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType; > import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo; > > -public class TiffOutputField implements TiffConstants { > +import static > org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*; > + > +public class TiffOutputField { > public final int tag; > public final TagInfo tagInfo; > public final FieldType fieldType; > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputItem.java > Wed Nov 27 18:38:50 2013 > @@ -20,9 +20,8 @@ import java.io.IOException; > > import org.apache.commons.imaging.ImageWriteException; > import org.apache.commons.imaging.common.BinaryOutputStream; > -import org.apache.commons.imaging.formats.tiff.constants.AllTagConstants; > > -abstract class TiffOutputItem implements AllTagConstants { > +abstract class TiffOutputItem { > public static final long UNDEFINED_VALUE = -1; > > private long offset = UNDEFINED_VALUE; > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java > Wed Nov 27 18:38:50 2013 > @@ -23,17 +23,18 @@ import java.util.List; > import org.apache.commons.imaging.ImageWriteException; > import org.apache.commons.imaging.common.RationalNumber; > import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants; > -import org.apache.commons.imaging.formats.tiff.constants.TiffConstants; > import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo; > import org.apache.commons.imaging.util.Debug; > > -public final class TiffOutputSet implements TiffConstants { > +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<TiffOutputDirectory>(); > private static final String NEWLINE = > System.getProperty("line.separator"); > > public TiffOutputSet() { > - this(TiffConstants.DEFAULT_TIFF_BYTE_ORDER); > + this(DEFAULT_TIFF_BYTE_ORDER); > } > > public TiffOutputSet(final ByteOrder byteOrder) { > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java > Wed Nov 27 18:38:50 2013 > @@ -22,10 +22,9 @@ import java.util.List; > import java.util.Map; > > import org.apache.commons.imaging.ImageWriteException; > -import org.apache.commons.imaging.formats.tiff.constants.TiffConstants; > import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType; > > -class TiffOutputSummary implements TiffConstants { > +class TiffOutputSummary { > public final ByteOrder byteOrder; > public final TiffOutputDirectory rootDirectory; > public final Map<Integer, TiffOutputDirectory> directoryTypeMap; > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -41,6 +41,7 @@ import org.apache.commons.imaging.common > import org.apache.commons.imaging.common.bytesource.ByteSource; > import org.apache.commons.imaging.util.IoUtils; > > +import static org.apache.commons.imaging.ImagingConstants.*; > import static org.apache.commons.imaging.common.BinaryFunctions.*; > > public class WbmpImageParser extends ImageParser { > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -47,6 +47,8 @@ import org.apache.commons.imaging.common > import org.apache.commons.imaging.common.bytesource.ByteSource; > import org.apache.commons.imaging.util.IoUtils; > > +import static org.apache.commons.imaging.ImagingConstants.*; > + > public class XbmImageParser extends ImageParser { > private static final String DEFAULT_EXTENSION = ".xbm"; > private static final String[] ACCEPTED_EXTENSIONS = { ".xbm", }; > > Modified: > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java > URL: > http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java?rev=1546156&r1=1546155&r2=1546156&view=diff > > ============================================================================== > --- > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java > (original) > +++ > commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java > Wed Nov 27 18:38:50 2013 > @@ -52,6 +52,8 @@ import org.apache.commons.imaging.palett > import org.apache.commons.imaging.palette.SimplePalette; > import org.apache.commons.imaging.util.IoUtils; > > +import static org.apache.commons.imaging.ImagingConstants.*; > + > public class XpmImageParser extends ImageParser { > private static final String DEFAULT_EXTENSION = ".xpm"; > private static final String[] ACCEPTED_EXTENSIONS = { ".xpm", }; > > > -- E-Mail: garydgreg...@gmail.com | ggreg...@apache.org Java Persistence with Hibernate, Second Edition<http://www.manning.com/bauer3/> JUnit in Action, Second Edition <http://www.manning.com/tahchiev/> Spring Batch in Action <http://www.manning.com/templier/> Blog: http://garygregory.wordpress.com Home: http://garygregory.com/ Tweet! http://twitter.com/GaryGregory
