Rename org.apache.commons.sanselan.common.byteSources.* to org.apache.commons.sanselan.common.bytesource
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/sanselan/trunk@1220583 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/sanselan/ImageParser.java b/src/main/java/org/apache/commons/sanselan/ImageParser.java
index f44929b..8ee1fd9 100644
--- a/src/main/java/org/apache/commons/sanselan/ImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/ImageParser.java
@@ -30,9 +30,9 @@
import org.apache.commons.sanselan.common.IBufferedImageFactory;
import org.apache.commons.sanselan.common.IImageMetadata;
import org.apache.commons.sanselan.common.SimpleBufferedImageFactory;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceArray;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceArray;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
import org.apache.commons.sanselan.formats.bmp.BmpImageParser;
import org.apache.commons.sanselan.formats.dcx.DcxImageParser;
import org.apache.commons.sanselan.formats.gif.GifImageParser;
diff --git a/src/main/java/org/apache/commons/sanselan/Sanselan.java b/src/main/java/org/apache/commons/sanselan/Sanselan.java
index a9cea85..2788db0 100644
--- a/src/main/java/org/apache/commons/sanselan/Sanselan.java
+++ b/src/main/java/org/apache/commons/sanselan/Sanselan.java
@@ -31,10 +31,10 @@
import java.util.Map;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceArray;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceInputStream;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceArray;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceInputStream;
import org.apache.commons.sanselan.icc.IccProfileInfo;
import org.apache.commons.sanselan.icc.IccProfileParser;
import org.apache.commons.sanselan.util.Debug;
diff --git a/src/main/java/org/apache/commons/sanselan/common/byteSources/ByteSource.java b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSource.java
similarity index 96%
rename from src/main/java/org/apache/commons/sanselan/common/byteSources/ByteSource.java
rename to src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSource.java
index 68a4e2f..9edd76c 100644
--- a/src/main/java/org/apache/commons/sanselan/common/byteSources/ByteSource.java
+++ b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSource.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.sanselan.common.byteSources;
+package org.apache.commons.sanselan.common.bytesource;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/main/java/org/apache/commons/sanselan/common/byteSources/ByteSourceArray.java b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceArray.java
similarity index 97%
rename from src/main/java/org/apache/commons/sanselan/common/byteSources/ByteSourceArray.java
rename to src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceArray.java
index 544cb6b..5b967b2 100644
--- a/src/main/java/org/apache/commons/sanselan/common/byteSources/ByteSourceArray.java
+++ b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceArray.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.sanselan.common.byteSources;
+package org.apache.commons.sanselan.common.bytesource;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/commons/sanselan/common/byteSources/ByteSourceFile.java b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceFile.java
similarity index 98%
rename from src/main/java/org/apache/commons/sanselan/common/byteSources/ByteSourceFile.java
rename to src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceFile.java
index 32b730f..c862282 100644
--- a/src/main/java/org/apache/commons/sanselan/common/byteSources/ByteSourceFile.java
+++ b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceFile.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.sanselan.common.byteSources;
+package org.apache.commons.sanselan.common.bytesource;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/src/main/java/org/apache/commons/sanselan/common/byteSources/ByteSourceInputStream.java b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceInputStream.java
similarity index 98%
rename from src/main/java/org/apache/commons/sanselan/common/byteSources/ByteSourceInputStream.java
rename to src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceInputStream.java
index 37f8d21..4d5295f 100644
--- a/src/main/java/org/apache/commons/sanselan/common/byteSources/ByteSourceInputStream.java
+++ b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceInputStream.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.sanselan.common.byteSources;
+package org.apache.commons.sanselan.common.bytesource;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java
index fb0a750..f12a79e 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java
@@ -36,7 +36,7 @@
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.BinaryOutputStream;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.formats.bmp.pixelparsers.PixelParser;
import org.apache.commons.sanselan.formats.bmp.pixelparsers.PixelParserBitFields;
import org.apache.commons.sanselan.formats.bmp.pixelparsers.PixelParserRgb;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java
index a63a895..9dcdab1 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java
@@ -34,8 +34,8 @@
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.BinaryOutputStream;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceInputStream;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceInputStream;
import org.apache.commons.sanselan.formats.pcx.PcxConstants;
import org.apache.commons.sanselan.formats.pcx.PcxImageParser;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java
index 4fa7e37..24d3c1c 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java
@@ -39,7 +39,7 @@
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.BinaryOutputStream;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.common.mylzw.MyLZWCompressor;
import org.apache.commons.sanselan.common.mylzw.MyLZWDecompressor;
import org.apache.commons.sanselan.palette.Palette;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java
index f857e10..77ece91 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java
@@ -34,7 +34,7 @@
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.BinaryOutputStream;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.util.Debug;
import org.apache.commons.sanselan.util.ParamMap;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java
index bb7ef79..2d994ee 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java
@@ -37,7 +37,7 @@
import org.apache.commons.sanselan.Sanselan;
import org.apache.commons.sanselan.common.BinaryOutputStream;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.formats.bmp.BmpImageParser;
import org.apache.commons.sanselan.palette.PaletteFactory;
import org.apache.commons.sanselan.palette.SimplePalette;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
index f20bf9a..bc7eb26 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
@@ -35,7 +35,7 @@
import org.apache.commons.sanselan.ImageParser;
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.formats.jpeg.decoder.JpegDecoder;
import org.apache.commons.sanselan.formats.jpeg.iptc.IPTCParser;
import org.apache.commons.sanselan.formats.jpeg.iptc.PhotoshopApp13Data;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegUtils.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegUtils.java
index d60b260..a4a2135 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegUtils.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegUtils.java
@@ -22,7 +22,7 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.util.Debug;
public class JpegUtils extends BinaryFileParser implements JpegConstants
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/JpegDecoder.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/JpegDecoder.java
index bc07bac..0b57d28 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/JpegDecoder.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/JpegDecoder.java
@@ -27,7 +27,7 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.formats.jpeg.Block;
import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
import org.apache.commons.sanselan.formats.jpeg.JpegUtils;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/exifRewrite/ExifRewriter.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/exifRewrite/ExifRewriter.java
index cedf7f2..ac24ccb 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/exifRewrite/ExifRewriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/exifRewrite/ExifRewriter.java
@@ -27,10 +27,10 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceArray;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceInputStream;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceArray;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceInputStream;
import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
import org.apache.commons.sanselan.formats.jpeg.JpegUtils;
import org.apache.commons.sanselan.formats.tiff.write.TiffImageWriterBase;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java
index b9def2f..6e649d0 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java
@@ -28,10 +28,10 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceArray;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceInputStream;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceArray;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceInputStream;
import org.apache.commons.sanselan.formats.jpeg.xmp.JpegRewriter;
/**
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
index 9e1715d..ae1d6e1 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
@@ -24,7 +24,7 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
import org.apache.commons.sanselan.formats.jpeg.JpegUtils;
import org.apache.commons.sanselan.formats.jpeg.iptc.IPTCParser;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpRewriter.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpRewriter.java
index 2e92af4..4243d71 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpRewriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpRewriter.java
@@ -26,10 +26,10 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceArray;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceInputStream;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceArray;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceInputStream;
/**
* Interface for Exif write/update/remove functionality for Jpeg/JFIF images.
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pcx/PcxImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/pcx/PcxImageParser.java
index 2ed7268..702d406 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pcx/PcxImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pcx/PcxImageParser.java
@@ -43,7 +43,7 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
public class PcxImageParser extends ImageParser implements PcxConstants
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java
index dcd529d..29dfdc0 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java
@@ -42,7 +42,7 @@
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.IImageMetadata;
import org.apache.commons.sanselan.common.ImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.formats.png.chunks.PNGChunk;
import org.apache.commons.sanselan.formats.png.chunks.PNGChunkIDAT;
import org.apache.commons.sanselan.formats.png.chunks.PNGChunkIHDR;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMImageParser.java
index d10662d..3210f3e 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMImageParser.java
@@ -33,7 +33,7 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.util.Debug;
public class PNMImageParser extends ImageParser implements PNMConstants
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java
index a7bab18..e61c97b 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java
@@ -33,7 +33,7 @@
import org.apache.commons.sanselan.ImageParser;
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.formats.psd.dataparsers.DataParser;
import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserBitmap;
import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserCMYK;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tga/TgaImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/tga/TgaImageParser.java
index 4e25f40..e5623f8 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tga/TgaImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tga/TgaImageParser.java
@@ -31,7 +31,7 @@
//import org.apache.commons.sanselan.ImageParser;
//import org.apache.commons.sanselan.ImageReadException;
//import org.apache.commons.sanselan.common.IImageMetadata;
-//import org.apache.commons.sanselan.common.byteSources.ByteSource;
+//import org.apache.commons.sanselan.common.bytesource.ByteSource;
//import org.apache.commons.sanselan.util.Debug;
//
///*
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffField.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffField.java
index 414e8d3..052ed8f 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffField.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffField.java
@@ -27,7 +27,7 @@
import java.util.Map;
import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.formats.tiff.constants.TagInfo;
import org.apache.commons.sanselan.formats.tiff.constants.TiffConstants;
import org.apache.commons.sanselan.formats.tiff.fieldtypes.FieldType;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java
index 8b998cc..daf568b 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java
@@ -34,7 +34,7 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.formats.tiff.constants.TiffConstants;
import org.apache.commons.sanselan.formats.tiff.datareaders.DataReader;
import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreter;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java
index f6c272f..4c4e0b4 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java
@@ -25,7 +25,7 @@
import org.apache.commons.sanselan.FormatCompliance;
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.formats.tiff.TiffDirectory.ImageDataElement;
import org.apache.commons.sanselan.formats.tiff.constants.TiffConstants;
import org.apache.commons.sanselan.util.Debug;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java
index 72982da..54b54db 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java
@@ -29,8 +29,8 @@
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.BinaryFileFunctions;
import org.apache.commons.sanselan.common.BinaryOutputStream;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceArray;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceArray;
import org.apache.commons.sanselan.formats.tiff.JpegImageData;
import org.apache.commons.sanselan.formats.tiff.TiffContents;
import org.apache.commons.sanselan.formats.tiff.TiffDirectory;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/wbmp/WbmpImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/wbmp/WbmpImageParser.java
index 0e98c71..8176a93 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/wbmp/WbmpImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/wbmp/WbmpImageParser.java
@@ -37,7 +37,7 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
public class WbmpImageParser extends ImageParser
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/xbm/XbmImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/xbm/XbmImageParser.java
index 6f51504..55dbe56 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/xbm/XbmImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/xbm/XbmImageParser.java
@@ -43,7 +43,7 @@
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.BasicCParser;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
public class XbmImageParser extends ImageParser
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/xpm/XpmImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/xpm/XpmImageParser.java
index 597bb29..6306cda 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/xpm/XpmImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/xpm/XpmImageParser.java
@@ -46,7 +46,7 @@
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.common.BasicCParser;
import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.palette.PaletteFactory;
import org.apache.commons.sanselan.palette.SimplePalette;
import org.apache.commons.sanselan.util.Debug;
diff --git a/src/main/java/org/apache/commons/sanselan/icc/IccProfileParser.java b/src/main/java/org/apache/commons/sanselan/icc/IccProfileParser.java
index 7765ae7..122fa47 100644
--- a/src/main/java/org/apache/commons/sanselan/icc/IccProfileParser.java
+++ b/src/main/java/org/apache/commons/sanselan/icc/IccProfileParser.java
@@ -22,9 +22,9 @@
import java.io.InputStream;
import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceArray;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceArray;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
import org.apache.commons.sanselan.util.CachingInputStream;
import org.apache.commons.sanselan.util.Debug;
diff --git a/src/test/java/org/apache/commons/sanselan/common/byteSources/ByteSourceDataTest.java b/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceDataTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/sanselan/common/byteSources/ByteSourceDataTest.java
rename to src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceDataTest.java
index 7f5db7f..4cf4f9c 100644
--- a/src/test/java/org/apache/commons/sanselan/common/byteSources/ByteSourceDataTest.java
+++ b/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceDataTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.sanselan.common.byteSources;
+package org.apache.commons.sanselan.common.bytesource;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -23,9 +23,9 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceInputStream;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceInputStream;
import org.apache.commons.sanselan.util.IOUtils;
public class ByteSourceDataTest extends ByteSourceTest
diff --git a/src/test/java/org/apache/commons/sanselan/common/byteSources/ByteSourceImageTest.java b/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceImageTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/sanselan/common/byteSources/ByteSourceImageTest.java
rename to src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceImageTest.java
index 80bef88..5675ff8 100644
--- a/src/test/java/org/apache/commons/sanselan/common/byteSources/ByteSourceImageTest.java
+++ b/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceImageTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.sanselan.common.byteSources;
+package org.apache.commons.sanselan.common.bytesource;
import java.awt.Dimension;
import java.awt.image.BufferedImage;
diff --git a/src/test/java/org/apache/commons/sanselan/common/byteSources/ByteSourceTest.java b/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/sanselan/common/byteSources/ByteSourceTest.java
rename to src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceTest.java
index 7eab166..2bd30f1 100644
--- a/src/test/java/org/apache/commons/sanselan/common/byteSources/ByteSourceTest.java
+++ b/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.sanselan.common.byteSources;
+package org.apache.commons.sanselan.common.bytesource;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifBaseTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifBaseTest.java
index 17e3b32..6d90b4f 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifBaseTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifBaseTest.java
@@ -23,8 +23,8 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.SanselanTest;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
public abstract class ExifBaseTest extends SanselanTest
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifDumpTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifDumpTest.java
index af00685..16c6630 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifDumpTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifDumpTest.java
@@ -26,8 +26,8 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.Sanselan;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
import org.apache.commons.sanselan.formats.jpeg.JpegImageMetadata;
import org.apache.commons.sanselan.formats.jpeg.JpegUtils;
import org.apache.commons.sanselan.util.Debug;
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriteTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriteTest.java
index 70d3c25..1997d0a 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriteTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriteTest.java
@@ -31,9 +31,9 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.ImageWriteException;
import org.apache.commons.sanselan.Sanselan;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceArray;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceArray;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
import org.apache.commons.sanselan.formats.jpeg.JpegImageMetadata;
import org.apache.commons.sanselan.formats.jpeg.JpegUtils;
import org.apache.commons.sanselan.formats.jpeg.exifRewrite.ExifRewriter;
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcBaseTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcBaseTest.java
index f96d9a1..62546c2 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcBaseTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcBaseTest.java
@@ -23,8 +23,8 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.SanselanTest;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
public abstract class IptcBaseTest extends SanselanTest
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
index 51cbf1c..42152eb 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
@@ -29,8 +29,8 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
import org.apache.commons.sanselan.formats.jpeg.JpegPhotoshopMetadata;
import org.apache.commons.sanselan.formats.jpeg.iptc.IPTCConstants;
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpBaseTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpBaseTest.java
index d9a8596..9b1d73a 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpBaseTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpBaseTest.java
@@ -23,8 +23,8 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.SanselanTest;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
public abstract class JpegXmpBaseTest extends SanselanTest
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpDumpTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpDumpTest.java
index 900c642..8053d7d 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpDumpTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpDumpTest.java
@@ -24,8 +24,8 @@
import java.util.Map;
import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
import org.apache.commons.sanselan.util.Debug;
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpRewriteTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpRewriteTest.java
index 787ac6e..4e18392 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpRewriteTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpRewriteTest.java
@@ -28,8 +28,8 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.common.byteSources.ByteSource;
-import org.apache.commons.sanselan.common.byteSources.ByteSourceFile;
+import org.apache.commons.sanselan.common.bytesource.ByteSource;
+import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
import org.apache.commons.sanselan.formats.jpeg.xmp.JpegXmpRewriter;
import org.apache.commons.sanselan.util.Debug;
