You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2014/12/29 13:07:55 UTC
svn commit: r1648312 [1/2] - in /commons/proper/imaging/trunk/src:
main/java/org/apache/commons/imaging/
main/java/org/apache/commons/imaging/common/
main/java/org/apache/commons/imaging/formats/bmp/
main/java/org/apache/commons/imaging/formats/dcx/ ma...
Author: britter
Date: Mon Dec 29 12:07:54 2014
New Revision: 1648312
URL: http://svn.apache.org/r1648312
Log:
Don't prefix interfaces with 'I'
Added:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BufferedImageFactory.java
- copied, changed from r1648255, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/IBufferedImageFactory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
- copied, changed from r1648255, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java
- copied, changed from r1648255, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/IImageMetadata.java
Removed:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/IBufferedImageFactory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/IImageMetadata.java
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/common/RgbBufferedImageFactory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/SimpleBufferedImageFactory.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/JpegImageMetadata.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/jpeg/JpegPhotoshopMetadata.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/psd/PsdImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.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/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
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -29,8 +29,8 @@ import java.util.Locale;
import java.util.Map;
import org.apache.commons.imaging.common.BinaryFileParser;
-import org.apache.commons.imaging.common.IBufferedImageFactory;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.BufferedImageFactory;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.SimpleBufferedImageFactory;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.common.bytesource.ByteSourceArray;
@@ -140,7 +140,7 @@ public abstract class ImageParser extend
* implementation.
* @throws IOException In the event of unsuccessful data read operation.
*/
- public final IImageMetadata getMetadata(final ByteSource byteSource) throws ImageReadException, IOException {
+ public final ImageMetadata getMetadata(final ByteSource byteSource) throws ImageReadException, IOException {
return getMetadata(byteSource, null);
}
@@ -169,7 +169,7 @@ public abstract class ImageParser extend
* implementation.
* @throws IOException In the event of unsuccessful data read operation.
*/
- public abstract IImageMetadata getMetadata(ByteSource byteSource, Map<String, Object> params)
+ public abstract ImageMetadata getMetadata(ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException;
/**
@@ -187,7 +187,7 @@ public abstract class ImageParser extend
* parser implementation.
* @throws IOException In the event of unsuccessful data read operation.
*/
- public final IImageMetadata getMetadata(final byte[] bytes) throws ImageReadException, IOException {
+ public final ImageMetadata getMetadata(final byte[] bytes) throws ImageReadException, IOException {
return getMetadata(bytes, null);
}
@@ -215,7 +215,7 @@ public abstract class ImageParser extend
* parser implementation.
* @throws IOException In the event of unsuccessful data read operation.
*/
- public final IImageMetadata getMetadata(final byte[] bytes, final Map<String, Object> params)
+ public final ImageMetadata getMetadata(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getMetadata(new ByteSourceArray(bytes), params);
}
@@ -235,7 +235,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful file read or
* access operation.
*/
- public final IImageMetadata getMetadata(final File file) throws ImageReadException, IOException {
+ public final ImageMetadata getMetadata(final File file) throws ImageReadException, IOException {
return getMetadata(file, null);
}
@@ -264,7 +264,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful file read or
* access operation.
*/
- public final IImageMetadata getMetadata(final File file, final Map<String, Object> params)
+ public final ImageMetadata getMetadata(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
if (getDebug()) {
System.out.println(getName() + ".getMetadata" + ": "
@@ -953,12 +953,12 @@ public abstract class ImageParser extend
* @param params A valid Map object, or a null.
* @return A valid instance of an implementation of a IBufferedImageFactory.
*/
- protected IBufferedImageFactory getBufferedImageFactory(final Map<String, Object> params) {
+ protected BufferedImageFactory getBufferedImageFactory(final Map<String, Object> params) {
if (params == null) {
return new SimpleBufferedImageFactory();
}
- final IBufferedImageFactory result = (IBufferedImageFactory) params
+ final BufferedImageFactory result = (BufferedImageFactory) params
.get(ImagingConstants.BUFFERED_IMAGE_FACTORY);
if (null != result) {
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -31,7 +31,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.common.bytesource.ByteSourceArray;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
@@ -977,9 +977,9 @@ public final class Imaging {
* @param bytes
* Byte array containing an image file.
* @return An instance of IImageMetadata.
- * @see IImageMetadata
+ * @see org.apache.commons.imaging.common.ImageMetadata
*/
- public static IImageMetadata getMetadata(final byte[] bytes)
+ public static ImageMetadata getMetadata(final byte[] bytes)
throws ImageReadException, IOException {
return getMetadata(bytes, null);
}
@@ -1002,9 +1002,9 @@ public final class Imaging {
* @param params
* Map of optional parameters, defined in ImagingConstants.
* @return An instance of IImageMetadata.
- * @see IImageMetadata
+ * @see org.apache.commons.imaging.common.ImageMetadata
*/
- public static IImageMetadata getMetadata(final byte[] bytes, final Map<String, Object> params)
+ public static ImageMetadata getMetadata(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getMetadata(new ByteSourceArray(bytes), params);
}
@@ -1027,9 +1027,9 @@ public final class Imaging {
* @param filename
* Filename associated with image data (optional).
* @return An instance of IImageMetadata.
- * @see IImageMetadata
+ * @see org.apache.commons.imaging.common.ImageMetadata
*/
- public static IImageMetadata getMetadata(final InputStream is, final String filename)
+ public static ImageMetadata getMetadata(final InputStream is, final String filename)
throws ImageReadException, IOException {
return getMetadata(is, filename, null);
}
@@ -1054,9 +1054,9 @@ public final class Imaging {
* @param params
* Map of optional parameters, defined in ImagingConstants.
* @return An instance of IImageMetadata.
- * @see IImageMetadata
+ * @see org.apache.commons.imaging.common.ImageMetadata
*/
- public static IImageMetadata getMetadata(final InputStream is, final String filename,
+ public static ImageMetadata getMetadata(final InputStream is, final String filename,
final Map<String, Object> params) throws ImageReadException, IOException {
return getMetadata(new ByteSourceInputStream(is, filename), params);
}
@@ -1077,9 +1077,9 @@ public final class Imaging {
* @param file
* File containing image data.
* @return An instance of IImageMetadata.
- * @see IImageMetadata
+ * @see org.apache.commons.imaging.common.ImageMetadata
*/
- public static IImageMetadata getMetadata(final File file)
+ public static ImageMetadata getMetadata(final File file)
throws ImageReadException, IOException {
return getMetadata(file, null);
}
@@ -1102,14 +1102,14 @@ public final class Imaging {
* @param params
* Map of optional parameters, defined in ImagingConstants.
* @return An instance of IImageMetadata.
- * @see IImageMetadata
+ * @see org.apache.commons.imaging.common.ImageMetadata
*/
- public static IImageMetadata getMetadata(final File file, final Map<String, Object> params)
+ public static ImageMetadata getMetadata(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
return getMetadata(new ByteSourceFile(file), params);
}
- private static IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ private static ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final ImageParser imageParser = getImageParser(byteSource);
Copied: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BufferedImageFactory.java (from r1648255, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/IBufferedImageFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BufferedImageFactory.java?p2=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BufferedImageFactory.java&p1=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/IBufferedImageFactory.java&r1=1648255&r2=1648312&rev=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/IBufferedImageFactory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BufferedImageFactory.java Mon Dec 29 12:07:54 2014
@@ -19,7 +19,7 @@ package org.apache.commons.imaging.commo
import java.awt.image.BufferedImage;
-public interface IBufferedImageFactory {
+public interface BufferedImageFactory {
BufferedImage getColorBufferedImage(int width, int height,
boolean hasAlpha);
Copied: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java (from r1648255, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java)
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java?p2=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java&p1=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java&r1=1648255&r2=1648312&rev=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java Mon Dec 29 12:07:54 2014
@@ -19,20 +19,20 @@ package org.apache.commons.imaging.commo
import java.util.ArrayList;
import java.util.List;
-public class ImageMetadata implements IImageMetadata {
+public class GenericImageMetadata implements ImageMetadata {
private static final String NEWLINE = System.getProperty("line.separator");
- private final List<IImageMetadataItem> items = new ArrayList<IImageMetadataItem>();
+ private final List<ImageMetadataItem> items = new ArrayList<ImageMetadataItem>();
public void add(final String keyword, final String text) {
- add(new Item(keyword, text));
+ add(new GenericImageMetadataItem(keyword, text));
}
- public void add(final IImageMetadataItem item) {
+ public void add(final ImageMetadataItem item) {
items.add(item);
}
- public List<? extends IImageMetadataItem> getItems() {
- return new ArrayList<IImageMetadataItem>(items);
+ public List<? extends ImageMetadataItem> getItems() {
+ return new ArrayList<ImageMetadataItem>(items);
}
@Override
@@ -53,7 +53,7 @@ public class ImageMetadata implements II
// if (null != prefix)
// result.append(prefix);
- final ImageMetadata.IImageMetadataItem item = items.get(i);
+ final ImageMetadataItem item = items.get(i);
result.append(item.toString(prefix + "\t"));
// Debug.debug("prefix", prefix);
@@ -63,11 +63,11 @@ public class ImageMetadata implements II
return result.toString();
}
- public static class Item implements IImageMetadataItem {
+ public static class GenericImageMetadataItem implements ImageMetadataItem {
private final String keyword;
private final String text;
- public Item(final String keyword, final String text) {
+ public GenericImageMetadataItem(final String keyword, final String text) {
this.keyword = keyword;
this.text = text;
}
Copied: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java (from r1648255, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/IImageMetadata.java)
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java?p2=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java&p1=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/IImageMetadata.java&r1=1648255&r2=1648312&rev=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/IImageMetadata.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java Mon Dec 29 12:07:54 2014
@@ -18,12 +18,12 @@ package org.apache.commons.imaging.commo
import java.util.List;
-public interface IImageMetadata {
+public interface ImageMetadata {
String toString(String prefix);
- List<? extends IImageMetadataItem> getItems();
+ List<? extends ImageMetadataItem> getItems();
- interface IImageMetadataItem {
+ interface ImageMetadataItem {
String toString(String prefix);
String toString();
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RgbBufferedImageFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RgbBufferedImageFactory.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RgbBufferedImageFactory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RgbBufferedImageFactory.java Mon Dec 29 12:07:54 2014
@@ -19,7 +19,7 @@ package org.apache.commons.imaging.commo
import java.awt.image.BufferedImage;
-public class RgbBufferedImageFactory implements IBufferedImageFactory {
+public class RgbBufferedImageFactory implements BufferedImageFactory {
public BufferedImage getColorBufferedImage(final int width, final int height,
final boolean hasAlpha) {
if (hasAlpha) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/SimpleBufferedImageFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/SimpleBufferedImageFactory.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/SimpleBufferedImageFactory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/SimpleBufferedImageFactory.java Mon Dec 29 12:07:54 2014
@@ -19,7 +19,7 @@ package org.apache.commons.imaging.commo
import java.awt.image.BufferedImage;
-public class SimpleBufferedImageFactory implements IBufferedImageFactory {
+public class SimpleBufferedImageFactory implements BufferedImageFactory {
public BufferedImage getColorBufferedImage(final int width, final int height,
final boolean hasAlpha) {
if (hasAlpha) {
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -38,7 +38,7 @@ import org.apache.commons.imaging.ImageR
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.PixelDensity;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.ImageBuilder;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.palette.PaletteFactory;
@@ -519,7 +519,7 @@ public class BmpImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
// TODO this should throw UnsupportedOperationException, but RoundtripTest has to be refactored completely before this can be changed
return null;
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -36,7 +36,7 @@ import org.apache.commons.imaging.ImageR
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.PixelDensity;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.common.bytesource.ByteSourceInputStream;
import org.apache.commons.imaging.formats.pcx.PcxConstants;
@@ -79,7 +79,7 @@ public class DcxImageParser extends Imag
// FIXME should throw UOE
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -38,7 +38,7 @@ import org.apache.commons.imaging.ImageP
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.ImageBuilder;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.common.mylzw.MyLzwCompressor;
@@ -497,7 +497,7 @@ public class GifImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -35,7 +35,7 @@ import org.apache.commons.imaging.ImageP
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.util.IoUtils;
@@ -72,7 +72,7 @@ public class IcnsImageParser extends Ima
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -39,7 +39,7 @@ import org.apache.commons.imaging.ImageW
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.PixelDensity;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.formats.bmp.BmpImageParser;
import org.apache.commons.imaging.palette.PaletteFactory;
@@ -79,7 +79,7 @@ public class IcoImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java Mon Dec 29 12:07:54 2014
@@ -28,7 +28,7 @@ import javax.imageio.ImageIO;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.formats.tiff.JpegImageData;
import org.apache.commons.imaging.formats.tiff.TiffField;
import org.apache.commons.imaging.formats.tiff.TiffImageData;
@@ -36,7 +36,7 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo;
import org.apache.commons.imaging.util.Debug;
-public class JpegImageMetadata implements IImageMetadata {
+public class JpegImageMetadata implements ImageMetadata {
private final JpegPhotoshopMetadata photoshop;
private final TiffImageMetadata exif;
private static final String NEWLINE = System.getProperty("line.separator");
@@ -99,8 +99,8 @@ public class JpegImageMetadata implement
if (exif == null) {
return null;
}
- final List<? extends IImageMetadataItem> dirs = exif.getDirectories();
- for (IImageMetadataItem d : dirs) {
+ final List<? extends ImageMetadataItem> dirs = exif.getDirectories();
+ for (ImageMetadataItem d : dirs) {
final TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory) d;
byte[] data = null;
@@ -131,8 +131,8 @@ public class JpegImageMetadata implement
return null;
}
- final List<? extends IImageMetadataItem> dirs = exif.getDirectories();
- for (IImageMetadataItem d : dirs) {
+ final List<? extends ImageMetadataItem> dirs = exif.getDirectories();
+ for (ImageMetadataItem d : dirs) {
final TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory) d;
// Debug.debug("dir", dir);
BufferedImage image = dir.getThumbnail();
@@ -171,8 +171,8 @@ public class JpegImageMetadata implement
if (exif == null) {
return null;
}
- final List<? extends IImageMetadataItem> dirs = exif.getDirectories();
- for (IImageMetadataItem d : dirs) {
+ final List<? extends ImageMetadataItem> dirs = exif.getDirectories();
+ for (ImageMetadataItem d : dirs) {
final TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory) d;
// Debug.debug("dir", dir);
final TiffImageData rawImageData = dir.getTiffImageData();
@@ -184,8 +184,8 @@ public class JpegImageMetadata implement
return null;
}
- public List<IImageMetadataItem> getItems() {
- final List<IImageMetadataItem> result = new ArrayList<IImageMetadataItem>();
+ public List<ImageMetadataItem> getItems() {
+ final List<ImageMetadataItem> result = new ArrayList<ImageMetadataItem>();
if (null != exif) {
result.addAll(exif.getItems());
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -35,7 +35,7 @@ import org.apache.commons.imaging.ImageF
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.formats.jpeg.decoder.JpegDecoder;
import org.apache.commons.imaging.formats.jpeg.iptc.IptcParser;
@@ -307,7 +307,7 @@ public class JpegImageParser extends Ima
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final TiffImageMetadata exif = getExifMetadata(byteSource, params);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java Mon Dec 29 12:07:54 2014
@@ -19,13 +19,13 @@ package org.apache.commons.imaging.forma
import java.util.Collections;
import java.util.List;
-import org.apache.commons.imaging.common.ImageMetadata;
+import org.apache.commons.imaging.common.GenericImageMetadata;
import org.apache.commons.imaging.formats.jpeg.iptc.IptcRecord;
import org.apache.commons.imaging.formats.jpeg.iptc.IptcTypes;
import org.apache.commons.imaging.formats.jpeg.iptc.PhotoshopApp13Data;
import org.apache.commons.imaging.util.Debug;
-public class JpegPhotoshopMetadata extends ImageMetadata {
+public class JpegPhotoshopMetadata extends GenericImageMetadata {
public final PhotoshopApp13Data photoshopApp13Data;
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -44,7 +44,7 @@ import org.apache.commons.imaging.ImageI
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.util.IoUtils;
@@ -94,7 +94,7 @@ public class PcxImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -41,8 +41,8 @@ import org.apache.commons.imaging.ImageI
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.common.ImageMetadata;
+import org.apache.commons.imaging.common.GenericImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.formats.png.chunks.PngChunk;
import org.apache.commons.imaging.formats.png.chunks.PngChunkGama;
@@ -281,7 +281,7 @@ public class PngImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final List<PngChunk> chunks = readChunks(byteSource, new ChunkType[] { ChunkType.tEXt, ChunkType.zTXt, }, true);
@@ -289,7 +289,7 @@ public class PngImageParser extends Imag
return null;
}
- final ImageMetadata result = new ImageMetadata();
+ final GenericImageMetadata result = new GenericImageMetadata();
for (PngChunk chunk : chunks) {
final PngTextChunk textChunk = (PngTextChunk) chunk;
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -35,7 +35,7 @@ import org.apache.commons.imaging.ImageI
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.ImageBuilder;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.palette.PaletteFactory;
@@ -219,7 +219,7 @@ public class PnmImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java Mon Dec 29 12:07:54 2014
@@ -33,7 +33,7 @@ import org.apache.commons.imaging.ImageF
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.formats.psd.dataparsers.DataParser;
import org.apache.commons.imaging.formats.psd.dataparsers.DataParserBitmap;
@@ -442,7 +442,7 @@ public class PsdImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java Mon Dec 29 12:07:54 2014
@@ -36,7 +36,7 @@ import org.apache.commons.imaging.ImageF
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.util.IoUtils;
@@ -72,12 +72,12 @@ public class RgbeImageParser extends Ima
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final RgbeInfo info = new RgbeInfo(byteSource);
boolean canThrow = false;
try {
- final IImageMetadata ret = info.getMetadata();
+ final ImageMetadata ret = info.getMetadata();
canThrow = true;
return ret;
} finally {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java Mon Dec 29 12:07:54 2014
@@ -26,8 +26,8 @@ import java.util.regex.Pattern;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.BinaryFunctions;
import org.apache.commons.imaging.common.ByteConversions;
-import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.common.ImageMetadata;
+import org.apache.commons.imaging.common.GenericImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
class RgbeInfo implements Closeable {
@@ -38,7 +38,7 @@ class RgbeInfo implements Closeable {
private static final Pattern RESOLUTION_STRING = Pattern.compile("-Y (\\d+) \\+X (\\d+)");
private final InputStream in;
- private ImageMetadata metadata;
+ private GenericImageMetadata metadata;
private int width = -1;
private int height = -1;
private static final byte[] TWO_TWO = new byte[] { 0x2, 0x2 };
@@ -47,7 +47,7 @@ class RgbeInfo implements Closeable {
this.in = byteSource.getInputStream();
}
- IImageMetadata getMetadata() throws IOException, ImageReadException {
+ ImageMetadata getMetadata() throws IOException, ImageReadException {
if (null == metadata) {
readMetadata();
}
@@ -101,7 +101,7 @@ class RgbeInfo implements Closeable {
throw new ImageReadException("Not a valid HDR: Incorrect Header");
}
- metadata = new ImageMetadata();
+ metadata = new GenericImageMetadata();
String info = reader.readNextLine();
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -26,7 +26,7 @@ import java.util.Map;
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.GenericImageMetadata;
import org.apache.commons.imaging.common.RationalNumber;
import org.apache.commons.imaging.formats.tiff.constants.AllTagConstants;
import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants;
@@ -51,7 +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 {
+public class TiffImageMetadata extends GenericImageMetadata {
public final TiffContents contents;
private static final Map<Object, Integer> TAG_COUNTS = countTags(AllTagConstants.ALL_TAGS);
@@ -74,8 +74,8 @@ public class TiffImageMetadata extends I
return map;
}
- public static class Directory extends ImageMetadata implements
- ImageMetadata.IImageMetadataItem {
+ public static class Directory extends GenericImageMetadata implements
+ ImageMetadataItem {
// private BufferedImage thumbnail = null;
public final int type;
@@ -90,7 +90,7 @@ public class TiffImageMetadata extends I
}
public void add(final TiffField entry) {
- add(new TiffImageMetadata.Item(entry));
+ add(new TiffMetadataItem(entry));
}
public BufferedImage getThumbnail() throws ImageReadException,
@@ -129,9 +129,9 @@ public class TiffImageMetadata extends I
final TiffOutputDirectory dstDir = new TiffOutputDirectory(type,
byteOrder);
- final List<? extends IImageMetadataItem> entries = getItems();
- for (IImageMetadataItem entry : entries) {
- final TiffImageMetadata.Item item = (TiffImageMetadata.Item) entry;
+ final List<? extends ImageMetadataItem> entries = getItems();
+ for (ImageMetadataItem entry : entries) {
+ final TiffMetadataItem item = (TiffMetadataItem) entry;
final TiffField srcField = item.getTiffField();
if (null != dstDir.findField(srcField.getTag())) {
@@ -179,16 +179,16 @@ public class TiffImageMetadata extends I
}
- public List<? extends IImageMetadataItem> getDirectories() {
+ public List<? extends ImageMetadataItem> getDirectories() {
return super.getItems();
}
@Override
- public List<? extends IImageMetadataItem> getItems() {
- final List<IImageMetadataItem> result = new ArrayList<IImageMetadataItem>();
+ public List<? extends ImageMetadataItem> getItems() {
+ final List<ImageMetadataItem> result = new ArrayList<ImageMetadataItem>();
- final List<? extends IImageMetadataItem> items = super.getItems();
- for (IImageMetadataItem item : items) {
+ final List<? extends ImageMetadataItem> items = super.getItems();
+ for (ImageMetadataItem item : items) {
final Directory dir = (Directory) item;
result.addAll(dir.getItems());
}
@@ -196,10 +196,10 @@ public class TiffImageMetadata extends I
return result;
}
- public static class Item extends ImageMetadata.Item {
+ public static class TiffMetadataItem extends GenericImageMetadataItem {
private final TiffField entry;
- public Item(final TiffField entry) {
+ public TiffMetadataItem(final TiffField entry) {
// super(entry.getTagName() + " (" + entry.getFieldTypeName() + ")",
super(entry.getTagName(), entry.getValueDescription());
this.entry = entry;
@@ -215,8 +215,8 @@ public class TiffImageMetadata extends I
final ByteOrder byteOrder = contents.header.byteOrder;
final TiffOutputSet result = new TiffOutputSet(byteOrder);
- final List<? extends IImageMetadataItem> srcDirs = getDirectories();
- for (IImageMetadataItem srcDir1 : srcDirs) {
+ final List<? extends ImageMetadataItem> srcDirs = getDirectories();
+ for (ImageMetadataItem srcDir1 : srcDirs) {
final Directory srcDir = (Directory) srcDir1;
if (null != result.findDirectory(srcDir.type)) {
@@ -244,10 +244,10 @@ public class TiffImageMetadata extends I
final Integer tagCount = TAG_COUNTS.get(tagInfo.tag);
final int tagsMatching = tagCount == null ? 0 : tagCount;
- final List<? extends IImageMetadataItem> directories = getDirectories();
+ final List<? extends ImageMetadataItem> directories = getDirectories();
if (exactDirectoryMatch
|| tagInfo.directoryType != TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN) {
- for (IImageMetadataItem directory1 : directories) {
+ for (ImageMetadataItem directory1 : directories) {
final Directory directory = (Directory) directory1;
if (directory.type == tagInfo.directoryType.directoryType) {
final TiffField field = directory.findField(tagInfo);
@@ -259,7 +259,7 @@ public class TiffImageMetadata extends I
if (exactDirectoryMatch || tagsMatching > 1) {
return null;
}
- for (IImageMetadataItem directory1 : directories) {
+ for (ImageMetadataItem directory1 : directories) {
final Directory directory = (Directory) directory1;
if (tagInfo.directoryType.isImageDirectory()
&& directory.type >= 0) {
@@ -277,7 +277,7 @@ public class TiffImageMetadata extends I
}
}
- for (IImageMetadataItem directory1 : directories) {
+ for (ImageMetadataItem directory1 : directories) {
final Directory directory = (Directory) directory1;
final TiffField field = directory.findField(tagInfo);
if (field != null) {
@@ -445,8 +445,8 @@ public class TiffImageMetadata extends I
}
public TiffDirectory findDirectory(final int directoryType) {
- final List<? extends IImageMetadataItem> directories = getDirectories();
- for (IImageMetadataItem directory1 : directories) {
+ final List<? extends ImageMetadataItem> directories = getDirectories();
+ for (ImageMetadataItem directory1 : directories) {
final Directory directory = (Directory) directory1;
if (directory.type == directoryType) {
return directory.directory;
@@ -457,8 +457,8 @@ public class TiffImageMetadata extends I
public List<TiffField> getAllFields() {
final List<TiffField> result = new ArrayList<TiffField>();
- final List<? extends IImageMetadataItem> directories = getDirectories();
- for (IImageMetadataItem directory1 : directories) {
+ final List<? extends ImageMetadataItem> directories = getDirectories();
+ for (ImageMetadataItem directory1 : directories) {
final Directory directory = (Directory) directory1;
result.addAll(directory.getAllFields());
}
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -35,7 +35,7 @@ import org.apache.commons.imaging.ImageI
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.ImageBuilder;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.formats.tiff.TiffDirectory.ImageDataElement;
@@ -116,7 +116,7 @@ public class TiffImageParser extends Ima
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final FormatCompliance formatCompliance = FormatCompliance.getDefault();
final TiffReader tiffReader = new TiffReader(isStrict(params));
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -37,7 +37,7 @@ import org.apache.commons.imaging.ImageI
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.util.IoUtils;
@@ -70,7 +70,7 @@ public class WbmpImageParser extends Ima
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -43,7 +43,7 @@ import org.apache.commons.imaging.ImageP
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.common.BasicCParser;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.util.IoUtils;
@@ -75,7 +75,7 @@ public class XbmImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
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=1648312&r1=1648311&r2=1648312&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 Mon Dec 29 12:07:54 2014
@@ -46,7 +46,7 @@ import org.apache.commons.imaging.ImageP
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.common.BasicCParser;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.palette.PaletteFactory;
import org.apache.commons.imaging.palette.SimplePalette;
@@ -134,7 +134,7 @@ public class XpmImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
+ public ImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java Mon Dec 29 12:07:54 2014
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingConstants;
-import org.apache.commons.imaging.common.IBufferedImageFactory;
+import org.apache.commons.imaging.common.BufferedImageFactory;
public class ImageReadExample {
public static BufferedImage imageReadExample(final File file)
@@ -46,7 +46,7 @@ public class ImageReadExample {
}
public static class ManagedImageBufferedImageFactory implements
- IBufferedImageFactory {
+ BufferedImageFactory {
public BufferedImage getColorBufferedImage(final int width, final int height,
final boolean hasAlpha) {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java Mon Dec 29 12:07:54 2014
@@ -22,8 +22,8 @@ import java.util.List;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
-import org.apache.commons.imaging.common.IImageMetadata.IImageMetadataItem;
+import org.apache.commons.imaging.common.ImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata.ImageMetadataItem;
import org.apache.commons.imaging.common.RationalNumber;
import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
import org.apache.commons.imaging.formats.tiff.TiffField;
@@ -37,7 +37,7 @@ public class MetadataExample {
public static void metadataExample(final File file) throws ImageReadException,
IOException {
// get all metadata stored in EXIF format (ie. from JPEG or TIFF).
- final IImageMetadata metadata = Imaging.getMetadata(file);
+ final ImageMetadata metadata = Imaging.getMetadata(file);
// System.out.println(metadata);
@@ -142,9 +142,9 @@ public class MetadataExample {
System.out.println();
- final List<IImageMetadataItem> items = jpegMetadata.getItems();
+ final List<ImageMetadataItem> items = jpegMetadata.getItems();
for (int i = 0; i < items.size(); i++) {
- final IImageMetadataItem item = items.get(i);
+ final ImageMetadataItem item = items.get(i);
System.out.println(" " + "item: " + item);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java Mon Dec 29 12:07:54 2014
@@ -30,7 +30,7 @@ import org.apache.commons.imaging.ImageF
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
public class SampleUsage {
@@ -97,7 +97,7 @@ public class SampleUsage {
// <b>get all metadata stored in EXIF format (ie. from JPEG or
// TIFF). </b>
- final IImageMetadata metadata = Imaging.getMetadata(imageBytes);
+ final ImageMetadata metadata = Imaging.getMetadata(imageBytes);
// <b>print a dump of information about an image to stdout. </b>
Imaging.dumpImageFile(imageBytes);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java Mon Dec 29 12:07:54 2014
@@ -25,7 +25,7 @@ import java.io.OutputStream;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.RationalNumber;
import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
import org.apache.commons.imaging.formats.jpeg.exif.ExifRewriter;
@@ -71,7 +71,7 @@ public class WriteExifMetadataExample {
TiffOutputSet outputSet = null;
// note that metadata might be null if no metadata is found.
- final IImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
+ final ImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
final JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
if (null != jpegMetadata) {
// note that exif might be null if no Exif metadata is found.
@@ -172,7 +172,7 @@ public class WriteExifMetadataExample {
TiffOutputSet outputSet = null;
// note that metadata might be null if no metadata is found.
- final IImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
+ final ImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
final JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
if (null != jpegMetadata) {
// note that exif might be null if no Exif metadata is found.
@@ -254,7 +254,7 @@ public class WriteExifMetadataExample {
TiffOutputSet outputSet = null;
// note that metadata might be null if no metadata is found.
- final IImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
+ final ImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
final JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
if (null != jpegMetadata) {
// note that exif might be null if no Exif metadata is found.
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java Mon Dec 29 12:07:54 2014
@@ -24,15 +24,11 @@ import java.io.File;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
-import org.apache.commons.imaging.util.Debug;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java Mon Dec 29 12:07:54 2014
@@ -24,9 +24,7 @@ import java.io.File;
import java.util.Collection;
import java.util.Collections;
-import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java Mon Dec 29 12:07:54 2014
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.util.Debug;
import org.junit.Test;
@@ -41,7 +41,7 @@ public class GifReadTest extends GifBase
final File imageFile = images.get(i);
Debug.debug("imageFile", imageFile);
- final IImageMetadata metadata = Imaging.getMetadata(imageFile);
+ final ImageMetadata metadata = Imaging.getMetadata(imageFile);
// assertNotNull(metadata);
final ImageInfo imageInfo = Imaging.getImageInfo(imageFile);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java Mon Dec 29 12:07:54 2014
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.util.Debug;
import org.junit.Test;
@@ -43,7 +43,7 @@ public class IcnsReadTest extends IcnsBa
final File imageFile = images.get(i);
Debug.debug("imageFile", imageFile);
- final IImageMetadata metadata = Imaging.getMetadata(imageFile);
+ final ImageMetadata metadata = Imaging.getMetadata(imageFile);
// assertNotNull(metadata);
final Map<String, Object> params = new HashMap<String, Object>();
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java Mon Dec 29 12:07:54 2014
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.util.Debug;
import org.junit.Test;
@@ -43,7 +43,7 @@ public class IcoReadTest extends IcoBase
final File imageFile = images.get(i);
Debug.debug("imageFile", imageFile);
- final IImageMetadata metadata = Imaging.getMetadata(imageFile);
+ final ImageMetadata metadata = Imaging.getMetadata(imageFile);
// assertNotNull(metadata);
final Map<String, Object> params = new HashMap<String, Object>();
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java Mon Dec 29 12:07:54 2014
@@ -29,7 +29,7 @@ import java.util.Map;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.util.Debug;
import org.junit.Test;
@@ -50,7 +50,7 @@ public class JpegReadTest extends JpegBa
final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData));
- final IImageMetadata metadata = Imaging.getMetadata(imageFile, params);
+ final ImageMetadata metadata = Imaging.getMetadata(imageFile, params);
// assertNotNull(metadata);
Debug.debug("metadata", metadata);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java Mon Dec 29 12:07:54 2014
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingTest;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.junit.Test;
public class JpegWithJpegThumbnailTest extends ImagingTest {
@@ -36,7 +36,7 @@ public class JpegWithJpegThumbnailTest e
final File imageFile = getTestImageByName("img_F028c_small.jpg");
final Map<String, Object> params = new HashMap<String, Object>();
- final IImageMetadata metadata = Imaging.getMetadata(imageFile, params);
+ final ImageMetadata metadata = Imaging.getMetadata(imageFile, params);
assertNotNull(metadata);
final JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
final BufferedImage image = jpegMetadata.getEXIFThumbnail();
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java Mon Dec 29 12:07:54 2014
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
import org.apache.commons.imaging.formats.tiff.TiffField;
import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
@@ -45,7 +45,7 @@ public class AsciiFieldTest extends Exif
final Map<String, Object> params = new HashMap<String, Object>();
- final IImageMetadata metadata = Imaging.getMetadata(imageFile, params);
+ final ImageMetadata metadata = Imaging.getMetadata(imageFile, params);
assertNotNull(metadata);
final JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java Mon Dec 29 12:07:54 2014
@@ -36,7 +36,7 @@ import java.util.Set;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata.IImageMetadataItem;
+import org.apache.commons.imaging.common.ImageMetadata.ImageMetadataItem;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.common.bytesource.ByteSourceArray;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
@@ -278,7 +278,7 @@ public class ExifRewriteTest extends Exi
rewrite(rewriter, "lossless");
}
- private Hashtable<Integer,TiffImageMetadata.Directory> makeDirectoryMap(final List<? extends IImageMetadataItem> directories) {
+ private Hashtable<Integer,TiffImageMetadata.Directory> makeDirectoryMap(final List<? extends ImageMetadataItem> directories) {
final Hashtable<Integer,TiffImageMetadata.Directory> directoryMap = new Hashtable<Integer,TiffImageMetadata.Directory>();
for (int i = 0; i < directories.size(); i++) {
final TiffImageMetadata.Directory directory = (TiffImageMetadata.Directory) directories
@@ -288,10 +288,10 @@ public class ExifRewriteTest extends Exi
return directoryMap;
}
- private Hashtable<Integer,TiffField> makeFieldMap(final List<? extends IImageMetadataItem> items) {
+ private Hashtable<Integer,TiffField> makeFieldMap(final List<? extends ImageMetadataItem> items) {
final Hashtable<Integer,TiffField> fieldMap = new Hashtable<Integer,TiffField>();
for (int i = 0; i < items.size(); i++) {
- final TiffImageMetadata.Item item = (TiffImageMetadata.Item) items.get(i);
+ final TiffImageMetadata.TiffMetadataItem item = (TiffImageMetadata.TiffMetadataItem) items.get(i);
final TiffField field = item.getTiffField();
if (!fieldMap.containsKey(field.getTag())) {
fieldMap.put(field.getTag(), field);
@@ -305,8 +305,8 @@ public class ExifRewriteTest extends Exi
assertNotNull(oldExifMetadata);
assertNotNull(newExifMetadata);
- final List<? extends IImageMetadataItem> oldDirectories = oldExifMetadata.getDirectories();
- final List<? extends IImageMetadataItem> newDirectories = newExifMetadata.getDirectories();
+ final List<? extends ImageMetadataItem> oldDirectories = oldExifMetadata.getDirectories();
+ final List<? extends ImageMetadataItem> newDirectories = newExifMetadata.getDirectories();
assertTrue(oldDirectories.size() == newDirectories.size());
@@ -332,8 +332,8 @@ public class ExifRewriteTest extends Exi
assertNotNull(oldDirectory);
assertNotNull(newDirectory);
- final List<? extends IImageMetadataItem> oldItems = oldDirectory.getItems();
- final List<? extends IImageMetadataItem> newItems = newDirectory.getItems();
+ final List<? extends ImageMetadataItem> oldItems = oldDirectory.getItems();
+ final List<? extends ImageMetadataItem> newItems = newDirectory.getItems();
final Hashtable<Integer,TiffField> oldFieldMap = makeFieldMap(oldItems);
final Hashtable<Integer,TiffField> newFieldMap = makeFieldMap(newItems);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java Mon Dec 29 12:07:54 2014
@@ -26,7 +26,7 @@ import java.util.TreeMap;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
import org.apache.commons.imaging.formats.tiff.constants.MicrosoftTagConstants;
@@ -56,7 +56,7 @@ public class MicrosoftTagTest extends Ex
checkFields(bytes);
}
- private TiffImageMetadata toTiffMetadata(final IImageMetadata metadata) throws Exception {
+ private TiffImageMetadata toTiffMetadata(final ImageMetadata metadata) throws Exception {
if (metadata instanceof JpegImageMetadata) {
return ((JpegImageMetadata)metadata).getExif();
} else if (metadata instanceof TiffImageMetadata) {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java Mon Dec 29 12:07:54 2014
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
import org.apache.commons.imaging.formats.tiff.TiffField;
import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
@@ -72,7 +72,7 @@ public abstract class SpecificExifTagTes
params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData));
// note that metadata might be null if no metadata is found.
- final IImageMetadata metadata = Imaging.getMetadata(imageFile, params);
+ final ImageMetadata metadata = Imaging.getMetadata(imageFile, params);
if (null == metadata) {
return;
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java?rev=1648312&r1=1648311&r2=1648312&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java Mon Dec 29 12:07:54 2014
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.util.Debug;
import org.junit.Test;
@@ -43,7 +43,7 @@ public class PamReadTest extends PamBase
final File imageFile = images.get(i);
Debug.debug("imageFile", imageFile);
- final IImageMetadata metadata = Imaging.getMetadata(imageFile);
+ final ImageMetadata metadata = Imaging.getMetadata(imageFile);
// assertNotNull(metadata);
final Map<String, Object> params = new HashMap<String, Object>();