[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release twelvemonkeys-3.4.3
Stick to the git user, when using ssh
2026-05-19 00:00:03 -04:00 · 2020-01-09 19:40:24 +01:00 · 2020-01-09 19:40:16 +01:00 · 2020-01-09 19:28:35 +01:00 · 2020-01-09 19:25:48 +01:00 · 2020-01-09 19:25:48 +01:00
246 changed files with 36615 additions and 35468 deletions
@@ -1,3 +1,4 @@
+dist: trusty
 language: java
 jdk:
  - oraclejdk8
@@ -2,7 +2,7 @@

 Master branch build status: [![Build Status](https://travis-ci.org/haraldk/TwelveMonkeys.svg?branch=master)](https://travis-ci.org/haraldk/TwelveMonkeys)

-Latest release is TwelveMonkeys ImageIO [3.3.2](http://search.maven.org/#search%7Cga%7C1%7Cg%3Acom.twelvemonkeys*%20AND%20v%3A%223.3.2%22) (Feb. 2nd, 2017).
+Latest release is TwelveMonkeys ImageIO [3.4.1](https://search.maven.org/search?q=g:com.twelvemonkeys.imageio%20AND%20v:3.4.1) (Sep. 7th, 2018).
 [Release notes](https://github.com/haraldk/TwelveMonkeys/releases/latest).

 ## About
@@ -56,9 +56,9 @@ Mainstream format support
  * `javax_imageio_jpeg_image_1.0` format (currently as native format, may change in the future)
  * Non-conforming combinations of JFIF, Exif and Adobe markers, using "unknown" segments in the
   "MarkerSequence" tag for the unsupported segments (for `javax_imageio_jpeg_image_1.0` format)
-* Extended write support in progress:
+* Extended write support:
  * CMYK JPEGs
-  * YCCK JPEGs
+  * YCCK JPEGs in progress

 #### JPEG-2000

@@ -206,6 +206,7 @@ Legacy formats
  * Uncompressed
  * RLE compressed
 * Standard metadata support
+* Write support

 Icon/other formats

@@ -215,6 +216,7 @@ Icon/other formats
  * All known "native" icon types
  * Large PNG encoded icons
  * Large JPEG 2000 encoded icons (requires JPEG 2000 ImageIO plugin or fallback to `sips` command line tool)
+* Write support for PNG encoded icons

 #### ICO & CUR - MS Windows Icon and Cursor Formats

@@ -223,6 +225,7 @@ Icon/other formats
  * ICO RGB, 16, 24 and 32 bit
  * CUR Indexed color, 1, 4 and 8 bit
  * CUR RGB, 16, 24 and 32 bit
+* Write support
 * *3.1* Note: These formats are now part of the BMP plugin

 #### Thumbs.db - MS Windows Thumbs DB
@@ -265,6 +268,7 @@ The plugins are discovered automatically at run time. See the [FAQ](#faq) for mo

 If you need more control of read parameters and the reading process, the common idiom for reading is something like:

+```java
    // Create input stream
    ImageInputStream input = ImageIO.createImageInputStream(file);

@@ -309,6 +313,7 @@ If you need more control of read parameters and the reading process, the common
        // Close stream in finally block to avoid resource leaks
        input.close();
    }
+```

 Query the reader for source image dimensions using `reader.getWidth(n)` and `reader.getHeight(n)` without reading the
 entire image into memory first.
@@ -318,6 +323,7 @@ It's also possible to read multiple images from the same file in a loop, using `

 If you need more control of write parameters and the writing process, the common idiom for writing is something like:

+```java
    // Get the writer
    Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName(format);

@@ -353,6 +359,7 @@ If you need more control of write parameters and the writing process, the common
        // Dispose writer in finally block to avoid memory leaks
        writer.dispose();
    }
+```

 For more advanced usage, and information on how to use the ImageIO API, I suggest you read the
 [Java Image I/O API Guide](http://docs.oracle.com/javase/7/docs/technotes/guides/imageio/spec/imageio_guideTOC.fm.html)
@@ -376,6 +383,7 @@ To work around both the discovery problem and the resource leak,
 it is *strongly recommended* to use the `IIOProviderContextListener` that implements
 dynamic loading and unloading of ImageIO plugins for web applications.

+```xml
    <web-app ...>

    ...
@@ -388,6 +396,7 @@ dynamic loading and unloading of ImageIO plugins for web applications.
    ...

    </web-app>
+```

 Loading plugins from `WEB-INF/lib` without the context listener installed is unsupported and will not work correctly.

@@ -401,6 +410,7 @@ Another safe option, is to place the JAR files in the application server's share
 The library comes with a resampling (image resizing) operation, that contains many different algorithms
 to provide excellent results at reasonable speed.

+```java
    import com.twelvemonkeys.image.ResampleOp;

    ...
@@ -410,13 +420,14 @@ to provide excellent results at reasonable speed.

    BufferedImageOp resampler = new ResampleOp(width, height, ResampleOp.FILTER_LANCZOS); // A good default filter, see class documentation for more info
    BufferedImage output = resampler.filter(input, null);
-
+```

 #### Using the DiffusionDither

 The library comes with a dithering operation, that can be used to convert `BufferedImage`s to `IndexColorModel` using
 Floyd-Steinberg error-diffusion dither.

+```java
    import com.twelvemonkeys.image.DiffusionDither;

    ...
@@ -425,7 +436,7 @@ Floyd-Steinberg error-diffusion dither.

    BufferedImageOp ditherer = new DiffusionDither();
    BufferedImage output = ditherer.filter(input, null);
-
+```

 ## Building

@@ -461,10 +472,12 @@ The ImageIO registry and service lookup mechanism will make sure the plugins are

 To verify that the JPEG plugin is installed and used at run-time, you could use the following code:

+```java
    Iterator<ImageReader> readers = ImageIO.getImageReadersByFormatName("JPEG");
    while (readers.hasNext()) {
        System.out.println("reader: " + readers.next());
    }
+```

 The first line should print:

@@ -474,71 +487,83 @@ The first line should print:

 To depend on the JPEG and TIFF plugin using Maven, add the following to your POM:

+```xml
    ...
    <dependencies>
        ...
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-jpeg</artifactId>
-            <version>3.3.2</version> <!-- Alternatively, build your own version -->
+            <version>3.4.1</version>
        </dependency>
        <dependency>
            <groupId>com.twelvemonkeys.imageio</groupId>
            <artifactId>imageio-tiff</artifactId>
-            <version>3.3.2</version> <!-- Alternatively, build your own version -->
+            <version>3.4.1</version>
+        </dependency>
+
+        <!--
+        Optional dependency. Needed only if you deploy `ImageIO` plugins as part of a web app.
+        Make sure you add the `IIOProviderContextListener` to your `web.xml`, see above.
+        -->
+        <dependency>
+            <groupId>com.twelvemonkeys.servlet</groupId>
+            <artifactId>servlet</artifactId>
+            <version>3.4.1</version>
        </dependency>
    </dependencies>
+```

 #### Manual dependency example

 To depend on the JPEG and TIFF plugin in your IDE or program, add all of the following JARs to your class path:

-    twelvemonkeys-common-lang-3.3.2.jar
-    twelvemonkeys-common-io-3.3.2.jar
-    twelvemonkeys-common-image-3.3.2.jar
-    twelvemonkeys-imageio-core-3.3.2.jar
-    twelvemonkeys-imageio-metadata-3.3.2.jar
-    twelvemonkeys-imageio-jpeg-3.3.2.jar
-    twelvemonkeys-imageio-tiff-3.3.2.jar
+    twelvemonkeys-common-lang-3.4.1.jar
+    twelvemonkeys-common-io-3.4.1.jar
+    twelvemonkeys-common-image-3.4.1.jar
+    twelvemonkeys-imageio-core-3.4.1.jar
+    twelvemonkeys-imageio-metadata-3.4.1.jar
+    twelvemonkeys-imageio-jpeg-3.4.1.jar
+    twelvemonkeys-imageio-tiff-3.4.1.jar

 ### Links to prebuilt binaries

-##### Latest version (3.2.x)
+##### Latest version (3.4.1)

 Requires Java 7 or later.
 
 Common dependencies
-* [common-lang-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-lang/3.3.2/common-lang-3.3.2.jar)
-* [common-io-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-io/3.3.2/common-io-3.3.2.jar)
-* [common-image-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-image/3.3.2/common-image-3.3.2.jar)
+* [common-lang-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-lang/3.4.1/common-lang-3.4.1.jar)
+* [common-io-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-io/3.4.1/common-io-3.4.1.jar)
+* [common-image-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/common/common-image/3.4.1/common-image-3.4.1.jar)

 ImageIO dependencies
-* [imageio-core-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-core/3.3.2/imageio-core-3.3.2.jar)
-* [imageio-metadata-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-metadata/3.3.2/imageio-metadata-3.3.2.jar)
+* [imageio-core-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-core/3.4.1/imageio-core-3.4.1.jar)
+* [imageio-metadata-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-metadata/3.4.1/imageio-metadata-3.4.1.jar)

 ImageIO plugins
-* [imageio-bmp-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-bmp/3.3.2/imageio-bmp-3.3.2.jar)
-* [imageio-jpeg-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jpeg/3.3.2/imageio-jpeg-3.3.2.jar)
-* [imageio-tiff-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tiff/3.3.2/imageio-tiff-3.3.2.jar)
-* [imageio-pnm-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pnm/3.3.2/imageio-pnm-3.3.2.jar)
-* [imageio-psd-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-psd/3.3.2/imageio-psd-3.3.2.jar)
-* [imageio-hdr-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-hdr/3.3.2/imageio-hdr-3.3.2.jar)
-* [imageio-iff-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-iff/3.3.2/imageio-iff-3.3.2.jar)
-* [imageio-pcx-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pcx/3.3.2/imageio-pcx-3.3.2.jar)
-* [imageio-pict-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pict/3.3.2/imageio-pict-3.3.2.jar)
-* [imageio-sgi-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-sgi/3.3.2/imageio-sgi-3.3.2.jar)
-* [imageio-tga-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tga/3.3.2/imageio-tga-3.3.2.jar)
-* [imageio-icns-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-icns/3.3.2/imageio-icns-3.3.2.jar)
-* [imageio-thumbsdb-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-thumbsdb/3.3.2/imageio-thumbsdb-3.3.2.jar)
+* [imageio-bmp-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-bmp/3.4.1/imageio-bmp-3.4.1.jar)
+* [imageio-jpeg-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-jpeg/3.4.1/imageio-jpeg-3.4.1.jar)
+* [imageio-tiff-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tiff/3.4.1/imageio-tiff-3.4.1.jar)
+* [imageio-pnm-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pnm/3.4.1/imageio-pnm-3.4.1.jar)
+* [imageio-psd-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-psd/3.4.1/imageio-psd-3.4.1.jar)
+* [imageio-hdr-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-hdr/3.4.1/imageio-hdr-3.4.1.jar)
+* [imageio-iff-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-iff/3.4.1/imageio-iff-3.4.1.jar)
+* [imageio-pcx-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pcx/3.4.1/imageio-pcx-3.4.1.jar)
+* [imageio-pict-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-pict/3.4.1/imageio-pict-3.4.1.jar)
+* [imageio-sgi-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-sgi/3.4.1/imageio-sgi-3.4.1.jar)
+* [imageio-tga-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-tga/3.4.1/imageio-tga-3.4.1.jar)
+* [imageio-icns-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-icns/3.4.1/imageio-icns-3.4.1.jar)
+* [imageio-thumbsdb-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-thumbsdb/3.4.1/imageio-thumbsdb-3.4.1.jar)

 ImageIO plugins requiring 3rd party libs
-* [imageio-batik-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-batik/3.3.2/imageio-batik-3.3.2.jar)
+* [imageio-batik-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-batik/3.4.1/imageio-batik-3.4.1.jar)

 Photoshop Path support for ImageIO
-* [imageio-clippath-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-clippath/3.3.2/imageio-clippath-3.3.2.jar)
+* [imageio-clippath-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/imageio/imageio-clippath/3.4.1/imageio-clippath-3.4.1.jar)

 Servlet support
-* [servlet-3.3.2.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.3.2/servlet-3.3.2.jar)
+* [servlet-3.4.1.jar](http://search.maven.org/remotecontent?filepath=com/twelvemonkeys/servlet/servlet/3.4.1/servlet-3.4.1.jar)

 ##### Old version (3.0.x)

@@ -575,35 +600,33 @@ Servlet support

 The project is distributed under the OSI approved [BSD license](http://opensource.org/licenses/BSD-3-Clause):

-    Copyright (c) 2008-2015, Harald Kuhr
+    Copyright (c) 2008-2018, Harald Kuhr
    All rights reserved.

    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are met:

-    o Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
+    o Redistributions of source code must retain the above copyright notice, this
+      list of conditions and the following disclaimer.

-    o Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
+    o Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.

-    o Neither the name "TwelveMonkeys" nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    o Neither the name of the copyright holder nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.

+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 ## FAQ

@@ -649,7 +672,7 @@ Native libs does not exist for several popular platforms/architectures, and furt
 Some environments may also prevent deployment of native libs, which brings us back to square one.


-q: What about JMagick or IM4Java? Can't you just use what´s already available?
+q: What about JMagick or IM4Java? Can't you just use what's already available?

 a: While great libraries with a wide range of formats support, the ImageMagick-based libraries has some disadvantages
 compared to ImageIO.
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.twelvemonkeys</groupId>
        <artifactId>twelvemonkeys</artifactId>
-        <version>3.4</version>
+        <version>3.4.4-SNAPSHOT</version>
    </parent>

    <groupId>com.twelvemonkeys.bom</groupId>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.4</version>
+        <version>3.4.4-SNAPSHOT</version>
    </parent>
    <artifactId>common-image</artifactId>
    <packaging>jar</packaging>
@@ -1,110 +1,109 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.image;
-
-import java.awt.image.ImageConsumer;
-import java.awt.image.ImageProducer;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * AbstractImageSource
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/AbstractImageSource.java#1 $
- */
-public abstract class AbstractImageSource implements ImageProducer {
-    private List<ImageConsumer> consumers = new ArrayList<ImageConsumer>();
-    protected int width;
-    protected int height;
-    protected int xOff;
-    protected int yOff;
-
-    // ImageProducer interface
-    public void addConsumer(final ImageConsumer pConsumer) {
-        if (consumers.contains(pConsumer)) {
-            return;
-        }
-
-        consumers.add(pConsumer);
-
-        try {
-            initConsumer(pConsumer);
-            sendPixels(pConsumer);
-
-            if (isConsumer(pConsumer)) {
-                pConsumer.imageComplete(ImageConsumer.STATICIMAGEDONE);
-
-                // Get rid of "sticky" consumers...
-                if (isConsumer(pConsumer)) {
-                    pConsumer.imageComplete(ImageConsumer.IMAGEERROR);
-                    removeConsumer(pConsumer);
-                }
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-
-            if (isConsumer(pConsumer)) {
-                pConsumer.imageComplete(ImageConsumer.IMAGEERROR);
-            }
-        }
-    }
-
-    public void removeConsumer(final ImageConsumer pConsumer) {
-        consumers.remove(pConsumer);
-    }
-
-    /**
-     * This implementation silently ignores this instruction. If pixel data is
-     * not in TDLR order by default, subclasses must override this method.
-     *
-     * @param pConsumer the consumer that requested the resend
-     *
-     * @see ImageProducer#requestTopDownLeftRightResend(java.awt.image.ImageConsumer)
-     */
-    public void requestTopDownLeftRightResend(final ImageConsumer pConsumer) {
-        // ignore
-    }
-
-    public void startProduction(final ImageConsumer pConsumer) {
-        addConsumer(pConsumer);
-    }
-
-    public boolean isConsumer(final ImageConsumer pConsumer) {
-        return consumers.contains(pConsumer);
-    }
-
-    protected abstract void initConsumer(ImageConsumer pConsumer);
-
-    protected abstract void sendPixels(ImageConsumer pConsumer);
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.image;
+
+import java.awt.image.ImageConsumer;
+import java.awt.image.ImageProducer;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * AbstractImageSource
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/AbstractImageSource.java#1 $
+ */
+public abstract class AbstractImageSource implements ImageProducer {
+    private List<ImageConsumer> consumers = new ArrayList<ImageConsumer>();
+    protected int width;
+    protected int height;
+    protected int xOff;
+    protected int yOff;
+
+    // ImageProducer interface
+    public void addConsumer(final ImageConsumer pConsumer) {
+        if (consumers.contains(pConsumer)) {
+            return;
+        }
+
+        consumers.add(pConsumer);
+
+        try {
+            initConsumer(pConsumer);
+            sendPixels(pConsumer);
+
+            if (isConsumer(pConsumer)) {
+                pConsumer.imageComplete(ImageConsumer.STATICIMAGEDONE);
+
+                // Get rid of "sticky" consumers...
+                if (isConsumer(pConsumer)) {
+                    pConsumer.imageComplete(ImageConsumer.IMAGEERROR);
+                    removeConsumer(pConsumer);
+                }
+            }
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+
+            if (isConsumer(pConsumer)) {
+                pConsumer.imageComplete(ImageConsumer.IMAGEERROR);
+            }
+        }
+    }
+
+    public void removeConsumer(final ImageConsumer pConsumer) {
+        consumers.remove(pConsumer);
+    }
+
+    /**
+     * This implementation silently ignores this instruction. If pixel data is
+     * not in TDLR order by default, subclasses must override this method.
+     *
+     * @param pConsumer the consumer that requested the resend
+     *
+     * @see ImageProducer#requestTopDownLeftRightResend(java.awt.image.ImageConsumer)
+     */
+    public void requestTopDownLeftRightResend(final ImageConsumer pConsumer) {
+        // ignore
+    }
+
+    public void startProduction(final ImageConsumer pConsumer) {
+        addConsumer(pConsumer);
+    }
+
+    public boolean isConsumer(final ImageConsumer pConsumer) {
+        return consumers.contains(pConsumer);
+    }
+
+    protected abstract void initConsumer(ImageConsumer pConsumer);
+
+    protected abstract void sendPixels(ImageConsumer pConsumer);
+}
@@ -1,170 +1,173 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.image;
-
-import java.awt.image.RGBImageFilter;
-
-
-/**
- * Adjusts the contrast and brightness of an image.
- * <p/>
- * For brightness, the valid range is {@code -2.0,..,0.0,..,2.0}.
- * A value of {@code 0.0} means no change.
- * Negative values will make the pixels darker.
- * Maximum negative value ({@code -2}) will make all filtered pixels black.
- * Positive values will make the pixels brighter.
- * Maximum positive value ({@code 2}) will make all filtered pixels white.
- * <p/>
- * For contrast, the valid range is {@code -1.0,..,0.0,..,1.0}.
- * A value of {@code 0.0} means no change.
- * Negative values will reduce contrast.
- * Maximum negative value ({@code -1}) will make all filtered pixels grey
- * (no contrast).
- * Positive values will increase contrast.
- * Maximum positive value ({@code 1}) will make all filtered pixels primary
- * colors (either black, white, cyan, magenta, yellow, red, blue or green).
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haku $
- *
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BrightnessContrastFilter.java#1 $
- *
- * @todo consider doing something similar to http://archives.java.sun.com/cgi-bin/wa?A2=ind0302&L=jai-interest&F=&S=&P=15947
- */
-
-public class BrightnessContrastFilter extends RGBImageFilter {
-
-    // TODO: Replace with RescaleOp?
-
-    // This filter can filter IndexColorModel, as it is does not depend on
-    // the pixels' location
-    {
-        canFilterIndexColorModel = true;
-    }
-
-    // Use a pre-calculated lookup table for performance
-    private final int[] LUT;
-
-    /**
-     * Creates a BrightnessContrastFilter with default values
-     * ({@code brightness=0.3, contrast=0.3}).
-     * <p/>
-     * This will slightly increase both brightness and contrast.
-     */
-    public BrightnessContrastFilter() {
-        this(0.3f, 0.3f);
-    }
-
-    /**
-     * Creates a BrightnessContrastFilter with the given values for brightness
-     * and contrast.
-     * <p/>
-     * For brightness, the valid range is {@code -2.0,..,0.0,..,2.0}.
-     * A value of {@code 0.0} means no change.
-     * Negative values will make the pixels darker.
-     * Maximum negative value ({@code -2}) will make all filtered pixels black.
-     * Positive values will make the pixels brighter.
-     * Maximum positive value ({@code 2}) will make all filtered pixels white.
-     * <p/>
-     * For contrast, the valid range is {@code -1.0,..,0.0,..,1.0}.
-     * A value of {@code 0.0} means no change.
-     * Negative values will reduce contrast.
-     * Maximum negative value ({@code -1}) will make all filtered pixels grey
-     * (no contrast).
-     * Positive values will increase contrast.
-     * Maximum positive value ({@code 1}) will make all filtered pixels primary
-     * colors (either black, white, cyan, magenta, yellow, red, blue or green).
-     *
-     * @param pBrightness adjust the brightness of the image, in the range
-     * {@code -2.0,..,0.0,..,2.0}.
-     * @param pContrast adjust the contrast of the image, in the range
-     * {@code -1.0,..,0.0,..,1.0}.
-     */
-    public BrightnessContrastFilter(float pBrightness, float pContrast) {
-        LUT = createLUT(pBrightness, pContrast);
-    }
-
-    private static int[] createLUT(float pBrightness, float pContrast) {
-        int[] lut = new int[256];
-
-        // Hmmm.. This approximates Photoshop values.. Not good though..
-        double contrast = pContrast > 0 ? Math.pow(pContrast, 7.0) * 127.0 : pContrast;
-
-        // Convert range [-1,..,0,..,1] -> [0,..,1,..,2]
-        double brightness = pBrightness + 1.0;
-
-        for (int i = 0; i < 256; i++) {
-            lut[i] = clamp((int) (127.5 * brightness + (i - 127) * (contrast + 1.0)));
-        }
-
-        // Special case, to ensure only primary colors for max contrast
-        if (pContrast == 1f) {
-            lut[127] = lut[126];
-        }
-
-        return lut;
-    }
-
-    private static int clamp(int i) {
-        if (i < 0) {
-            return 0;
-        }
-        if (i > 255) {
-            return 255;
-        }
-        return i;
-    }
-
-    /**
-     * Filters one pixel, adjusting brightness and contrast according to this
-     * filter.
-     *
-     * @param pX x
-     * @param pY y
-     * @param pARGB pixel value in default color space
-     *
-     * @return the filtered pixel value in the default color space
-     */
-    public int filterRGB(int pX, int pY, int pARGB) {
-        // Get color components
-        int r = pARGB >> 16 & 0xFF;
-        int g = pARGB >> 8 & 0xFF;
-        int b = pARGB & 0xFF;
-
-        // Scale to new contrast
-        r = LUT[r];
-        g = LUT[g];
-        b = LUT[b];
-
-        // Return ARGB pixel, leave transparency as is
-        return (pARGB & 0xFF000000) | (r << 16) | (g << 8) | b;
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.image;
+
+import java.awt.image.RGBImageFilter;
+
+
+/**
+ * Adjusts the contrast and brightness of an image.
+ * <p>
+ * For brightness, the valid range is {@code -2.0,..,0.0,..,2.0}.
+ * A value of {@code 0.0} means no change.
+ * Negative values will make the pixels darker.
+ * Maximum negative value ({@code -2}) will make all filtered pixels black.
+ * Positive values will make the pixels brighter.
+ * Maximum positive value ({@code 2}) will make all filtered pixels white.
+ * </p>
+ * <p>
+ * For contrast, the valid range is {@code -1.0,..,0.0,..,1.0}.
+ * A value of {@code 0.0} means no change.
+ * Negative values will reduce contrast.
+ * Maximum negative value ({@code -1}) will make all filtered pixels grey
+ * (no contrast).
+ * Positive values will increase contrast.
+ * Maximum positive value ({@code 1}) will make all filtered pixels primary
+ * colors (either black, white, cyan, magenta, yellow, red, blue or green).
+ * </p>
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haku $
+ *
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BrightnessContrastFilter.java#1 $
+ */
+// TODO: consider doing something similar to http://archives.java.sun.com/cgi-bin/wa?A2=ind0302&L=jai-interest&F=&S=&P=15947
+public class BrightnessContrastFilter extends RGBImageFilter {
+
+    // TODO: Replace with RescaleOp?
+
+    // This filter can filter IndexColorModel, as it is does not depend on
+    // the pixels' location
+    {
+        canFilterIndexColorModel = true;
+    }
+
+    // Use a pre-calculated lookup table for performance
+    private final int[] LUT;
+
+    /**
+     * Creates a BrightnessContrastFilter with default values
+     * ({@code brightness=0.3, contrast=0.3}).
+     * <p>
+     * This will slightly increase both brightness and contrast.
+     * </p>
+     */
+    public BrightnessContrastFilter() {
+        this(0.3f, 0.3f);
+    }
+
+    /**
+     * Creates a BrightnessContrastFilter with the given values for brightness
+     * and contrast.
+     * <p>
+     * For brightness, the valid range is {@code -2.0,..,0.0,..,2.0}.
+     * A value of {@code 0.0} means no change.
+     * Negative values will make the pixels darker.
+     * Maximum negative value ({@code -2}) will make all filtered pixels black.
+     * Positive values will make the pixels brighter.
+     * Maximum positive value ({@code 2}) will make all filtered pixels white.
+     * </p>
+     * <p>
+     * For contrast, the valid range is {@code -1.0,..,0.0,..,1.0}.
+     * A value of {@code 0.0} means no change.
+     * Negative values will reduce contrast.
+     * Maximum negative value ({@code -1}) will make all filtered pixels grey
+     * (no contrast).
+     * Positive values will increase contrast.
+     * Maximum positive value ({@code 1}) will make all filtered pixels primary
+     * colors (either black, white, cyan, magenta, yellow, red, blue or green).
+     * </p>
+     *
+     * @param pBrightness adjust the brightness of the image, in the range
+     * {@code -2.0,..,0.0,..,2.0}.
+     * @param pContrast adjust the contrast of the image, in the range
+     * {@code -1.0,..,0.0,..,1.0}.
+     */
+    public BrightnessContrastFilter(float pBrightness, float pContrast) {
+        LUT = createLUT(pBrightness, pContrast);
+    }
+
+    private static int[] createLUT(float pBrightness, float pContrast) {
+        int[] lut = new int[256];
+
+        // Hmmm.. This approximates Photoshop values.. Not good though..
+        double contrast = pContrast > 0 ? Math.pow(pContrast, 7.0) * 127.0 : pContrast;
+
+        // Convert range [-1,..,0,..,1] -> [0,..,1,..,2]
+        double brightness = pBrightness + 1.0;
+
+        for (int i = 0; i < 256; i++) {
+            lut[i] = clamp((int) (127.5 * brightness + (i - 127) * (contrast + 1.0)));
+        }
+
+        // Special case, to ensure only primary colors for max contrast
+        if (pContrast == 1f) {
+            lut[127] = lut[126];
+        }
+
+        return lut;
+    }
+
+    private static int clamp(int i) {
+        if (i < 0) {
+            return 0;
+        }
+        if (i > 255) {
+            return 255;
+        }
+        return i;
+    }
+
+    /**
+     * Filters one pixel, adjusting brightness and contrast according to this
+     * filter.
+     *
+     * @param pX x
+     * @param pY y
+     * @param pARGB pixel value in default color space
+     *
+     * @return the filtered pixel value in the default color space
+     */
+    public int filterRGB(int pX, int pY, int pARGB) {
+        // Get color components
+        int r = pARGB >> 16 & 0xFF;
+        int g = pARGB >> 8 & 0xFF;
+        int b = pARGB & 0xFF;
+
+        // Scale to new contrast
+        r = LUT[r];
+        g = LUT[g];
+        b = LUT[b];
+
+        // Return ARGB pixel, leave transparency as is
+        return (pARGB & 0xFF000000) | (r << 16) | (g << 8) | b;
+    }
+}
@@ -44,14 +44,16 @@ import java.util.concurrent.CopyOnWriteArrayList;
 * A faster, lighter and easier way to convert an {@code Image} to a
 * {@code BufferedImage} than using a {@code PixelGrabber}.
 * Clients may provide progress listeners to monitor conversion progress.
- * <p/>
+ * <p>
 * Supports source image subsampling and source region extraction.
 * Supports source images with 16 bit {@link ColorModel} and
 * {@link DataBuffer#TYPE_USHORT} transfer type, without converting to
 * 32 bit/TYPE_INT.
- * <p/>
+ * </p>
+ * <p>
 * NOTE: Does not support images with more than one {@code ColorModel} or
 * different types of pixel data. This is not very common.
+ * </p>
 *
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BufferedImageFactory.java#1 $
@@ -1,92 +1,91 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.image;
-
-import com.twelvemonkeys.lang.Validate;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-
-/**
- * An {@code Icon} implementation backed by a {@code BufferedImage}.
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java#2 $
- */
-public class BufferedImageIcon implements Icon {
-    private final BufferedImage image;
-    private int width;
-    private int height;
-    private final boolean fast;
-
-    public BufferedImageIcon(BufferedImage pImage) {
-        this(pImage, pImage != null ? pImage.getWidth() : 0, pImage != null ? pImage.getHeight() : 0);
-    }
-
-    public BufferedImageIcon(BufferedImage pImage, int pWidth, int pHeight) {
-        this(pImage, pWidth, pHeight, pImage.getWidth() == pWidth && pImage.getHeight() == pHeight);
-    }
-
-    public BufferedImageIcon(BufferedImage pImage, int pWidth, int pHeight, boolean useFastRendering) {
-        image = Validate.notNull(pImage, "image");
-        width = Validate.isTrue(pWidth > 0, pWidth, "width must be positive: %d");
-        height = Validate.isTrue(pHeight > 0, pHeight, "height must be positive: %d");
-
-        fast = useFastRendering;
-    }
-
-    public int getIconHeight() {
-        return height;
-    }
-
-    public int getIconWidth() {
-        return width;
-    }
-
-    public void paintIcon(Component c, Graphics g, int x, int y) {
-        if (fast || !(g instanceof Graphics2D)) {
-            //System.out.println("Scaling fast");
-            g.drawImage(image, x, y, width, height, null);
-        }
-        else {
-            //System.out.println("Scaling using interpolation");
-            Graphics2D g2 = (Graphics2D) g;
-            AffineTransform xform = AffineTransform.getTranslateInstance(x, y);
-            xform.scale(width / (double) image.getWidth(), height / (double) image.getHeight());
-            g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
-                                RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-            g2.drawImage(image, xform, null);
-        }
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.image;
+
+import com.twelvemonkeys.lang.Validate;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+
+/**
+ * An {@code Icon} implementation backed by a {@code BufferedImage}.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java#2 $
+ */
+public class BufferedImageIcon implements Icon {
+    private final BufferedImage image;
+    private int width;
+    private int height;
+    private final boolean fast;
+
+    public BufferedImageIcon(BufferedImage pImage) {
+        this(pImage, pImage != null ? pImage.getWidth() : 0, pImage != null ? pImage.getHeight() : 0);
+    }
+
+    public BufferedImageIcon(BufferedImage pImage, int pWidth, int pHeight) {
+        this(pImage, pWidth, pHeight, pImage.getWidth() == pWidth && pImage.getHeight() == pHeight);
+    }
+
+    public BufferedImageIcon(BufferedImage pImage, int pWidth, int pHeight, boolean useFastRendering) {
+        image = Validate.notNull(pImage, "image");
+        width = Validate.isTrue(pWidth > 0, pWidth, "width must be positive: %d");
+        height = Validate.isTrue(pHeight > 0, pHeight, "height must be positive: %d");
+
+        fast = useFastRendering;
+    }
+
+    public int getIconHeight() {
+        return height;
+    }
+
+    public int getIconWidth() {
+        return width;
+    }
+
+    public void paintIcon(Component c, Graphics g, int x, int y) {
+        if (fast || !(g instanceof Graphics2D)) {
+            //System.out.println("Scaling fast");
+            g.drawImage(image, x, y, width, height, null);
+        }
+        else {
+            //System.out.println("Scaling using interpolation");
+            Graphics2D g2 = (Graphics2D) g;
+            AffineTransform xform = AffineTransform.getTranslateInstance(x, y);
+            xform.scale(width / (double) image.getWidth(), height / (double) image.getHeight());
+            g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
+                                RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+            g2.drawImage(image, xform, null);
+        }
+    }
+}
@@ -1,483 +1,485 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.image;
-
-import java.awt.*;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.*;
-import java.util.Random;
-
-/**
- * This {@code BufferedImageOp/RasterOp} implements basic
- * Floyd-Steinberg error-diffusion algorithm for dithering.
- * <P/>
- * The weights used are 7/16, 3/16, 5/16 and 1/16, distributed like this:
- * <!-- - -
- *  | |x|7|
- *  - - - -
- *  |3|5|1|
- *   - - -->
- * <P/>
- * <TABLE border="1" cellpadding="4" cellspacing="0">
- *  <TR><TD bgcolor="#000000">&nbsp;</TD><TD class="TableHeadingColor"
- *          align="center">X</TD><TD>7/16</TD></TR>
- *  <TR><TD>3/16</TD><TD>5/16</TD><TD>1/16</TD></TR>
- * </TABLE>
- * <P/>
- * See <A href="http://www.awprofessional.com/bookstore/product.asp?isbn=0201848406&rl=1">Computer Graphics (Foley et al.)</a>
- * for more information.
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haku $
- *
- * @version $Id: DiffusionDither.java#1 $
- */
-public class DiffusionDither implements BufferedImageOp, RasterOp {
-
-    private static final int FS_SCALE = 1 << 8;
-    private static final Random RANDOM = new Random();
-
-    protected final IndexColorModel indexColorModel;
-    private boolean alternateScans = true;
-
-    /**
-     * Creates a {@code DiffusionDither}, using the given
-     * {@code IndexColorModel} for dithering into.
-     *
-     * @param pICM an IndexColorModel.
-     */
-    public DiffusionDither(final IndexColorModel pICM) {
-        // Store color model
-        indexColorModel = pICM;
-    }
-
-    /**
-     * Creates a {@code DiffusionDither}, with no fixed
-     * {@code IndexColorModel}. The color model will be generated for each
-     * filtering, unless the destination image already has an
-     * {@code IndexColorModel}.
-     */
-    public DiffusionDither() {
-        this(null);
-    }
-
-    /**
-     * Sets the scan mode. If the parameter is true, error distribution for
-     * every even line will be left-to-right, while odd lines will be
-     * right-to-left.
-     * The default is {@code true}.
-     *
-     * @param pUse {@code true} if scan mode should be alternating left/right
-     */
-    public void setAlternateScans(boolean pUse) {
-        alternateScans = pUse;
-    }
-
-    /**
-     * Creates a compatible {@code BufferedImage} to dither into.
-     * Only {@code IndexColorModel} allowed.
-     *
-     * @return a compatible {@code BufferedImage}
-     *
-     * @throws ImageFilterException if {@code pDestCM} is not {@code null} or
-     * an instance of {@code IndexColorModel}.
-     */
-    public final BufferedImage createCompatibleDestImage(BufferedImage pSource, ColorModel pDestCM) {
-        if (pDestCM == null) {
-            return new BufferedImage(pSource.getWidth(), pSource.getHeight(),
-                                     BufferedImage.TYPE_BYTE_INDEXED,
-                                     getICM(pSource));
-        }
-        else if (pDestCM instanceof IndexColorModel) {
-            return new BufferedImage(pSource.getWidth(), pSource.getHeight(),
-                                     BufferedImage.TYPE_BYTE_INDEXED,
-                                     (IndexColorModel) pDestCM);
-        }
-        else {
-            throw new ImageFilterException("Only IndexColorModel allowed.");
-        }
-    }
-
-    /**
-     * Creates a compatible {@code Raster} to dither into.
-     * Only {@code IndexColorModel} allowed.
-     *
-     * @param pSrc the source raster
-     *
-     * @return a {@code WritableRaster}
-     */
-    public final WritableRaster createCompatibleDestRaster(Raster pSrc) {
-        return createCompatibleDestRaster(pSrc, getICM(pSrc));
-    }
-
-    /**
-     * Creates a compatible {@code Raster} to dither into.
-     *
-     * @param pSrc the source raster.
-     * @param pIndexColorModel the index color model used to create a {@code Raster}.
-     *
-     * @return a {@code WritableRaster}
-     */
-    public final WritableRaster createCompatibleDestRaster(Raster pSrc, IndexColorModel pIndexColorModel) {
-        return pIndexColorModel.createCompatibleWritableRaster(pSrc.getWidth(), pSrc.getHeight());
-    }
-
-
-    /**
-     * Returns the bounding box of the filtered destination image.  Since
-     * this is not a geometric operation, the bounding box does not
-     * change.
-     * @param pSrc the {@code BufferedImage} to be filtered
-     * @return the bounds of the filtered definition image.
-     */
-    public final Rectangle2D getBounds2D(BufferedImage pSrc) {
-        return getBounds2D(pSrc.getRaster());
-    }
-
-    /**
-     * Returns the bounding box of the filtered destination Raster.  Since
-     * this is not a geometric operation, the bounding box does not
-     * change.
-     * @param pSrc the {@code Raster} to be filtered
-     * @return the bounds of the filtered definition {@code Raster}.
-     */
-    public final Rectangle2D getBounds2D(Raster pSrc) {
-        return pSrc.getBounds();
-    }
-
-    /**
-     * Returns the location of the destination point given a
-     * point in the source.  If {@code dstPt} is not
-     * {@code null}, it will be used to hold the return value.
-     * Since this is not a geometric operation, the {@code srcPt}
-     * will equal the {@code dstPt}.
-     * @param pSrcPt a {@code Point2D} that represents a point
-     *        in the source image
-     * @param pDstPt a {@code Point2D}that represents the location
-     *        in the destination
-     * @return the {@code Point2D} in the destination that
-     *         corresponds to the specified point in the source.
-     */
-    public final Point2D getPoint2D(Point2D pSrcPt, Point2D pDstPt) {
-        // Create new Point, if needed
-        if (pDstPt == null) {
-            pDstPt = new Point2D.Float();
-        }
-
-        // Copy location
-        pDstPt.setLocation(pSrcPt.getX(), pSrcPt.getY());
-
-        // Return dest
-        return pDstPt;
-    }
-
-    /**
-     * Returns the rendering mHints for this op.
-     * @return the {@code RenderingHints} object associated
-     *         with this op.
-     */
-    public final RenderingHints getRenderingHints() {
-        return null;
-    }
-
-    /**
-     * Converts an int ARGB to int triplet.
-     */
-    private static int[] toRGBArray(int pARGB, int[] pBuffer) {
-        pBuffer[0] = ((pARGB & 0x00ff0000) >> 16);
-        pBuffer[1] = ((pARGB & 0x0000ff00) >> 8);
-        pBuffer[2] = ((pARGB & 0x000000ff));
-        //pBuffer[3] = ((pARGB & 0xff000000) >> 24); // alpha
-
-        return pBuffer;
-    }
-
-    /**
-     * Converts a int triplet to int ARGB.
-     */
-    private static int toIntARGB(int[] pRGB) {
-        return 0xff000000 // All opaque
-                | (pRGB[0] << 16)
-                | (pRGB[1] << 8)
-                | (pRGB[2]);
-        /*
-          | ((int) (pRGB[0] << 16) & 0x00ff0000)
-          | ((int) (pRGB[1] <<  8) & 0x0000ff00)
-          | ((int) (pRGB[2]      ) & 0x000000ff);
-        */
-    }
-
-
-    /**
-     * Performs a single-input/single-output dither operation, applying basic
-     * Floyd-Steinberg error-diffusion to the image.
-     *
-     * @param pSource the source image
-     * @param pDest the destination image
-     *
-     * @return the destination image, or a new image, if {@code pDest} was
-     * {@code null}.
-     */
-    public final BufferedImage filter(BufferedImage pSource, BufferedImage pDest) {
-        // Create destination image, if none provided
-        if (pDest == null) {
-            pDest = createCompatibleDestImage(pSource, getICM(pSource));
-        }
-        else if (!(pDest.getColorModel() instanceof IndexColorModel)) {
-            throw new ImageFilterException("Only IndexColorModel allowed.");
-        }
-
-        // Filter rasters
-        filter(pSource.getRaster(), pDest.getRaster(), (IndexColorModel) pDest.getColorModel());
-
-        return pDest;
-    }
-
-    /**
-     * Performs a single-input/single-output dither operation, applying basic
-     * Floyd-Steinberg error-diffusion to the image.
-     *
-     * @param pSource the source raster, assumed to be in sRGB
-     * @param pDest the destination raster, may be {@code null}
-     *
-     * @return the destination raster, or a new raster, if {@code pDest} was
-     * {@code null}.
-     */
-    public final WritableRaster filter(final Raster pSource, WritableRaster pDest) {
-        return filter(pSource, pDest, getICM(pSource));
-    }
-
-    private IndexColorModel getICM(BufferedImage pSource) {
-        return (indexColorModel != null ? indexColorModel : IndexImage.getIndexColorModel(pSource, 256, IndexImage.TRANSPARENCY_BITMASK));
-    }
-    private IndexColorModel getICM(Raster pSource) {
-        return (indexColorModel != null ? indexColorModel : createIndexColorModel(pSource));
-    }
-
-    private IndexColorModel createIndexColorModel(Raster pSource) {
-        BufferedImage image = new BufferedImage(pSource.getWidth(), pSource.getHeight(),
-                                                BufferedImage.TYPE_INT_ARGB);
-        image.setData(pSource);
-        return IndexImage.getIndexColorModel(image, 256, IndexImage.TRANSPARENCY_BITMASK);
-    }
-
-    /**
-     * Performs a single-input/single-output dither operation, applying basic
-     * Floyd-Steinberg error-diffusion to the image.
-     *
-     * @param pSource the source raster, assumed to be in sRGB
-     * @param pDest the destination raster, may be {@code null}
-     * @param pColorModel the indexed color model to use
-     *
-     * @return the destination raster, or a new raster, if {@code pDest} was
-     * {@code null}.
-     */
-    public final WritableRaster filter(final Raster pSource, WritableRaster pDest, IndexColorModel pColorModel) {
-        int width = pSource.getWidth();
-        int height = pSource.getHeight();
-
-        // Create destination raster if needed
-        if (pDest == null) {
-            pDest = createCompatibleDestRaster(pSource, pColorModel);
-        }
-
-        // Initialize Floyd-Steinberg error vectors.
-        // +2 to handle the previous pixel and next pixel case minimally
-        // When reference for column, add 1 to reference as this buffer is
-        // offset from actual column position by one to allow FS to not check
-        // left/right edge conditions
-        int[][] currErr = new int[width + 2][3];
-        int[][] nextErr = new int[width + 2][3];
-
-        // Random errors in [-1 .. 1] - for first row
-        for (int i = 0; i < width + 2; i++) {
-            // Note: This is broken for the strange cases where nextInt returns Integer.MIN_VALUE
-            currErr[i][0] = RANDOM.nextInt(FS_SCALE * 2) - FS_SCALE;
-            currErr[i][1] = RANDOM.nextInt(FS_SCALE * 2) - FS_SCALE;
-            currErr[i][2] = RANDOM.nextInt(FS_SCALE * 2) - FS_SCALE;
-        }
-
-        // Temp buffers
-        final int[] diff = new int[3]; // No alpha
-        final int[] inRGB = new int[4];
-        final int[] outRGB = new int[4];
-        Object pixel = null;
-        boolean forward = true;
-
-        // Loop through image data
-        for (int y = 0; y < height; y++) {
-            // Clear out next error rows for colour errors
-            for (int i = nextErr.length; --i >= 0;) {
-                nextErr[i][0] = 0;
-                nextErr[i][1] = 0;
-                nextErr[i][2] = 0;
-            }
-
-            // Set up start column and limit
-            int x;
-            int limit;
-            if (forward) {
-                x = 0;
-                limit = width;
-            }
-            else {
-                x = width - 1;
-                limit = -1;
-            }
-
-            // TODO: Use getPixels instead of getPixel for better performance?            
-
-            // Loop over row
-            while (true) {
-                // Get RGB from original raster
-                // DON'T KNOW IF THIS WILL WORK FOR ALL TYPES.
-                pSource.getPixel(x, y, inRGB);
-
-                // Get error for this pixel & add error to rgb
-                for (int i = 0; i < 3; i++) {
-                    // Make a 28.4 FP number, add Error (with fraction),
-                    // rounding and truncate to int
-                    inRGB[i] = ((inRGB[i] << 4) + currErr[x + 1][i] + 0x08) >> 4;
-
-                    // Clamp
-                    if (inRGB[i] > 255) {
-                        inRGB[i] = 255;
-                    }
-                    else if (inRGB[i] < 0) {
-                        inRGB[i] = 0;
-                    }
-                }
-
-                // Get pixel value...
-                // It is VERY important that we are using a IndexColorModel that
-                // support reverse color lookup for speed.
-                pixel = pColorModel.getDataElements(toIntARGB(inRGB), pixel);
-
-                // ...set it...
-                pDest.setDataElements(x, y, pixel);
-
-                // ..and get back the closet match
-                pDest.getPixel(x, y, outRGB);
-
-                // Convert the value to default sRGB
-                // Should work for all transfertypes supported by IndexColorModel
-                toRGBArray(pColorModel.getRGB(outRGB[0]), outRGB);
-
-                // Find diff
-                diff[0] = inRGB[0] - outRGB[0];
-                diff[1] = inRGB[1] - outRGB[1];
-                diff[2] = inRGB[2] - outRGB[2];
-
-                // Apply F-S error diffusion
-                // Serpentine scan: left-right
-                if (forward) {
-                    // Row 1 (y)
-                    // Update error in this pixel (x + 1)
-                    currErr[x + 2][0] += diff[0] * 7;
-                    currErr[x + 2][1] += diff[1] * 7;
-                    currErr[x + 2][2] += diff[2] * 7;
-
-                    // Row 2 (y + 1)
-                    // Update error in this pixel (x - 1)
-                    nextErr[x][0] += diff[0] * 3;
-                    nextErr[x][1] += diff[1] * 3;
-                    nextErr[x][2] += diff[2] * 3;
-                    // Update error in this pixel (x)
-                    nextErr[x + 1][0] += diff[0] * 5;
-                    nextErr[x + 1][1] += diff[1] * 5;
-                    nextErr[x + 1][2] += diff[2] * 5;
-                    // Update error in this pixel (x + 1)
-                    // TODO: Consider calculating this using
-                    // error term = error - sum(error terms 1, 2 and 3)
-                    // See Computer Graphics (Foley et al.), p. 573
-                    nextErr[x + 2][0] += diff[0]; // * 1;
-                    nextErr[x + 2][1] += diff[1]; // * 1;
-                    nextErr[x + 2][2] += diff[2]; // * 1;
-
-                    // Next
-                    x++;
-
-                    // Done?
-                    if (x >= limit) {
-                        break;
-                    }
-
-                }
-                else {
-                    // Row 1 (y)
-                    // Update error in this pixel (x - 1)
-                    currErr[x][0] += diff[0] * 7;
-                    currErr[x][1] += diff[1] * 7;
-                    currErr[x][2] += diff[2] * 7;
-
-                    // Row 2 (y + 1)
-                    // Update error in this pixel (x + 1)
-                    nextErr[x + 2][0] += diff[0] * 3;
-                    nextErr[x + 2][1] += diff[1] * 3;
-                    nextErr[x + 2][2] += diff[2] * 3;
-                    // Update error in this pixel (x)
-                    nextErr[x + 1][0] += diff[0] * 5;
-                    nextErr[x + 1][1] += diff[1] * 5;
-                    nextErr[x + 1][2] += diff[2] * 5;
-                    // Update error in this pixel (x - 1)
-                    // TODO: Consider calculating this using
-                    // error term = error - sum(error terms 1, 2 and 3)
-                    // See Computer Graphics (Foley et al.), p. 573
-                    nextErr[x][0] += diff[0]; // * 1;
-                    nextErr[x][1] += diff[1]; // * 1;
-                    nextErr[x][2] += diff[2]; // * 1;
-
-                    // Previous
-                    x--;
-
-                    // Done?
-                    if (x <= limit) {
-                        break;
-                    }
-                }
-            }
-
-            // Make next error info current for next iteration
-            int[][] temperr;
-            temperr = currErr;
-            currErr = nextErr;
-            nextErr = temperr;
-
-            // Toggle direction
-            if (alternateScans) {
-                forward = !forward;
-            }
-        }
-
-        return pDest;
-    }
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.image;
+
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.*;
+import java.util.Random;
+
+/**
+ * This {@code BufferedImageOp/RasterOp} implements basic
+ * Floyd-Steinberg error-diffusion algorithm for dithering.
+ * <p>
+ * The weights used are 7/16, 3/16, 5/16 and 1/16, distributed like this:
+ * <!-- - -
+ *  | |x|7|
+ *  - - - -
+ *  |3|5|1|
+ *   - - -->
+ * </p>
+ * <table border="1" cellpadding="4" cellspacing="0">
+ *     <caption>Floyd-Steinberg error-diffusion weights</caption>
+ *     <tr><td bgcolor="#000000">&nbsp;</td><td class="TableHeadingColor"
+ *          align="center">x</td><td>7/16</td></tr>
+ *     <tr><td>3/16</td><td>5/16</td><td>1/16</td></tr>
+ * </table>
+ * <p>
+ * See <A href="http://www.awprofessional.com/bookstore/product.asp?isbn=0201848406&rl=1">Computer Graphics (Foley et al.)</a>
+ * for more information.
+ * </p>
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haku $
+ *
+ * @version $Id: DiffusionDither.java#1 $
+ */
+public class DiffusionDither implements BufferedImageOp, RasterOp {
+
+    private static final int FS_SCALE = 1 << 8;
+    private static final Random RANDOM = new Random();
+
+    protected final IndexColorModel indexColorModel;
+    private boolean alternateScans = true;
+
+    /**
+     * Creates a {@code DiffusionDither}, using the given
+     * {@code IndexColorModel} for dithering into.
+     *
+     * @param pICM an IndexColorModel.
+     */
+    public DiffusionDither(final IndexColorModel pICM) {
+        // Store color model
+        indexColorModel = pICM;
+    }
+
+    /**
+     * Creates a {@code DiffusionDither}, with no fixed
+     * {@code IndexColorModel}. The color model will be generated for each
+     * filtering, unless the destination image already has an
+     * {@code IndexColorModel}.
+     */
+    public DiffusionDither() {
+        this(null);
+    }
+
+    /**
+     * Sets the scan mode. If the parameter is true, error distribution for
+     * every even line will be left-to-right, while odd lines will be
+     * right-to-left.
+     * The default is {@code true}.
+     *
+     * @param pUse {@code true} if scan mode should be alternating left/right
+     */
+    public void setAlternateScans(boolean pUse) {
+        alternateScans = pUse;
+    }
+
+    /**
+     * Creates a compatible {@code BufferedImage} to dither into.
+     * Only {@code IndexColorModel} allowed.
+     *
+     * @return a compatible {@code BufferedImage}
+     *
+     * @throws ImageFilterException if {@code pDestCM} is not {@code null} or
+     * an instance of {@code IndexColorModel}.
+     */
+    public final BufferedImage createCompatibleDestImage(BufferedImage pSource, ColorModel pDestCM) {
+        if (pDestCM == null) {
+            return new BufferedImage(pSource.getWidth(), pSource.getHeight(),
+                                     BufferedImage.TYPE_BYTE_INDEXED,
+                                     getICM(pSource));
+        }
+        else if (pDestCM instanceof IndexColorModel) {
+            return new BufferedImage(pSource.getWidth(), pSource.getHeight(),
+                                     BufferedImage.TYPE_BYTE_INDEXED,
+                                     (IndexColorModel) pDestCM);
+        }
+        else {
+            throw new ImageFilterException("Only IndexColorModel allowed.");
+        }
+    }
+
+    /**
+     * Creates a compatible {@code Raster} to dither into.
+     * Only {@code IndexColorModel} allowed.
+     *
+     * @param pSrc the source raster
+     *
+     * @return a {@code WritableRaster}
+     */
+    public final WritableRaster createCompatibleDestRaster(Raster pSrc) {
+        return createCompatibleDestRaster(pSrc, getICM(pSrc));
+    }
+
+    /**
+     * Creates a compatible {@code Raster} to dither into.
+     *
+     * @param pSrc the source raster.
+     * @param pIndexColorModel the index color model used to create a {@code Raster}.
+     *
+     * @return a {@code WritableRaster}
+     */
+    public final WritableRaster createCompatibleDestRaster(Raster pSrc, IndexColorModel pIndexColorModel) {
+        return pIndexColorModel.createCompatibleWritableRaster(pSrc.getWidth(), pSrc.getHeight());
+    }
+
+
+    /**
+     * Returns the bounding box of the filtered destination image.  Since
+     * this is not a geometric operation, the bounding box does not
+     * change.
+     * @param pSrc the {@code BufferedImage} to be filtered
+     * @return the bounds of the filtered definition image.
+     */
+    public final Rectangle2D getBounds2D(BufferedImage pSrc) {
+        return getBounds2D(pSrc.getRaster());
+    }
+
+    /**
+     * Returns the bounding box of the filtered destination Raster.  Since
+     * this is not a geometric operation, the bounding box does not
+     * change.
+     * @param pSrc the {@code Raster} to be filtered
+     * @return the bounds of the filtered definition {@code Raster}.
+     */
+    public final Rectangle2D getBounds2D(Raster pSrc) {
+        return pSrc.getBounds();
+    }
+
+    /**
+     * Returns the location of the destination point given a
+     * point in the source.  If {@code dstPt} is not
+     * {@code null}, it will be used to hold the return value.
+     * Since this is not a geometric operation, the {@code srcPt}
+     * will equal the {@code dstPt}.
+     * @param pSrcPt a {@code Point2D} that represents a point
+     *        in the source image
+     * @param pDstPt a {@code Point2D}that represents the location
+     *        in the destination
+     * @return the {@code Point2D} in the destination that
+     *         corresponds to the specified point in the source.
+     */
+    public final Point2D getPoint2D(Point2D pSrcPt, Point2D pDstPt) {
+        // Create new Point, if needed
+        if (pDstPt == null) {
+            pDstPt = new Point2D.Float();
+        }
+
+        // Copy location
+        pDstPt.setLocation(pSrcPt.getX(), pSrcPt.getY());
+
+        // Return dest
+        return pDstPt;
+    }
+
+    /**
+     * Returns the rendering mHints for this op.
+     * @return the {@code RenderingHints} object associated
+     *         with this op.
+     */
+    public final RenderingHints getRenderingHints() {
+        return null;
+    }
+
+    /**
+     * Converts an int ARGB to int triplet.
+     */
+    private static int[] toRGBArray(int pARGB, int[] pBuffer) {
+        pBuffer[0] = ((pARGB & 0x00ff0000) >> 16);
+        pBuffer[1] = ((pARGB & 0x0000ff00) >> 8);
+        pBuffer[2] = ((pARGB & 0x000000ff));
+        //pBuffer[3] = ((pARGB & 0xff000000) >> 24); // alpha
+
+        return pBuffer;
+    }
+
+    /**
+     * Converts a int triplet to int ARGB.
+     */
+    private static int toIntARGB(int[] pRGB) {
+        return 0xff000000 // All opaque
+                | (pRGB[0] << 16)
+                | (pRGB[1] << 8)
+                | (pRGB[2]);
+        /*
+          | ((int) (pRGB[0] << 16) & 0x00ff0000)
+          | ((int) (pRGB[1] <<  8) & 0x0000ff00)
+          | ((int) (pRGB[2]      ) & 0x000000ff);
+        */
+    }
+
+
+    /**
+     * Performs a single-input/single-output dither operation, applying basic
+     * Floyd-Steinberg error-diffusion to the image.
+     *
+     * @param pSource the source image
+     * @param pDest the destination image
+     *
+     * @return the destination image, or a new image, if {@code pDest} was
+     * {@code null}.
+     */
+    public final BufferedImage filter(BufferedImage pSource, BufferedImage pDest) {
+        // Create destination image, if none provided
+        if (pDest == null) {
+            pDest = createCompatibleDestImage(pSource, getICM(pSource));
+        }
+        else if (!(pDest.getColorModel() instanceof IndexColorModel)) {
+            throw new ImageFilterException("Only IndexColorModel allowed.");
+        }
+
+        // Filter rasters
+        filter(pSource.getRaster(), pDest.getRaster(), (IndexColorModel) pDest.getColorModel());
+
+        return pDest;
+    }
+
+    /**
+     * Performs a single-input/single-output dither operation, applying basic
+     * Floyd-Steinberg error-diffusion to the image.
+     *
+     * @param pSource the source raster, assumed to be in sRGB
+     * @param pDest the destination raster, may be {@code null}
+     *
+     * @return the destination raster, or a new raster, if {@code pDest} was
+     * {@code null}.
+     */
+    public final WritableRaster filter(final Raster pSource, WritableRaster pDest) {
+        return filter(pSource, pDest, getICM(pSource));
+    }
+
+    private IndexColorModel getICM(BufferedImage pSource) {
+        return (indexColorModel != null ? indexColorModel : IndexImage.getIndexColorModel(pSource, 256, IndexImage.TRANSPARENCY_BITMASK));
+    }
+    private IndexColorModel getICM(Raster pSource) {
+        return (indexColorModel != null ? indexColorModel : createIndexColorModel(pSource));
+    }
+
+    private IndexColorModel createIndexColorModel(Raster pSource) {
+        BufferedImage image = new BufferedImage(pSource.getWidth(), pSource.getHeight(),
+                                                BufferedImage.TYPE_INT_ARGB);
+        image.setData(pSource);
+        return IndexImage.getIndexColorModel(image, 256, IndexImage.TRANSPARENCY_BITMASK);
+    }
+
+    /**
+     * Performs a single-input/single-output dither operation, applying basic
+     * Floyd-Steinberg error-diffusion to the image.
+     *
+     * @param pSource the source raster, assumed to be in sRGB
+     * @param pDest the destination raster, may be {@code null}
+     * @param pColorModel the indexed color model to use
+     *
+     * @return the destination raster, or a new raster, if {@code pDest} was
+     * {@code null}.
+     */
+    public final WritableRaster filter(final Raster pSource, WritableRaster pDest, IndexColorModel pColorModel) {
+        int width = pSource.getWidth();
+        int height = pSource.getHeight();
+
+        // Create destination raster if needed
+        if (pDest == null) {
+            pDest = createCompatibleDestRaster(pSource, pColorModel);
+        }
+
+        // Initialize Floyd-Steinberg error vectors.
+        // +2 to handle the previous pixel and next pixel case minimally
+        // When reference for column, add 1 to reference as this buffer is
+        // offset from actual column position by one to allow FS to not check
+        // left/right edge conditions
+        int[][] currErr = new int[width + 2][3];
+        int[][] nextErr = new int[width + 2][3];
+
+        // Random errors in [-1 .. 1] - for first row
+        for (int i = 0; i < width + 2; i++) {
+            // Note: This is broken for the strange cases where nextInt returns Integer.MIN_VALUE
+            currErr[i][0] = RANDOM.nextInt(FS_SCALE * 2) - FS_SCALE;
+            currErr[i][1] = RANDOM.nextInt(FS_SCALE * 2) - FS_SCALE;
+            currErr[i][2] = RANDOM.nextInt(FS_SCALE * 2) - FS_SCALE;
+        }
+
+        // Temp buffers
+        final int[] diff = new int[3]; // No alpha
+        final int[] inRGB = new int[4];
+        final int[] outRGB = new int[4];
+        Object pixel = null;
+        boolean forward = true;
+
+        // Loop through image data
+        for (int y = 0; y < height; y++) {
+            // Clear out next error rows for colour errors
+            for (int i = nextErr.length; --i >= 0;) {
+                nextErr[i][0] = 0;
+                nextErr[i][1] = 0;
+                nextErr[i][2] = 0;
+            }
+
+            // Set up start column and limit
+            int x;
+            int limit;
+            if (forward) {
+                x = 0;
+                limit = width;
+            }
+            else {
+                x = width - 1;
+                limit = -1;
+            }
+
+            // TODO: Use getPixels instead of getPixel for better performance?            
+
+            // Loop over row
+            while (true) {
+                // Get RGB from original raster
+                // DON'T KNOW IF THIS WILL WORK FOR ALL TYPES.
+                pSource.getPixel(x, y, inRGB);
+
+                // Get error for this pixel & add error to rgb
+                for (int i = 0; i < 3; i++) {
+                    // Make a 28.4 FP number, add Error (with fraction),
+                    // rounding and truncate to int
+                    inRGB[i] = ((inRGB[i] << 4) + currErr[x + 1][i] + 0x08) >> 4;
+
+                    // Clamp
+                    if (inRGB[i] > 255) {
+                        inRGB[i] = 255;
+                    }
+                    else if (inRGB[i] < 0) {
+                        inRGB[i] = 0;
+                    }
+                }
+
+                // Get pixel value...
+                // It is VERY important that we are using a IndexColorModel that
+                // support reverse color lookup for speed.
+                pixel = pColorModel.getDataElements(toIntARGB(inRGB), pixel);
+
+                // ...set it...
+                pDest.setDataElements(x, y, pixel);
+
+                // ..and get back the closet match
+                pDest.getPixel(x, y, outRGB);
+
+                // Convert the value to default sRGB
+                // Should work for all transfertypes supported by IndexColorModel
+                toRGBArray(pColorModel.getRGB(outRGB[0]), outRGB);
+
+                // Find diff
+                diff[0] = inRGB[0] - outRGB[0];
+                diff[1] = inRGB[1] - outRGB[1];
+                diff[2] = inRGB[2] - outRGB[2];
+
+                // Apply F-S error diffusion
+                // Serpentine scan: left-right
+                if (forward) {
+                    // Row 1 (y)
+                    // Update error in this pixel (x + 1)
+                    currErr[x + 2][0] += diff[0] * 7;
+                    currErr[x + 2][1] += diff[1] * 7;
+                    currErr[x + 2][2] += diff[2] * 7;
+
+                    // Row 2 (y + 1)
+                    // Update error in this pixel (x - 1)
+                    nextErr[x][0] += diff[0] * 3;
+                    nextErr[x][1] += diff[1] * 3;
+                    nextErr[x][2] += diff[2] * 3;
+                    // Update error in this pixel (x)
+                    nextErr[x + 1][0] += diff[0] * 5;
+                    nextErr[x + 1][1] += diff[1] * 5;
+                    nextErr[x + 1][2] += diff[2] * 5;
+                    // Update error in this pixel (x + 1)
+                    // TODO: Consider calculating this using
+                    // error term = error - sum(error terms 1, 2 and 3)
+                    // See Computer Graphics (Foley et al.), p. 573
+                    nextErr[x + 2][0] += diff[0]; // * 1;
+                    nextErr[x + 2][1] += diff[1]; // * 1;
+                    nextErr[x + 2][2] += diff[2]; // * 1;
+
+                    // Next
+                    x++;
+
+                    // Done?
+                    if (x >= limit) {
+                        break;
+                    }
+
+                }
+                else {
+                    // Row 1 (y)
+                    // Update error in this pixel (x - 1)
+                    currErr[x][0] += diff[0] * 7;
+                    currErr[x][1] += diff[1] * 7;
+                    currErr[x][2] += diff[2] * 7;
+
+                    // Row 2 (y + 1)
+                    // Update error in this pixel (x + 1)
+                    nextErr[x + 2][0] += diff[0] * 3;
+                    nextErr[x + 2][1] += diff[1] * 3;
+                    nextErr[x + 2][2] += diff[2] * 3;
+                    // Update error in this pixel (x)
+                    nextErr[x + 1][0] += diff[0] * 5;
+                    nextErr[x + 1][1] += diff[1] * 5;
+                    nextErr[x + 1][2] += diff[2] * 5;
+                    // Update error in this pixel (x - 1)
+                    // TODO: Consider calculating this using
+                    // error term = error - sum(error terms 1, 2 and 3)
+                    // See Computer Graphics (Foley et al.), p. 573
+                    nextErr[x][0] += diff[0]; // * 1;
+                    nextErr[x][1] += diff[1]; // * 1;
+                    nextErr[x][2] += diff[2]; // * 1;
+
+                    // Previous
+                    x--;
+
+                    // Done?
+                    if (x <= limit) {
+                        break;
+                    }
+                }
+            }
+
+            // Make next error info current for next iteration
+            int[][] temperr;
+            temperr = currErr;
+            currErr = nextErr;
+            nextErr = temperr;
+
+            // Toggle direction
+            if (alternateScans) {
+                forward = !forward;
+            }
+        }
+
+        return pDest;
+    }
 }
@@ -1,84 +1,86 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.image;
-
-import java.awt.*;
-
-/**
- * GraphicsUtil
- *
- * @author <a href="mailto:harald.kuhr@gmail.no">Harald Kuhr</a>
- * @author last modified by $Author: haku $
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GraphicsUtil.java#1 $
- */
-public final class GraphicsUtil {
-
-    /**
-     * Enables anti-aliasing in the {@code Graphics} object.
-     * <p/>
-     * Anti-aliasing is enabled by casting to {@code Graphics2D} and setting
-     * the rendering hint {@code RenderingHints.KEY_ANTIALIASING} to
-     * {@code RenderingHints.VALUE_ANTIALIAS_ON}.
-     *
-     * @param pGraphics the graphics object
-     * @throws ClassCastException if {@code pGraphics} is not an instance of
-     *         {@code Graphics2D}.
-     *
-     * @see java.awt.RenderingHints#KEY_ANTIALIASING
-     */
-    public static void enableAA(final Graphics pGraphics) {
-        ((Graphics2D) pGraphics).setRenderingHint(
-                RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON
-        );
-    }
-
-    /**
-     * Sets the alpha in the {@code Graphics} object.
-     * <p/>
-     * Alpha is set by casting to {@code Graphics2D} and setting the composite
-     * to the rule {@code AlphaComposite.SRC_OVER} multiplied by the given
-     * alpha.
-     *
-     * @param pGraphics the graphics object
-     * @param pAlpha the alpha level, {@code alpha} must be a floating point
-     *        number in the inclusive range [0.0,&nbsp;1.0].
-     * @throws ClassCastException if {@code pGraphics} is not an instance of
-     *         {@code Graphics2D}.
-     *
-     * @see java.awt.AlphaComposite#SRC_OVER
-     * @see java.awt.AlphaComposite#getInstance(int, float)
-     */
-    public static void setAlpha(final Graphics pGraphics, final float pAlpha) {
-        ((Graphics2D) pGraphics).setComposite(
-                AlphaComposite.getInstance(AlphaComposite.SRC_OVER, pAlpha)
-        );
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.image;
+
+import java.awt.*;
+
+/**
+ * GraphicsUtil
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.no">Harald Kuhr</a>
+ * @author last modified by $Author: haku $
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GraphicsUtil.java#1 $
+ */
+public final class GraphicsUtil {
+
+    /**
+     * Enables anti-aliasing in the {@code Graphics} object.
+     * <p>
+     * Anti-aliasing is enabled by casting to {@code Graphics2D} and setting
+     * the rendering hint {@code RenderingHints.KEY_ANTIALIASING} to
+     * {@code RenderingHints.VALUE_ANTIALIAS_ON}.
+     * </p>
+     *
+     * @param pGraphics the graphics object
+     * @throws ClassCastException if {@code pGraphics} is not an instance of
+     *         {@code Graphics2D}.
+     *
+     * @see java.awt.RenderingHints#KEY_ANTIALIASING
+     */
+    public static void enableAA(final Graphics pGraphics) {
+        ((Graphics2D) pGraphics).setRenderingHint(
+                RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON
+        );
+    }
+
+    /**
+     * Sets the alpha in the {@code Graphics} object.
+     * <p>
+     * Alpha is set by casting to {@code Graphics2D} and setting the composite
+     * to the rule {@code AlphaComposite.SRC_OVER} multiplied by the given
+     * alpha.
+     * </p>
+     *
+     * @param pGraphics the graphics object
+     * @param pAlpha the alpha level, {@code alpha} must be a floating point
+     *        number in the inclusive range [0.0,&nbsp;1.0].
+     * @throws ClassCastException if {@code pGraphics} is not an instance of
+     *         {@code Graphics2D}.
+     *
+     * @see java.awt.AlphaComposite#SRC_OVER
+     * @see java.awt.AlphaComposite#getInstance(int, float)
+     */
+    public static void setAlpha(final Graphics pGraphics, final float pAlpha) {
+        ((Graphics2D) pGraphics).setComposite(
+                AlphaComposite.getInstance(AlphaComposite.SRC_OVER, pAlpha)
+        );
+    }
+}
@@ -1,131 +1,132 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.image;
-
-import java.awt.image.RGBImageFilter;
-
-/**
- * This class can convert a color image to grayscale.
- * <P/>
- * Uses ITU standard conversion: (222 * Red + 707 * Green + 71 * Blue) / 1000.
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haku $
- *
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GrayFilter.java#1 $
- *
- */
-public class GrayFilter extends RGBImageFilter {
-
-    // This filter can filter IndexColorModel
-    {
-        canFilterIndexColorModel = true;
-    }
-
-    private int low = 0;
-    private float range = 1.0f;
-
-    /**
-     * Constructs a GrayFilter using ITU color-conversion.
-     */
-    public GrayFilter() {
-    }
-
-    /**
-     * Constructs a GrayFilter using ITU color-conversion, and a dynamic range between
-     * pLow and pHigh.
-     *
-     * @param pLow float in the range  0..1
-     * @param pHigh float in the range 0..1 and >= pLow
-     */
-    public GrayFilter(float pLow, float pHigh) {
-        if (pLow > pHigh) {
-            pLow = 0f;
-        }
-        // Make sure high and low are inside range
-        if (pLow < 0f) {
-            pLow = 0f;
-        }
-        else if (pLow > 1f) {
-            pLow = 1f;
-        }
-        if (pHigh < 0f) {
-            pHigh = 0f;
-        }
-        else if (pHigh > 1f) {
-            pHigh = 1f;
-        }
-
-        low = (int) (pLow * 255f);
-        range = pHigh - pLow;
-
-    }
-
-    /**
-     * Constructs a GrayFilter using ITU color-conversion, and a dynamic
-     * range between pLow and pHigh.
-     *
-     * @param pLow integer in the range 0..255
-     * @param pHigh inteeger in the range 0..255 and >= pLow
-     */
-    public GrayFilter(int pLow, int pHigh) {
-        this(pLow / 255f, pHigh / 255f);
-    }
-
-    /**
-     * Filters one pixel using ITU color-conversion.
-     *
-     * @param pX x
-     * @param pY y
-     * @param pARGB pixel value in default color space
-     *
-     * @return the filtered pixel value in the default color space
-     */
-    public int filterRGB(int pX, int pY, int pARGB) {
-        // Get color components
-        int r = pARGB >> 16 & 0xFF;
-        int g = pARGB >>  8 & 0xFF;
-        int b = pARGB       & 0xFF;
-
-        // ITU standard:  Gray scale=(222*Red+707*Green+71*Blue)/1000
-        int gray = (222 * r + 707 * g + 71 * b) / 1000;
-
-        //int gray = (int) ((float) (r + g + b) / 3.0f);
-
-        if (range != 1.0f) {
-            // Apply range
-            gray =  low + (int) (gray * range);
-        }
-
-        // Return ARGB pixel
-        return  (pARGB & 0xFF000000) | (gray << 16) | (gray << 8) | gray;
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.image;
+
+import java.awt.image.RGBImageFilter;
+
+/**
+ * This class can convert a color image to grayscale.
+ * <p>
+ * Uses ITU standard conversion: (222 * Red + 707 * Green + 71 * Blue) / 1000.
+ * </p>
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haku $
+ *
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GrayFilter.java#1 $
+ *
+ */
+public class GrayFilter extends RGBImageFilter {
+
+    // This filter can filter IndexColorModel
+    {
+        canFilterIndexColorModel = true;
+    }
+
+    private int low = 0;
+    private float range = 1.0f;
+
+    /**
+     * Constructs a GrayFilter using ITU color-conversion.
+     */
+    public GrayFilter() {
+    }
+
+    /**
+     * Constructs a GrayFilter using ITU color-conversion, and a dynamic range between
+     * pLow and pHigh.
+     *
+     * @param pLow float in the range  0..1
+     * @param pHigh float in the range 0..1 and &gt;= pLow
+     */
+    public GrayFilter(float pLow, float pHigh) {
+        if (pLow > pHigh) {
+            pLow = 0f;
+        }
+        // Make sure high and low are inside range
+        if (pLow < 0f) {
+            pLow = 0f;
+        }
+        else if (pLow > 1f) {
+            pLow = 1f;
+        }
+        if (pHigh < 0f) {
+            pHigh = 0f;
+        }
+        else if (pHigh > 1f) {
+            pHigh = 1f;
+        }
+
+        low = (int) (pLow * 255f);
+        range = pHigh - pLow;
+
+    }
+
+    /**
+     * Constructs a GrayFilter using ITU color-conversion, and a dynamic
+     * range between pLow and pHigh.
+     *
+     * @param pLow integer in the range 0..255
+     * @param pHigh integer in the range 0..255 and &gt;= pLow
+     */
+    public GrayFilter(int pLow, int pHigh) {
+        this(pLow / 255f, pHigh / 255f);
+    }
+
+    /**
+     * Filters one pixel using ITU color-conversion.
+     *
+     * @param pX x
+     * @param pY y
+     * @param pARGB pixel value in default color space
+     *
+     * @return the filtered pixel value in the default color space
+     */
+    public int filterRGB(int pX, int pY, int pARGB) {
+        // Get color components
+        int r = pARGB >> 16 & 0xFF;
+        int g = pARGB >>  8 & 0xFF;
+        int b = pARGB       & 0xFF;
+
+        // ITU standard:  Gray scale=(222*Red+707*Green+71*Blue)/1000
+        int gray = (222 * r + 707 * g + 71 * b) / 1000;
+
+        //int gray = (int) ((float) (r + g + b) / 3.0f);
+
+        if (range != 1.0f) {
+            // Apply range
+            gray =  low + (int) (gray * range);
+        }
+
+        // Return ARGB pixel
+        return  (pARGB & 0xFF000000) | (gray << 16) | (gray << 8) | gray;
+    }
+}
@@ -1,213 +1,214 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.image;
-
-/**
- * Inverse Colormap to provide efficient lookup of any given input color
- * to the closest match to the given color map.
- * <p/>
- * Based on "Efficient Inverse Color Map Computation" by Spencer W. Thomas
- * in "Graphics Gems Volume II"
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author Robin Luiten (Java port)
- * @author Spencer W. Thomas (original c version).
- *
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/InverseColorMap.java#1 $
- */
-class InverseColorMap {
-    /**
-     * Number of high bits of each color channel to use to lookup near match
-     */
-    final static int QUANTBITS = 5;
-
-    /**
-     * Truncated bits of each color channel
-     */
-    final static int TRUNCBITS = 8 - QUANTBITS;
-
-    /**
-     * BITMASK representing the bits for blue in the color lookup
-     */
-    final static int QUANTMASK_BLUE = (1 << 5) - 1;
-
-    /**
-     * BITMASK representing the bits for green in the color lookup
-     */
-    final static int QUANTMASK_GREEN = (QUANTMASK_BLUE << QUANTBITS);
-
-    /**
-     * BITMASK representing the bits for red in the color lookup
-     */
-    final static int QUANTMASK_RED = (QUANTMASK_GREEN << QUANTBITS);
-
-    /**
-     * Maximum value a quantised color channel can have
-     */
-    final static int MAXQUANTVAL = 1 << 5;
-
-    byte[] rgbMapByte;
-    int[] rgbMapInt;
-    int numColors;
-    int maxColor;
-    byte[] inverseRGB;   		// inverse rgb color map
-    int transparentIndex = -1;
-
-    /**
-     * @param pRGBColorMap the rgb color map to create inverse color map for.
-     */
-    InverseColorMap(byte[] pRGBColorMap) {
-        this(pRGBColorMap, -1);
-    }
-
-    /**
-     * @param pRGBColorMap the rgb color map to create inverse color map for.
-     */
-    // HaraldK 20040801: Added support for int[]
-    InverseColorMap(int[] pRGBColorMap) {
-        this(pRGBColorMap, -1);
-    }
-
-    /**
-     * @param pRGBColorMap the rgb color map to create inverse color map for.
-     * @param pTransparent the index of the transparent pixel in the map
-     */
-    InverseColorMap(byte[] pRGBColorMap, int pTransparent) {
-        rgbMapByte = pRGBColorMap;
-        numColors = rgbMapByte.length / 4;
-        transparentIndex = pTransparent;
-
-        inverseRGB = new byte[MAXQUANTVAL * MAXQUANTVAL * MAXQUANTVAL];
-        initIRGB(new int[MAXQUANTVAL * MAXQUANTVAL * MAXQUANTVAL]);
-    }
-
-    /**
-     * @param pRGBColorMap the rgb color map to create inverse color map for.
-     * @param pTransparent the index of the transparent pixel in the map
-     */
-    InverseColorMap(int[] pRGBColorMap, int pTransparent) {
-        rgbMapInt = pRGBColorMap;
-        numColors = rgbMapInt.length;
-        transparentIndex = pTransparent;
-
-        inverseRGB = new byte[MAXQUANTVAL * MAXQUANTVAL * MAXQUANTVAL];
-        initIRGB(new int[MAXQUANTVAL * MAXQUANTVAL * MAXQUANTVAL]);
-    }
-
-
-    /**
-     * Simple inverse color table creation method.
-     * @param pTemp temp array
-     */
-    void initIRGB(int[] pTemp) {
-        final int x = (1 << TRUNCBITS);        // 8 the size of 1 Dimension of each quantized cell
-        final int xsqr = 1 << (TRUNCBITS * 2); // 64 - twice the smallest step size vale of quantized colors
-        final int xsqr2 = xsqr + xsqr;
-
-        for (int i = 0; i < numColors; ++i) {
-            if (i == transparentIndex) {
-                // Skip the transparent pixel
-                continue;
-            }
-
-            int red, r, rdist, rinc, rxx;
-            int green, g, gdist, ginc, gxx;
-            int blue, b, bdist, binc, bxx;
-
-            // HaraldK 20040801: Added support for int[]
-            if (rgbMapByte != null) {
-                red = rgbMapByte[i * 4] & 0xFF;
-                green = rgbMapByte[i * 4 + 1] & 0xFF;
-                blue = rgbMapByte[i * 4 + 2] & 0xFF;
-            }
-            else if (rgbMapInt != null) {
-                red = (rgbMapInt[i] >> 16) & 0xFF;
-                green = (rgbMapInt[i] >> 8) & 0xFF;
-                blue = rgbMapInt[i] & 0xFF;
-            }
-            else {
-                throw new IllegalStateException("colormap == null");
-            }
-
-            rdist = red - x / 2;   // distance of red to center of current cell
-            gdist = green - x / 2; // green
-            bdist = blue - x / 2;  // blue
-            rdist = rdist * rdist + gdist * gdist + bdist * bdist;
-
-            rinc = 2 * (xsqr - (red << TRUNCBITS));
-            ginc = 2 * (xsqr - (green << TRUNCBITS));
-            binc = 2 * (xsqr - (blue << TRUNCBITS));
-
-            int rgbI = 0;
-            for (r = 0, rxx = rinc; r < MAXQUANTVAL; rdist += rxx, ++r, rxx += xsqr2) {
-                for (g = 0, gdist = rdist, gxx = ginc; g < MAXQUANTVAL; gdist += gxx, ++g, gxx += xsqr2) {
-                    for (b = 0, bdist = gdist, bxx = binc; b < MAXQUANTVAL; bdist += bxx, ++b, ++rgbI, bxx += xsqr2) {
-                        if (i == 0 || pTemp[rgbI] > bdist) {
-                            pTemp[rgbI] = bdist;
-                            inverseRGB[rgbI] = (byte) i;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Gets the index of the nearest color to from the color map.
-     *
-     * @param pColor the color to get the nearest color to from color map
-     *        color must be of format {@code 0x00RRGGBB} - standard default RGB
-     * @return index of color which closest matches input color by using the
-     *         created inverse color map.
-     */
-    public final int getIndexNearest(int pColor) {
-        return inverseRGB[((pColor >> (3 * TRUNCBITS)) & QUANTMASK_RED) +
-                ((pColor >> (2 * TRUNCBITS)) & QUANTMASK_GREEN) +
-                ((pColor >> (/* 1 * */ TRUNCBITS)) & QUANTMASK_BLUE)] & 0xFF;
-    }
-
-    /**
-     * Gets the index of the nearest color to from the color map.
-     *
-     * @param pRed red component of the color to get the nearest color to from color map
-     * @param pGreen green component of the color to get the nearest color to from color map
-     * @param pBlue blue component of the color to get the nearest color to from color map
-     * @return index of color which closest matches input color by using the
-     *         created inverse color map.
-     */
-    public final int getIndexNearest(int pRed, int pGreen, int pBlue) {
-        // NOTE: the third line in expression for blue is shifting DOWN not UP.
-        return inverseRGB[((pRed << (2 * QUANTBITS - TRUNCBITS)) & QUANTMASK_RED) +
-                ((pGreen << (/* 1 * */ QUANTBITS - TRUNCBITS)) & QUANTMASK_GREEN) +
-                ((pBlue >> (TRUNCBITS)) & QUANTMASK_BLUE)] & 0xFF;
-    }
-}
-
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.image;
+
+/**
+ * Inverse Colormap to provide efficient lookup of any given input color
+ * to the closest match to the given color map.
+ * <p>
+ * Based on "Efficient Inverse Color Map Computation" by Spencer W. Thomas
+ * in "Graphics Gems Volume II".
+ * </p>
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author Robin Luiten (Java port)
+ * @author Spencer W. Thomas (original c version).
+ *
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/InverseColorMap.java#1 $
+ */
+class InverseColorMap {
+    /**
+     * Number of high bits of each color channel to use to lookup near match
+     */
+    final static int QUANTBITS = 5;
+
+    /**
+     * Truncated bits of each color channel
+     */
+    final static int TRUNCBITS = 8 - QUANTBITS;
+
+    /**
+     * BITMASK representing the bits for blue in the color lookup
+     */
+    final static int QUANTMASK_BLUE = (1 << 5) - 1;
+
+    /**
+     * BITMASK representing the bits for green in the color lookup
+     */
+    final static int QUANTMASK_GREEN = (QUANTMASK_BLUE << QUANTBITS);
+
+    /**
+     * BITMASK representing the bits for red in the color lookup
+     */
+    final static int QUANTMASK_RED = (QUANTMASK_GREEN << QUANTBITS);
+
+    /**
+     * Maximum value a quantised color channel can have
+     */
+    final static int MAXQUANTVAL = 1 << 5;
+
+    byte[] rgbMapByte;
+    int[] rgbMapInt;
+    int numColors;
+    int maxColor;
+    byte[] inverseRGB;   		// inverse rgb color map
+    int transparentIndex = -1;
+
+    /**
+     * @param pRGBColorMap the rgb color map to create inverse color map for.
+     */
+    InverseColorMap(byte[] pRGBColorMap) {
+        this(pRGBColorMap, -1);
+    }
+
+    /**
+     * @param pRGBColorMap the rgb color map to create inverse color map for.
+     */
+    // HaraldK 20040801: Added support for int[]
+    InverseColorMap(int[] pRGBColorMap) {
+        this(pRGBColorMap, -1);
+    }
+
+    /**
+     * @param pRGBColorMap the rgb color map to create inverse color map for.
+     * @param pTransparent the index of the transparent pixel in the map
+     */
+    InverseColorMap(byte[] pRGBColorMap, int pTransparent) {
+        rgbMapByte = pRGBColorMap;
+        numColors = rgbMapByte.length / 4;
+        transparentIndex = pTransparent;
+
+        inverseRGB = new byte[MAXQUANTVAL * MAXQUANTVAL * MAXQUANTVAL];
+        initIRGB(new int[MAXQUANTVAL * MAXQUANTVAL * MAXQUANTVAL]);
+    }
+
+    /**
+     * @param pRGBColorMap the rgb color map to create inverse color map for.
+     * @param pTransparent the index of the transparent pixel in the map
+     */
+    InverseColorMap(int[] pRGBColorMap, int pTransparent) {
+        rgbMapInt = pRGBColorMap;
+        numColors = rgbMapInt.length;
+        transparentIndex = pTransparent;
+
+        inverseRGB = new byte[MAXQUANTVAL * MAXQUANTVAL * MAXQUANTVAL];
+        initIRGB(new int[MAXQUANTVAL * MAXQUANTVAL * MAXQUANTVAL]);
+    }
+
+
+    /**
+     * Simple inverse color table creation method.
+     * @param pTemp temp array
+     */
+    void initIRGB(int[] pTemp) {
+        final int x = (1 << TRUNCBITS);        // 8 the size of 1 Dimension of each quantized cell
+        final int xsqr = 1 << (TRUNCBITS * 2); // 64 - twice the smallest step size vale of quantized colors
+        final int xsqr2 = xsqr + xsqr;
+
+        for (int i = 0; i < numColors; ++i) {
+            if (i == transparentIndex) {
+                // Skip the transparent pixel
+                continue;
+            }
+
+            int red, r, rdist, rinc, rxx;
+            int green, g, gdist, ginc, gxx;
+            int blue, b, bdist, binc, bxx;
+
+            // HaraldK 20040801: Added support for int[]
+            if (rgbMapByte != null) {
+                red = rgbMapByte[i * 4] & 0xFF;
+                green = rgbMapByte[i * 4 + 1] & 0xFF;
+                blue = rgbMapByte[i * 4 + 2] & 0xFF;
+            }
+            else if (rgbMapInt != null) {
+                red = (rgbMapInt[i] >> 16) & 0xFF;
+                green = (rgbMapInt[i] >> 8) & 0xFF;
+                blue = rgbMapInt[i] & 0xFF;
+            }
+            else {
+                throw new IllegalStateException("colormap == null");
+            }
+
+            rdist = red - x / 2;   // distance of red to center of current cell
+            gdist = green - x / 2; // green
+            bdist = blue - x / 2;  // blue
+            rdist = rdist * rdist + gdist * gdist + bdist * bdist;
+
+            rinc = 2 * (xsqr - (red << TRUNCBITS));
+            ginc = 2 * (xsqr - (green << TRUNCBITS));
+            binc = 2 * (xsqr - (blue << TRUNCBITS));
+
+            int rgbI = 0;
+            for (r = 0, rxx = rinc; r < MAXQUANTVAL; rdist += rxx, ++r, rxx += xsqr2) {
+                for (g = 0, gdist = rdist, gxx = ginc; g < MAXQUANTVAL; gdist += gxx, ++g, gxx += xsqr2) {
+                    for (b = 0, bdist = gdist, bxx = binc; b < MAXQUANTVAL; bdist += bxx, ++b, ++rgbI, bxx += xsqr2) {
+                        if (i == 0 || pTemp[rgbI] > bdist) {
+                            pTemp[rgbI] = bdist;
+                            inverseRGB[rgbI] = (byte) i;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Gets the index of the nearest color to from the color map.
+     *
+     * @param pColor the color to get the nearest color to from color map
+     *        color must be of format {@code 0x00RRGGBB} - standard default RGB
+     * @return index of color which closest matches input color by using the
+     *         created inverse color map.
+     */
+    public final int getIndexNearest(int pColor) {
+        return inverseRGB[((pColor >> (3 * TRUNCBITS)) & QUANTMASK_RED) +
+                ((pColor >> (2 * TRUNCBITS)) & QUANTMASK_GREEN) +
+                ((pColor >> (/* 1 * */ TRUNCBITS)) & QUANTMASK_BLUE)] & 0xFF;
+    }
+
+    /**
+     * Gets the index of the nearest color to from the color map.
+     *
+     * @param pRed red component of the color to get the nearest color to from color map
+     * @param pGreen green component of the color to get the nearest color to from color map
+     * @param pBlue blue component of the color to get the nearest color to from color map
+     * @return index of color which closest matches input color by using the
+     *         created inverse color map.
+     */
+    public final int getIndexNearest(int pRed, int pGreen, int pBlue) {
+        // NOTE: the third line in expression for blue is shifting DOWN not UP.
+        return inverseRGB[((pRed << (2 * QUANTBITS - TRUNCBITS)) & QUANTMASK_RED) +
+                ((pGreen << (/* 1 * */ QUANTBITS - TRUNCBITS)) & QUANTMASK_GREEN) +
+                ((pBlue >> (TRUNCBITS)) & QUANTMASK_BLUE)] & 0xFF;
+    }
+}
+
@@ -1,187 +1,187 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-package com.twelvemonkeys.image;
-
-import com.twelvemonkeys.lang.SystemUtil;
-import magick.MagickImage;
-
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-
-/**
- * This class accelerates certain graphics operations, using
- * JMagick and ImageMagick, if available.
- * If those libraries are not installed, this class silently does nothing.
- * <p/>
- * Set the system property {@code "com.twelvemonkeys.image.accel"} to
- * {@code false}, to disable, even if JMagick is installed.
- * Set the system property {@code "com.twelvemonkeys.image.magick.debug"} to
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MagickAccelerator.java#3 $
- */
-final class MagickAccelerator {
-
-    private static final boolean DEBUG = Magick.DEBUG;
-    private static final boolean USE_MAGICK = useMagick();
-
-    private static final int RESAMPLE_OP = 0;
-
-    private static Class[] nativeOp = new Class[1];
-
-    static {
-        try {
-            nativeOp[RESAMPLE_OP] = Class.forName("com.twelvemonkeys.image.ResampleOp");
-        }
-        catch (ClassNotFoundException e) {
-            System.err.println("Could not find class: " + e);
-        }
-    }
-
-    private static boolean useMagick() {
-        try {
-            boolean available = SystemUtil.isClassAvailable("magick.MagickImage");
-
-            if (DEBUG && !available) {
-                System.err.print("ImageMagick bindings not available.");
-            }
-
-            boolean useMagick =
-                    available && !"FALSE".equalsIgnoreCase(System.getProperty("com.twelvemonkeys.image.accel"));
-
-            if (DEBUG) {
-                System.err.println(
-                        useMagick
-                                ? "Will use ImageMagick bindings to accelerate image resampling operations."
-                                : "Will not use ImageMagick to accelerate image resampling operations."
-                );
-            }
-
-            return useMagick;
-        }
-        catch (Throwable t) {
-            // Most probably in case of a SecurityManager
-            System.err.println("Could not enable ImageMagick bindings: " + t);
-            return false;
-        }
-    }
-
-    private static int getNativeOpIndex(Class pOpClass) {
-        for (int i = 0; i < nativeOp.length; i++) {
-            if (pOpClass == nativeOp[i]) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    public static BufferedImage filter(BufferedImageOp pOperation, BufferedImage pInput, BufferedImage pOutput) {
-        if (!USE_MAGICK) {
-            return null;
-        }
-
-        BufferedImage result = null;
-        switch (getNativeOpIndex(pOperation.getClass())) {
-            case RESAMPLE_OP:
-                ResampleOp resample = (ResampleOp) pOperation;
-                result = resampleMagick(pInput, resample.width, resample.height, resample.filterType);
-
-                // NOTE: If output parameter is non-null, we have to return that
-                // image, instead of result
-                if (pOutput != null) {
-                    //pOutput.setData(result.getRaster()); // Fast, but less compatible
-                    // NOTE: For some reason, this is sometimes super-slow...?
-                    ImageUtil.drawOnto(pOutput, result);
-                    result = pOutput;
-                }
-
-                break;
-
-            default:
-                // Simply fall through, allowing acceleration to be added later
-                break;
-
-        }
-        
-        return result;
-    }
-
-    private static BufferedImage resampleMagick(BufferedImage pSrc, int pWidth, int pHeight, int pFilterType) {
-        // Convert to Magick, scale and convert back
-        MagickImage image = null;
-        MagickImage scaled = null;
-        try {
-            image = MagickUtil.toMagick(pSrc);
-
-            long start = 0;
-            if (DEBUG) {
-                start = System.currentTimeMillis();
-            }
-
-            // NOTE: setFilter affects zoomImage, NOT scaleImage
-            image.setFilter(pFilterType);
-            scaled = image.zoomImage(pWidth, pHeight);
-            //scaled = image.scaleImage(pWidth, pHeight); // AREA_AVERAGING
-
-            if (DEBUG) {
-                long time = System.currentTimeMillis() - start;
-                System.out.println("Filtered: " + time + " ms");
-            }
-
-            return MagickUtil.toBuffered(scaled);
-        }
-        //catch (MagickException e) {
-        catch (Exception e) {
-            // NOTE: Stupid workaround: If MagickException is caught, a
-            // NoClassDefFoundError is thrown, when MagickException class is
-            // unavailable...
-            if (e instanceof RuntimeException) {
-                throw (RuntimeException) e;
-            }
-
-            throw new ImageConversionException(e.getMessage(), e);
-        }
-        finally {
-            // NOTE: ImageMagick might be unstable after a while, if image data
-            // is not deallocated. The GC/finalize method handles this, but in
-            // special circumstances, it's not triggered often enough.
-            if (image != null) {
-                image.destroyImages();
-            }
-            if (scaled != null) {
-                scaled.destroyImages();
-            }
-        }
-    }
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+package com.twelvemonkeys.image;
+
+import com.twelvemonkeys.lang.SystemUtil;
+import magick.MagickImage;
+
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+
+/**
+ * This class accelerates certain graphics operations, using
+ * JMagick and ImageMagick, if available.
+ * If those libraries are not installed, this class silently does nothing.
+ * <p>
+ * Set the system property {@code "com.twelvemonkeys.image.accel"} to
+ * {@code false}, to disable, even if JMagick is installed.
+ * Set the system property {@code "com.twelvemonkeys.image.magick.debug"} to
+ * </p>
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MagickAccelerator.java#3 $
+ */
+final class MagickAccelerator {
+
+    private static final boolean DEBUG = Magick.DEBUG;
+    private static final boolean USE_MAGICK = useMagick();
+
+    private static final int RESAMPLE_OP = 0;
+
+    private static Class[] nativeOp = new Class[1];
+
+    static {
+        try {
+            nativeOp[RESAMPLE_OP] = Class.forName("com.twelvemonkeys.image.ResampleOp");
+        }
+        catch (ClassNotFoundException e) {
+            System.err.println("Could not find class: " + e);
+        }
+    }
+
+    private static boolean useMagick() {
+        try {
+            boolean available = SystemUtil.isClassAvailable("magick.MagickImage");
+
+            if (DEBUG && !available) {
+                System.err.print("ImageMagick bindings not available.");
+            }
+
+            boolean useMagick =
+                    available && !"FALSE".equalsIgnoreCase(System.getProperty("com.twelvemonkeys.image.accel"));
+
+            if (DEBUG) {
+                System.err.println(
+                        useMagick
+                                ? "Will use ImageMagick bindings to accelerate image resampling operations."
+                                : "Will not use ImageMagick to accelerate image resampling operations."
+                );
+            }
+
+            return useMagick;
+        }
+        catch (Throwable t) {
+            // Most probably in case of a SecurityManager
+            System.err.println("Could not enable ImageMagick bindings: " + t);
+            return false;
+        }
+    }
+
+    private static int getNativeOpIndex(Class pOpClass) {
+        for (int i = 0; i < nativeOp.length; i++) {
+            if (pOpClass == nativeOp[i]) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    public static BufferedImage filter(BufferedImageOp pOperation, BufferedImage pInput, BufferedImage pOutput) {
+        if (!USE_MAGICK) {
+            return null;
+        }
+
+        BufferedImage result = null;
+        switch (getNativeOpIndex(pOperation.getClass())) {
+            case RESAMPLE_OP:
+                ResampleOp resample = (ResampleOp) pOperation;
+                result = resampleMagick(pInput, resample.width, resample.height, resample.filterType);
+
+                // NOTE: If output parameter is non-null, we have to return that
+                // image, instead of result
+                if (pOutput != null) {
+                    //pOutput.setData(result.getRaster()); // Fast, but less compatible
+                    // NOTE: For some reason, this is sometimes super-slow...?
+                    ImageUtil.drawOnto(pOutput, result);
+                    result = pOutput;
+                }
+
+                break;
+
+            default:
+                // Simply fall through, allowing acceleration to be added later
+                break;
+
+        }
+        
+        return result;
+    }
+
+    private static BufferedImage resampleMagick(BufferedImage pSrc, int pWidth, int pHeight, int pFilterType) {
+        // Convert to Magick, scale and convert back
+        MagickImage image = null;
+        MagickImage scaled = null;
+        try {
+            image = MagickUtil.toMagick(pSrc);
+
+            long start = 0;
+            if (DEBUG) {
+                start = System.currentTimeMillis();
+            }
+
+            // NOTE: setFilter affects zoomImage, NOT scaleImage
+            image.setFilter(pFilterType);
+            scaled = image.zoomImage(pWidth, pHeight);
+            //scaled = image.scaleImage(pWidth, pHeight); // AREA_AVERAGING
+
+            if (DEBUG) {
+                long time = System.currentTimeMillis() - start;
+                System.out.println("Filtered: " + time + " ms");
+            }
+
+            return MagickUtil.toBuffered(scaled);
+        }
+        //catch (MagickException e) {
+        catch (Exception e) {
+            // NOTE: Stupid workaround: If MagickException is caught, a
+            // NoClassDefFoundError is thrown, when MagickException class is
+            // unavailable...
+            if (e instanceof RuntimeException) {
+                throw (RuntimeException) e;
+            }
+
+            throw new ImageConversionException(e.getMessage(), e);
+        }
+        finally {
+            // NOTE: ImageMagick might be unstable after a while, if image data
+            // is not deallocated. The GC/finalize method handles this, but in
+            // special circumstances, it's not triggered often enough.
+            if (image != null) {
+                image.destroyImages();
+            }
+            if (scaled != null) {
+                scaled.destroyImages();
+            }
+        }
+    }
 }
@@ -1,79 +1,80 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.image;
-
-import java.awt.image.ReplicateScaleFilter;
-
-/**
- * An {@code ImageFilter} class for subsampling images.
- * <p/>
- * It is meant to be used in conjunction with a {@code FilteredImageSource}
- * object to produce subsampled versions of existing images.
- * 
- * @see java.awt.image.FilteredImageSource
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/SubsamplingFilter.java#1 $
- */
-public class SubsamplingFilter extends ReplicateScaleFilter {
-    private int xSub;
-    private int ySub;
-
-    /**
-     * Creates a {@code SubsamplingFilter}.
-     *
-     * @param pXSub
-     * @param pYSub
-     *
-     * @throws IllegalArgumentException if {@code pXSub} or {@code pYSub} is
-     * less than 1.
-     */
-    public SubsamplingFilter(int pXSub, int pYSub) {
-        super(1, 1); // These are NOT REAL values, but we have to defer setting
-                     // until w/h is available, in setDimensions below
-
-        if (pXSub < 1 || pYSub < 1) {
-            throw new IllegalArgumentException("Subsampling factors must be positive.");
-        }
-
-        xSub = pXSub;
-        ySub = pYSub;
-    }
-
-    /** {@code ImageFilter} implementation, do not invoke. */
-    public void setDimensions(int pWidth, int pHeight) {
-        destWidth = (pWidth + xSub - 1) / xSub;
-        destHeight = (pHeight + ySub - 1) / ySub;
-
-        //System.out.println("Subsampling: " + xSub + "," + ySub + "-> " + destWidth + ", " + destHeight);
-        super.setDimensions(pWidth, pHeight);
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.image;
+
+import java.awt.image.ReplicateScaleFilter;
+
+/**
+ * An {@code ImageFilter} class for subsampling images.
+ * <p>
+ * It is meant to be used in conjunction with a {@code FilteredImageSource}
+ * object to produce subsampled versions of existing images.
+ * </p>
+ * 
+ * @see java.awt.image.FilteredImageSource
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/SubsamplingFilter.java#1 $
+ */
+public class SubsamplingFilter extends ReplicateScaleFilter {
+    private int xSub;
+    private int ySub;
+
+    /**
+     * Creates a {@code SubsamplingFilter}.
+     *
+     * @param pXSub
+     * @param pYSub
+     *
+     * @throws IllegalArgumentException if {@code pXSub} or {@code pYSub} is
+     * less than 1.
+     */
+    public SubsamplingFilter(int pXSub, int pYSub) {
+        super(1, 1); // These are NOT REAL values, but we have to defer setting
+                     // until w/h is available, in setDimensions below
+
+        if (pXSub < 1 || pYSub < 1) {
+            throw new IllegalArgumentException("Subsampling factors must be positive.");
+        }
+
+        xSub = pXSub;
+        ySub = pYSub;
+    }
+
+    /** {@code ImageFilter} implementation, do not invoke. */
+    public void setDimensions(int pWidth, int pHeight) {
+        destWidth = (pWidth + xSub - 1) / xSub;
+        destHeight = (pHeight + ySub - 1) / ySub;
+
+        //System.out.println("Subsampling: " + xSub + "," + ySub + "-> " + destWidth + ", " + destHeight);
+        super.setDimensions(pWidth, pHeight);
+    }
+}
@@ -30,8 +30,9 @@

 /**
 * Classes for image manipulation.
- * <p/>
+ * <p>
 * See the class {@link com.twelvemonkeys.image.ImageUtil}.
+ * </p>
 *
 * @version 1.0
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.4</version>
+        <version>3.4.4-SNAPSHOT</version>
    </parent>
    <artifactId>common-io</artifactId>
    <packaging>jar</packaging>
@@ -186,7 +186,7 @@ abstract class AbstractCachedSeekableStream extends SeekableInputStream {
    }

    protected void closeImpl() throws IOException {
-        cache.flush(position);
+        cache.close();
        cache = null;
        stream.close();
    }
@@ -198,12 +198,12 @@ abstract class AbstractCachedSeekableStream extends SeekableInputStream {
     * @author last modified by $Author: haku $
     * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/AbstractCachedSeekableStream.java#2 $
     */
-    public static abstract class StreamCache {
+    static abstract class StreamCache {

        /**
         * Creates a {@code StreamCache}.
         */
-        protected StreamCache() {
+        StreamCache() {
        }

        /**
@@ -218,9 +218,10 @@ abstract class AbstractCachedSeekableStream extends SeekableInputStream {
        /**
         * Writes a series of bytes at the current read/write position. The read/write position will be increased by
         * {@code pLength}.
-         * <p/>
+         * <p>
         * This implementation invokes {@link #write(int)} {@code pLength} times.
         * Subclasses may override this method for performance.
+         * </p>
         *
         * @param pBuffer the bytes to write.
         * @param pOffset the starting offset into the buffer.
@@ -246,9 +247,10 @@ abstract class AbstractCachedSeekableStream extends SeekableInputStream {
        /**
         * Writes a series of bytes at the current read/write position. The read/write position will be increased by
         * {@code pLength}.
-         * <p/>
+         * <p>
         * This implementation invokes {@link #read()} {@code pLength} times.
         * Subclasses may override this method for performance.
+         * </p>
         *
         * @param pBuffer the bytes to write
         * @param pOffset the starting offset into the buffer.
@@ -283,12 +285,14 @@ abstract class AbstractCachedSeekableStream extends SeekableInputStream {

        /**
         * Optionally flushes any data prior to the given position.
-         * <p/>
+         * <p>
         * Attempting to perform a seek operation, and/or a read or write operation to a position equal to or before
         * the flushed position may result in exceptions or undefined behaviour.
-         * <p/>
+         * </p>
+         * <p>
         * Subclasses should override this method for performance reasons, to avoid holding on to unnecessary resources.
         * This implementation does nothing.
+         * </p>
         *
         * @param pPosition the last position to flush.
         */
@@ -303,5 +307,7 @@ abstract class AbstractCachedSeekableStream extends SeekableInputStream {
         * @throws IOException if the position can't be determined because of a problem in the cache backing mechanism.
         */
        abstract long getPosition() throws IOException;
+
+        abstract void close() throws IOException;
    }
 }
@@ -1,222 +1,221 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import com.twelvemonkeys.lang.Validate;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * A Reader implementation that can read from multiple sources.
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haku $
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/CompoundReader.java#2 $
- */
-public class CompoundReader extends Reader {
-
-    private Reader current;
-    private List<Reader> readers;
-
-    protected final Object finalLock;
-
-    protected final boolean markSupported;
-
-    private int currentReader;
-    private int markedReader;
-    private int mark;
-    private int mNext;
-
-    /**
-     * Create a new compound reader.
-     *
-     * @param pReaders {@code Iterator} containting {@code Reader}s,
-     *        providing the character stream.
-     *
-     * @throws NullPointerException if {@code pReaders} is {@code null}, or
-     *         any of the elements in the iterator is {@code null}.
-     * @throws ClassCastException if any element of the iterator is not a
-     *         {@code java.io.Reader}
-     */
-    public CompoundReader(final Iterator<Reader> pReaders) {
-        super(Validate.notNull(pReaders, "readers"));
-
-        finalLock = pReaders; // NOTE: It's ok to sync on pReaders, as the
-                          // reference can't change, only it's elements
-
-        readers = new ArrayList<Reader>();
-
-        boolean markSupported = true;
-        while (pReaders.hasNext()) {
-            Reader reader = pReaders.next();
-            if (reader == null) {
-                throw new NullPointerException("readers cannot contain null-elements");
-            }
-            readers.add(reader);
-            markSupported = markSupported && reader.markSupported();
-        }
-        this.markSupported = markSupported;
-
-        current = nextReader();
-    }
-
-    protected final Reader nextReader() {
-        if (currentReader >= readers.size()) {
-            current = new EmptyReader();
-        }
-        else {
-            current = readers.get(currentReader++);
-        }
-        
-        // NOTE: Reset mNext for every reader, and record marked reader in mark/reset methods!
-        mNext = 0;
-        return current;
-    }
-
-    /**
-     * Check to make sure that the stream has not been closed
-     *
-     * @throws IOException if the stream is closed
-     */
-    protected final void ensureOpen() throws IOException {
-        if (readers == null) {
-            throw new IOException("Stream closed");
-        }
-    }
-
-    public void close() throws IOException {
-        // Close all readers
-        for (Reader reader : readers) {
-            reader.close();
-        }
-
-        readers = null;
-    }
-
-    @Override
-    public void mark(int pReadLimit) throws IOException {
-        if (pReadLimit < 0) {
-            throw new IllegalArgumentException("Read limit < 0");
-        }
-
-        // TODO: It would be nice if we could actually close some readers now
-
-        synchronized (finalLock) {
-            ensureOpen();
-            mark = mNext;
-            markedReader = currentReader;
-
-            current.mark(pReadLimit);
-        }
-    }
-
-    @Override
-    public void reset() throws IOException {
-        synchronized (finalLock) {
-            ensureOpen();
-
-            if (currentReader != markedReader) {
-                // Reset any reader before this
-                for (int i = currentReader; i >= markedReader; i--) {
-                    readers.get(i).reset();
-                }
-
-                currentReader = markedReader - 1;
-                nextReader();
-            }
-            current.reset();
-
-            mNext = mark;
-        }
-    }
-
-    @Override
-    public boolean markSupported() {
-        return markSupported;
-    }
-
-    @Override
-    public int read() throws IOException {
-        synchronized (finalLock) {
-            int read = current.read();
-
-            if (read < 0 && currentReader < readers.size()) {
-                nextReader();
-                return read(); // In case of 0-length readers
-            }
-
-            mNext++;
-
-            return read;
-        }
-    }
-
-    public int read(char pBuffer[], int pOffset, int pLength) throws IOException {
-        synchronized (finalLock) {
-            int read = current.read(pBuffer, pOffset, pLength);
-
-            if (read < 0 && currentReader < readers.size()) {
-                nextReader();
-                return read(pBuffer, pOffset, pLength); // In case of 0-length readers
-            }
-
-            mNext += read;
-
-            return read;
-        }
-    }
-
-    @Override
-    public boolean ready() throws IOException {
-        return current.ready();
-    }
-
-    @Override
-    public long skip(long pChars) throws IOException {
-        synchronized (finalLock) {
-            long skipped = current.skip(pChars);
-
-            if (skipped == 0 && currentReader < readers.size()) {
-                nextReader();
-                return skip(pChars); // In case of 0-length readers
-            }
-
-            mNext += skipped;
-
-            return skipped;
-        }
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import com.twelvemonkeys.lang.Validate;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * A Reader implementation that can read from multiple sources.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haku $
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/CompoundReader.java#2 $
+ */
+public class CompoundReader extends Reader {
+
+    private Reader current;
+    private List<Reader> readers;
+
+    protected final Object finalLock;
+
+    protected final boolean markSupported;
+
+    private int currentReader;
+    private int markedReader;
+    private int mark;
+    private int mNext;
+
+    /**
+     * Create a new compound reader.
+     *
+     * @param pReaders {@code Iterator} containting {@code Reader}s,
+     *        providing the character stream.
+     *
+     * @throws NullPointerException if {@code pReaders} is {@code null}, or
+     *         any of the elements in the iterator is {@code null}.
+     * @throws ClassCastException if any element of the iterator is not a
+     *         {@code java.io.Reader}
+     */
+    public CompoundReader(final Iterator<Reader> pReaders) {
+        super(Validate.notNull(pReaders, "readers"));
+
+        finalLock = pReaders; // NOTE: It's ok to sync on pReaders, as the
+                          // reference can't change, only it's elements
+
+        readers = new ArrayList<Reader>();
+
+        boolean markSupported = true;
+        while (pReaders.hasNext()) {
+            Reader reader = pReaders.next();
+            if (reader == null) {
+                throw new NullPointerException("readers cannot contain null-elements");
+            }
+            readers.add(reader);
+            markSupported = markSupported && reader.markSupported();
+        }
+        this.markSupported = markSupported;
+
+        current = nextReader();
+    }
+
+    protected final Reader nextReader() {
+        if (currentReader >= readers.size()) {
+            current = new EmptyReader();
+        }
+        else {
+            current = readers.get(currentReader++);
+        }
+        
+        // NOTE: Reset mNext for every reader, and record marked reader in mark/reset methods!
+        mNext = 0;
+        return current;
+    }
+
+    /**
+     * Check to make sure that the stream has not been closed
+     *
+     * @throws IOException if the stream is closed
+     */
+    protected final void ensureOpen() throws IOException {
+        if (readers == null) {
+            throw new IOException("Stream closed");
+        }
+    }
+
+    public void close() throws IOException {
+        // Close all readers
+        for (Reader reader : readers) {
+            reader.close();
+        }
+
+        readers = null;
+    }
+
+    @Override
+    public void mark(int pReadLimit) throws IOException {
+        if (pReadLimit < 0) {
+            throw new IllegalArgumentException("Read limit < 0");
+        }
+
+        // TODO: It would be nice if we could actually close some readers now
+
+        synchronized (finalLock) {
+            ensureOpen();
+            mark = mNext;
+            markedReader = currentReader;
+
+            current.mark(pReadLimit);
+        }
+    }
+
+    @Override
+    public void reset() throws IOException {
+        synchronized (finalLock) {
+            ensureOpen();
+
+            if (currentReader != markedReader) {
+                // Reset any reader before this
+                for (int i = currentReader; i >= markedReader; i--) {
+                    readers.get(i).reset();
+                }
+
+                currentReader = markedReader - 1;
+                nextReader();
+            }
+            current.reset();
+
+            mNext = mark;
+        }
+    }
+
+    @Override
+    public boolean markSupported() {
+        return markSupported;
+    }
+
+    @Override
+    public int read() throws IOException {
+        synchronized (finalLock) {
+            int read = current.read();
+
+            if (read < 0 && currentReader < readers.size()) {
+                nextReader();
+                return read(); // In case of 0-length readers
+            }
+
+            mNext++;
+
+            return read;
+        }
+    }
+
+    public int read(char pBuffer[], int pOffset, int pLength) throws IOException {
+        synchronized (finalLock) {
+            int read = current.read(pBuffer, pOffset, pLength);
+
+            if (read < 0 && currentReader < readers.size()) {
+                nextReader();
+                return read(pBuffer, pOffset, pLength); // In case of 0-length readers
+            }
+
+            mNext += read;
+
+            return read;
+        }
+    }
+
+    @Override
+    public boolean ready() throws IOException {
+        return current.ready();
+    }
+
+    @Override
+    public long skip(long pChars) throws IOException {
+        synchronized (finalLock) {
+            long skipped = current.skip(pChars);
+
+            if (skipped == 0 && currentReader < readers.size()) {
+                nextReader();
+                return skip(pChars); // In case of 0-length readers
+            }
+
+            mNext += skipped;
+
+            return skipped;
+        }
+    }
+}
@@ -1,47 +1,46 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.StringReader;
-
-/**
- * EmptyReader
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haku $
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/EmptyReader.java#1 $
- */
-final class EmptyReader extends StringReader {
-    public EmptyReader() {
-        super("");
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.StringReader;
+
+/**
+ * EmptyReader
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haku $
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/EmptyReader.java#1 $
+ */
+final class EmptyReader extends StringReader {
+    public EmptyReader() {
+        super("");
+    }
+}
@@ -1,136 +1,137 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * An unsynchronized {@code ByteArrayOutputStream} implementation. This version
- * also has a constructor that lets you create a stream with initial content.
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: FastByteArrayOutputStream.java#2 $
- */
-// TODO: Performance test of a stream impl that uses list of fixed size blocks, rather than contiguous block 
-public final class FastByteArrayOutputStream extends ByteArrayOutputStream {
-    /** Max grow size (unless if writing more than this amount of bytes) */
-    protected int maxGrowSize = 1024 * 1024; // 1 MB
-
-    /**
-     * Creates a {@code ByteArrayOutputStream} with the given initial buffer
-     * size.
-     *
-     * @param pSize initial buffer size
-     */
-    public FastByteArrayOutputStream(int pSize) {
-        super(pSize);
-    }
-
-    /**
-     * Creates a {@code ByteArrayOutputStream} with the given initial content.
-     * <p/>
-     * Note that the buffer is not cloned, for maximum performance.
-     *
-     * @param pBuffer initial buffer
-     */
-    public FastByteArrayOutputStream(byte[] pBuffer) {
-        super(0); // Don't allocate array
-        buf = pBuffer;
-        count = pBuffer.length;
-    }
-
-    @Override
-    public void write(byte pBytes[], int pOffset, int pLength) {
-        if ((pOffset < 0) || (pOffset > pBytes.length) || (pLength < 0) ||
-                ((pOffset + pLength) > pBytes.length) || ((pOffset + pLength) < 0)) {
-            throw new IndexOutOfBoundsException();
-        }
-        else if (pLength == 0) {
-            return;
-        }
-
-        int newCount = count + pLength;
-        growIfNeeded(newCount);
-        System.arraycopy(pBytes, pOffset, buf, count, pLength);
-        count = newCount;
-    }
-
-    @Override
-    public void write(int pByte) {
-        int newCount = count + 1;
-        growIfNeeded(newCount);
-        buf[count] = (byte) pByte;
-        count = newCount;
-    }
-
-    private void growIfNeeded(int pNewCount) {
-        if (pNewCount > buf.length) {
-            int newSize = Math.max(Math.min(buf.length << 1, buf.length + maxGrowSize), pNewCount);
-            byte newBuf[] = new byte[newSize];
-            System.arraycopy(buf, 0, newBuf, 0, count);
-            buf = newBuf;
-        }
-    }
-
-    // Non-synchronized version of writeTo
-    @Override
-    public void writeTo(OutputStream pOut) throws IOException {
-        pOut.write(buf, 0, count);
-    }
-
-    // Non-synchronized version of toByteArray
-    @Override
-    public byte[] toByteArray() {
-        byte newBuf[] = new byte[count];
-        System.arraycopy(buf, 0, newBuf, 0, count);
-
-        return newBuf;
-    }
-
-    /**
-     * Creates a {@code ByteArrayInputStream} that reads directly from this
-     * {@code FastByteArrayOutputStream}'s byte buffer.
-     * The buffer is not cloned, for maximum performance.
-     * <p/>
-     * Note that care needs to be taken to avoid writes to
-     * this output stream after the input stream is created.
-     * Failing to do so, may result in unpredictable behaviour.
-     *
-     * @return a new {@code ByteArrayInputStream}, reading from this stream's buffer.
-     */
-    public ByteArrayInputStream createInputStream() {
-        return new ByteArrayInputStream(buf, 0, count);
-    }
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * An unsynchronized {@code ByteArrayOutputStream} implementation. This version
+ * also has a constructor that lets you create a stream with initial content.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: FastByteArrayOutputStream.java#2 $
+ */
+// TODO: Performance test of a stream impl that uses list of fixed size blocks, rather than contiguous block 
+public final class FastByteArrayOutputStream extends ByteArrayOutputStream {
+    /** Max grow size (unless if writing more than this amount of bytes) */
+    protected int maxGrowSize = 1024 * 1024; // 1 MB
+
+    /**
+     * Creates a {@code ByteArrayOutputStream} with the given initial buffer
+     * size.
+     *
+     * @param pSize initial buffer size
+     */
+    public FastByteArrayOutputStream(int pSize) {
+        super(pSize);
+    }
+
+    /**
+     * Creates a {@code ByteArrayOutputStream} with the given initial content.
+     * <p>
+     * Note that the buffer is not cloned, for maximum performance.
+     * </p>
+     *
+     * @param pBuffer initial buffer
+     */
+    public FastByteArrayOutputStream(byte[] pBuffer) {
+        super(0); // Don't allocate array
+        buf = pBuffer;
+        count = pBuffer.length;
+    }
+
+    @Override
+    public void write(byte pBytes[], int pOffset, int pLength) {
+        if ((pOffset < 0) || (pOffset > pBytes.length) || (pLength < 0) ||
+                ((pOffset + pLength) > pBytes.length) || ((pOffset + pLength) < 0)) {
+            throw new IndexOutOfBoundsException();
+        }
+        else if (pLength == 0) {
+            return;
+        }
+
+        int newCount = count + pLength;
+        growIfNeeded(newCount);
+        System.arraycopy(pBytes, pOffset, buf, count, pLength);
+        count = newCount;
+    }
+
+    @Override
+    public void write(int pByte) {
+        int newCount = count + 1;
+        growIfNeeded(newCount);
+        buf[count] = (byte) pByte;
+        count = newCount;
+    }
+
+    private void growIfNeeded(int pNewCount) {
+        if (pNewCount > buf.length) {
+            int newSize = Math.max(Math.min(buf.length << 1, buf.length + maxGrowSize), pNewCount);
+            byte newBuf[] = new byte[newSize];
+            System.arraycopy(buf, 0, newBuf, 0, count);
+            buf = newBuf;
+        }
+    }
+
+    // Non-synchronized version of writeTo
+    @Override
+    public void writeTo(OutputStream pOut) throws IOException {
+        pOut.write(buf, 0, count);
+    }
+
+    // Non-synchronized version of toByteArray
+    @Override
+    public byte[] toByteArray() {
+        byte newBuf[] = new byte[count];
+        System.arraycopy(buf, 0, newBuf, 0, count);
+
+        return newBuf;
+    }
+
+    /**
+     * Creates a {@code ByteArrayInputStream} that reads directly from this
+     * {@code FastByteArrayOutputStream}'s byte buffer.
+     * The buffer is not cloned, for maximum performance.
+     * <p>
+     * Note that care needs to be taken to avoid writes to
+     * this output stream after the input stream is created.
+     * Failing to do so, may result in unpredictable behaviour.
+     * </p>
+     *
+     * @return a new {@code ByteArrayInputStream}, reading from this stream's buffer.
+     */
+    public ByteArrayInputStream createInputStream() {
+        return new ByteArrayInputStream(buf, 0, count);
+    }
 }
@@ -1,232 +1,241 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import com.twelvemonkeys.lang.Validate;
-
-import java.io.*;
-
-/**
- * A {@code SeekableInputStream} implementation that caches data in a temporary {@code File}.
- * <p/>
- * Temporary files are created as specified in {@link File#createTempFile(String, String, java.io.File)}.
- *
- * @see MemoryCacheSeekableStream
- * @see FileSeekableStream
- *
- * @see File#createTempFile(String, String)
- * @see RandomAccessFile
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileCacheSeekableStream.java#5 $
- */
-public final class FileCacheSeekableStream extends AbstractCachedSeekableStream {
-
-    private  byte[] buffer;
-
-    /**
-     * Creates a {@code FileCacheSeekableStream} reading from the given
-     * {@code InputStream}. Data will be cached in a temporary file.
-     *
-     * @param pStream the {@code InputStream} to read from
-     *
-     * @throws IOException if the temporary file cannot be created,
-     *          or cannot be opened for random access.
-     */
-    public FileCacheSeekableStream(final InputStream pStream) throws IOException {
-        this(pStream, "iocache", null);
-    }
-
-    /**
-     * Creates a {@code FileCacheSeekableStream} reading from the given
-     * {@code InputStream}. Data will be cached in a temporary file, with
-     * the given base name.
-     *
-     * @param pStream the {@code InputStream} to read from
-     * @param pTempBaseName optional base name for the temporary file
-     *
-     * @throws IOException if the temporary file cannot be created,
-     *          or cannot be opened for random access.
-     */
-    public FileCacheSeekableStream(final InputStream pStream, final String pTempBaseName) throws IOException {
-        this(pStream, pTempBaseName, null);
-    }
-
-    /**
-     * Creates a {@code FileCacheSeekableStream} reading from the given
-     * {@code InputStream}. Data will be cached in a temporary file, with
-     * the given base name, in the given directory
-     *
-     * @param pStream the {@code InputStream} to read from
-     * @param pTempBaseName optional base name for the temporary file
-     * @param pTempDir optional temp directory
-     *
-     * @throws IOException if the temporary file cannot be created,
-     *          or cannot be opened for random access.
-     */
-    public FileCacheSeekableStream(final InputStream pStream, final String pTempBaseName, final File pTempDir) throws IOException {
-        // NOTE: We do validation BEFORE we create temp file, to avoid orphan files
-        this(Validate.notNull(pStream, "stream"), createTempFile(pTempBaseName, pTempDir));
-    }
-
-    /*protected*/ static File createTempFile(String pTempBaseName, File pTempDir) throws IOException {
-        Validate.notNull(pTempBaseName, "tempBaseName");
-
-        File file = File.createTempFile(pTempBaseName, null, pTempDir);
-        file.deleteOnExit();
-
-        return file;
-    }
-
-    // TODO: Consider exposing this for external use
-    /*protected*/ FileCacheSeekableStream(final InputStream pStream, final File pFile) throws FileNotFoundException {
-        super(pStream, new FileCache(pFile));
-
-        // TODO: Allow for custom buffer sizes?
-        buffer = new byte[1024];
-    }
-
-    public final boolean isCachedMemory() {
-        return false;
-    }
-
-    public final boolean isCachedFile() {
-        return true;
-    }
-
-    @Override
-    protected void closeImpl() throws IOException {
-        super.closeImpl();
-        buffer = null;
-    }
-
-    @Override
-    public int read() throws IOException {
-        checkOpen();
-
-        int read;
-        if (position == streamPosition) {
-            // Read ahead into buffer, for performance
-            read = readAhead(buffer, 0, buffer.length);
-            if (read >= 0) {
-                read = buffer[0] & 0xff;
-            }
-
-            //System.out.println("Read 1 byte from stream: " + Integer.toHexString(read & 0xff));
-        }
-        else {
-            // ..or read byte from the cache
-            syncPosition();
-            read = getCache().read();
-
-            //System.out.println("Read 1 byte from cache: " + Integer.toHexString(read & 0xff));
-        }
-
-        // TODO: This field is not REALLY considered accessible.. :-P
-        if (read != -1) {
-            position++;
-        }
-        return read;
-    }
-
-    @Override
-    public int read(byte[] pBytes, int pOffset, int pLength) throws IOException {
-        checkOpen();
-
-        int length;
-        if (position == streamPosition) {
-            // Read bytes from the stream
-            length = readAhead(pBytes, pOffset, pLength);
-
-            //System.out.println("Read " + length + " byte from stream");
-        }
-        else {
-            // ...or read bytes from the cache
-            syncPosition();
-            length = getCache().read(pBytes, pOffset, (int) Math.min(pLength, streamPosition - position));
-
-            //System.out.println("Read " + length + " byte from cache");
-        }
-
-        // TODO: This field is not REALLY considered accessible.. :-P
-        if (length > 0) {
-            position += length;
-        }
-        return length;
-    }
-
-    private int readAhead(final byte[] pBytes, final int pOffset, final int pLength) throws IOException {
-        int length;
-        length = stream.read(pBytes, pOffset, pLength);
-
-        if (length > 0) {
-            streamPosition += length;
-            getCache().write(pBytes, pOffset, length);
-        }
-        return length;
-    }
-
-    final static class FileCache extends StreamCache {
-        private RandomAccessFile mCacheFile;
-
-        public FileCache(final File pFile) throws FileNotFoundException {
-            Validate.notNull(pFile, "file");
-            mCacheFile = new RandomAccessFile(pFile, "rw");
-        }
-
-        public void write(final int pByte) throws IOException {
-            mCacheFile.write(pByte);
-        }
-
-        @Override
-        public void write(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException {
-            mCacheFile.write(pBuffer, pOffset, pLength);
-        }
-
-        public int read() throws IOException {
-            return mCacheFile.read();
-        }
-
-        @Override
-        public int read(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException {
-            return mCacheFile.read(pBuffer, pOffset, pLength);
-        }
-
-        public void seek(final long pPosition) throws IOException {
-            mCacheFile.seek(pPosition);
-        }
-
-        public long getPosition() throws IOException {
-            return mCacheFile.getFilePointer();
-        }
-    }
-
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import com.twelvemonkeys.lang.Validate;
+
+import java.io.*;
+
+/**
+ * A {@code SeekableInputStream} implementation that caches data in a temporary {@code File}.
+ * <p>
+ * Temporary files are created as specified in {@link File#createTempFile(String, String, java.io.File)}.
+ * </p>
+ *
+ * @see MemoryCacheSeekableStream
+ * @see FileSeekableStream
+ *
+ * @see File#createTempFile(String, String)
+ * @see RandomAccessFile
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileCacheSeekableStream.java#5 $
+ */
+public final class FileCacheSeekableStream extends AbstractCachedSeekableStream {
+
+    private  byte[] buffer;
+
+    /**
+     * Creates a {@code FileCacheSeekableStream} reading from the given
+     * {@code InputStream}. Data will be cached in a temporary file.
+     *
+     * @param pStream the {@code InputStream} to read from
+     *
+     * @throws IOException if the temporary file cannot be created,
+     *          or cannot be opened for random access.
+     */
+    public FileCacheSeekableStream(final InputStream pStream) throws IOException {
+        this(pStream, "iocache", null);
+    }
+
+    /**
+     * Creates a {@code FileCacheSeekableStream} reading from the given
+     * {@code InputStream}. Data will be cached in a temporary file, with
+     * the given base name.
+     *
+     * @param pStream the {@code InputStream} to read from
+     * @param pTempBaseName optional base name for the temporary file
+     *
+     * @throws IOException if the temporary file cannot be created,
+     *          or cannot be opened for random access.
+     */
+    public FileCacheSeekableStream(final InputStream pStream, final String pTempBaseName) throws IOException {
+        this(pStream, pTempBaseName, null);
+    }
+
+    /**
+     * Creates a {@code FileCacheSeekableStream} reading from the given
+     * {@code InputStream}. Data will be cached in a temporary file, with
+     * the given base name, in the given directory
+     *
+     * @param pStream the {@code InputStream} to read from
+     * @param pTempBaseName optional base name for the temporary file
+     * @param pTempDir optional temp directory
+     *
+     * @throws IOException if the temporary file cannot be created,
+     *          or cannot be opened for random access.
+     */
+    public FileCacheSeekableStream(final InputStream pStream, final String pTempBaseName, final File pTempDir) throws IOException {
+        // NOTE: We do validation BEFORE we create temp file, to avoid orphan files
+        this(Validate.notNull(pStream, "stream"), createTempFile(pTempBaseName, pTempDir));
+    }
+
+    /*protected*/ static File createTempFile(String pTempBaseName, File pTempDir) throws IOException {
+        Validate.notNull(pTempBaseName, "tempBaseName");
+
+        File file = File.createTempFile(pTempBaseName, null, pTempDir);
+        file.deleteOnExit();
+
+        return file;
+    }
+
+    // TODO: Consider exposing this for external use
+    /*protected*/ FileCacheSeekableStream(final InputStream pStream, final File pFile) throws FileNotFoundException {
+        super(pStream, new FileCache(pFile));
+
+        // TODO: Allow for custom buffer sizes?
+        buffer = new byte[1024];
+    }
+
+    public final boolean isCachedMemory() {
+        return false;
+    }
+
+    public final boolean isCachedFile() {
+        return true;
+    }
+
+    @Override
+    protected void closeImpl() throws IOException {
+        // TODO: Close cache file
+        super.closeImpl();
+
+        buffer = null;
+    }
+
+    @Override
+    public int read() throws IOException {
+        checkOpen();
+
+        int read;
+        if (position == streamPosition) {
+            // Read ahead into buffer, for performance
+            read = readAhead(buffer, 0, buffer.length);
+            if (read >= 0) {
+                read = buffer[0] & 0xff;
+            }
+
+            //System.out.println("Read 1 byte from stream: " + Integer.toHexString(read & 0xff));
+        }
+        else {
+            // ..or read byte from the cache
+            syncPosition();
+            read = getCache().read();
+
+            //System.out.println("Read 1 byte from cache: " + Integer.toHexString(read & 0xff));
+        }
+
+        // TODO: This field is not REALLY considered accessible.. :-P
+        if (read != -1) {
+            position++;
+        }
+        return read;
+    }
+
+    @Override
+    public int read(byte[] pBytes, int pOffset, int pLength) throws IOException {
+        checkOpen();
+
+        int length;
+        if (position == streamPosition) {
+            // Read bytes from the stream
+            length = readAhead(pBytes, pOffset, pLength);
+
+            //System.out.println("Read " + length + " byte from stream");
+        }
+        else {
+            // ...or read bytes from the cache
+            syncPosition();
+            length = getCache().read(pBytes, pOffset, (int) Math.min(pLength, streamPosition - position));
+
+            //System.out.println("Read " + length + " byte from cache");
+        }
+
+        // TODO: This field is not REALLY considered accessible.. :-P
+        if (length > 0) {
+            position += length;
+        }
+        return length;
+    }
+
+    private int readAhead(final byte[] pBytes, final int pOffset, final int pLength) throws IOException {
+        int length;
+        length = stream.read(pBytes, pOffset, pLength);
+
+        if (length > 0) {
+            streamPosition += length;
+            getCache().write(pBytes, pOffset, length);
+        }
+        return length;
+    }
+
+    // TODO: We need to close the cache file!!! Otherwise we are leaking file descriptors
+
+    final static class FileCache extends StreamCache {
+        private RandomAccessFile cacheFile;
+
+        public FileCache(final File pFile) throws FileNotFoundException {
+            Validate.notNull(pFile, "file");
+            cacheFile = new RandomAccessFile(pFile, "rw");
+        }
+
+        public void write(final int pByte) throws IOException {
+            cacheFile.write(pByte);
+        }
+
+        @Override
+        public void write(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException {
+            cacheFile.write(pBuffer, pOffset, pLength);
+        }
+
+        public int read() throws IOException {
+            return cacheFile.read();
+        }
+
+        @Override
+        public int read(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException {
+            return cacheFile.read(pBuffer, pOffset, pLength);
+        }
+
+        public void seek(final long pPosition) throws IOException {
+            cacheFile.seek(pPosition);
+        }
+
+        public long getPosition() throws IOException {
+            return cacheFile.getFilePointer();
+        }
+
+        @Override
+        void close() throws IOException {
+            cacheFile.close();
+        }
+    }
+}
@@ -1,135 +1,135 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
-/**
- * A {@code SeekableInputStream} implementation that uses random access directly to a {@code File}.
- * <p/>
- * @see FileCacheSeekableStream
- * @see MemoryCacheSeekableStream
- * @see RandomAccessFile
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileSeekableStream.java#4 $
- */
-public final class FileSeekableStream extends SeekableInputStream {
-
-    // TODO: Figure out why this class is SLOWER than FileCacheSeekableStream in
-    // my tests..?
-
-    final RandomAccessFile mRandomAccess;
-
-    /**
-     * Creates a {@code FileSeekableStream} that reads from the given
-     * {@code File}.
-     *
-     * @param pInput file to read from
-     * @throws FileNotFoundException if {@code pInput} does not exist
-     */
-    public FileSeekableStream(final File pInput) throws FileNotFoundException {
-        this(new RandomAccessFile(pInput, "r"));
-    }
-
-    /**
-     * Creates a {@code FileSeekableStream} that reads from the given file.
-     * The {@code RandomAccessFile} needs only to be open in read
-     * ({@code "r"}) mode.
-     *
-     * @param pInput file to read from
-     */
-    public FileSeekableStream(final RandomAccessFile pInput) {
-        mRandomAccess = pInput;
-    }
-
-    /// Seekable
-
-    public boolean isCached() {
-        return false;
-    }
-
-    public boolean isCachedFile() {
-        return false;
-    }
-
-    public boolean isCachedMemory() {
-        return false;
-    }
-
-    /// InputStream
-
-    @Override
-    public int available() throws IOException {
-        long length = mRandomAccess.length() - position;
-        return length > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) length;
-    }
-
-    public void closeImpl() throws IOException {
-        mRandomAccess.close();
-    }
-
-    public int read() throws IOException {
-        checkOpen();
-
-        int read = mRandomAccess.read();
-        if (read >= 0) {
-            position++;
-        }
-        return read;
-    }
-
-    @Override
-    public int read(byte pBytes[], int pOffset, int pLength) throws IOException {
-        checkOpen();
-
-        int read = mRandomAccess.read(pBytes, pOffset, pLength);
-        if (read > 0) {
-            position += read;
-        }
-        return read;
-    }
-
-    /**
-     * Does nothing, as we don't really do any caching here.
-     *
-     * @param pPosition the position to flush to
-     */
-    protected void flushBeforeImpl(long pPosition) {
-    }
-
-    protected void seekImpl(long pPosition) throws IOException {
-        mRandomAccess.seek(pPosition);
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+/**
+ * A {@code SeekableInputStream} implementation that uses random access directly to a {@code File}.
+
+ * @see FileCacheSeekableStream
+ * @see MemoryCacheSeekableStream
+ * @see RandomAccessFile
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileSeekableStream.java#4 $
+ */
+public final class FileSeekableStream extends SeekableInputStream {
+
+    // TODO: Figure out why this class is SLOWER than FileCacheSeekableStream in
+    // my tests..?
+
+    final RandomAccessFile mRandomAccess;
+
+    /**
+     * Creates a {@code FileSeekableStream} that reads from the given
+     * {@code File}.
+     *
+     * @param pInput file to read from
+     * @throws FileNotFoundException if {@code pInput} does not exist
+     */
+    public FileSeekableStream(final File pInput) throws FileNotFoundException {
+        this(new RandomAccessFile(pInput, "r"));
+    }
+
+    /**
+     * Creates a {@code FileSeekableStream} that reads from the given file.
+     * The {@code RandomAccessFile} needs only to be open in read
+     * ({@code "r"}) mode.
+     *
+     * @param pInput file to read from
+     */
+    public FileSeekableStream(final RandomAccessFile pInput) {
+        mRandomAccess = pInput;
+    }
+
+    /// Seekable
+
+    public boolean isCached() {
+        return false;
+    }
+
+    public boolean isCachedFile() {
+        return false;
+    }
+
+    public boolean isCachedMemory() {
+        return false;
+    }
+
+    /// InputStream
+
+    @Override
+    public int available() throws IOException {
+        long length = mRandomAccess.length() - position;
+        return length > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) length;
+    }
+
+    public void closeImpl() throws IOException {
+        mRandomAccess.close();
+    }
+
+    public int read() throws IOException {
+        checkOpen();
+
+        int read = mRandomAccess.read();
+        if (read >= 0) {
+            position++;
+        }
+        return read;
+    }
+
+    @Override
+    public int read(byte pBytes[], int pOffset, int pLength) throws IOException {
+        checkOpen();
+
+        int read = mRandomAccess.read(pBytes, pOffset, pLength);
+        if (read > 0) {
+            position += read;
+        }
+        return read;
+    }
+
+    /**
+     * Does nothing, as we don't really do any caching here.
+     *
+     * @param pPosition the position to flush to
+     */
+    protected void flushBeforeImpl(long pPosition) {
+    }
+
+    protected void seekImpl(long pPosition) throws IOException {
+        mRandomAccess.seek(pPosition);
+    }
+}
@@ -1,103 +1,102 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-/**
- * FileSystem
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: FileSystem.java#1 $
- */
-abstract class FileSystem {
-    abstract long getFreeSpace(File pPath);
-
-    abstract long getTotalSpace(File pPath);
-
-    abstract String getName();
-
-    static BufferedReader exec(String[] pArgs) throws IOException {
-        Process cmd = Runtime.getRuntime().exec(pArgs);
-        return new BufferedReader(new InputStreamReader(cmd.getInputStream()));
-    }
-
-    static FileSystem get() {
-        String os = System.getProperty("os.name");
-        //System.out.println("os = " + os);
-
-        os = os.toLowerCase();
-        if (os.contains("windows")) {
-            return new Win32FileSystem();
-        }
-        else if (os.contains("linux") ||
-                os.contains("sun os") ||
-                os.contains("sunos") ||
-                os.contains("solaris") ||
-                os.contains("mpe/ix") ||
-                os.contains("hp-ux") ||
-                os.contains("aix") ||
-                os.contains("freebsd") ||
-                os.contains("irix") ||
-                os.contains("digital unix") ||
-                os.contains("unix") ||
-                os.contains("mac os x")) {
-            return new UnixFileSystem();
-        }
-        else {
-            return new UnknownFileSystem(os);
-        }
-    }
-
-    private static class UnknownFileSystem extends FileSystem {
-        private final String osName;
-
-        UnknownFileSystem(String pOSName) {
-            osName = pOSName;
-        }
-
-        long getFreeSpace(File pPath) {
-            return 0l;
-        }
-
-        long getTotalSpace(File pPath) {
-            return 0l;
-        }
-
-        String getName() {
-            return "Unknown (" + osName + ")";
-        }
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * FileSystem
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: FileSystem.java#1 $
+ */
+abstract class FileSystem {
+    abstract long getFreeSpace(File pPath);
+
+    abstract long getTotalSpace(File pPath);
+
+    abstract String getName();
+
+    static BufferedReader exec(String[] pArgs) throws IOException {
+        Process cmd = Runtime.getRuntime().exec(pArgs);
+        return new BufferedReader(new InputStreamReader(cmd.getInputStream()));
+    }
+
+    static FileSystem get() {
+        String os = System.getProperty("os.name");
+        //System.out.println("os = " + os);
+
+        os = os.toLowerCase();
+        if (os.contains("windows")) {
+            return new Win32FileSystem();
+        }
+        else if (os.contains("linux") ||
+                os.contains("sun os") ||
+                os.contains("sunos") ||
+                os.contains("solaris") ||
+                os.contains("mpe/ix") ||
+                os.contains("hp-ux") ||
+                os.contains("aix") ||
+                os.contains("freebsd") ||
+                os.contains("irix") ||
+                os.contains("digital unix") ||
+                os.contains("unix") ||
+                os.contains("mac os x")) {
+            return new UnixFileSystem();
+        }
+        else {
+            return new UnknownFileSystem(os);
+        }
+    }
+
+    private static class UnknownFileSystem extends FileSystem {
+        private final String osName;
+
+        UnknownFileSystem(String pOSName) {
+            osName = pOSName;
+        }
+
+        long getFreeSpace(File pPath) {
+            return 0l;
+        }
+
+        long getTotalSpace(File pPath) {
+            return 0l;
+        }
+
+        String getName() {
+            return "Unknown (" + osName + ")";
+        }
+    }
+}
@@ -1,244 +1,249 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import com.twelvemonkeys.util.regex.WildcardStringParser;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-/**
- * A Java Bean used for approving file names which are to be included in a
- * {@code java.io.File} listing.
- * The mask is given as a well-known DOS filename format, with '*' and '?' as
- * wildcards.
- * All other characters counts as ordinary characters.
- * <p/>
- * The file name masks are used as a filter input and is given to the class via
- * the string array property:<br>
- * <dd>{@code filenameMasksForInclusion} - Filename mask for exclusion of
- * files (default if both properties are defined)
- * <dd>{@code filenameMasksForExclusion} - Filename mask for exclusion of
- * files.
- * <p/>
- * A recommended way of doing this is by referencing to the component which uses
- * this class for file listing. In this way all properties are set in the same
- * component and this utility component is kept in the background with only
- * initial configuration necessary.
- *
- * @author <a href="mailto:eirik.torske@iconmedialab.no">Eirik Torske</a>
- * @see File#list(java.io.FilenameFilter) java.io.File.list
- * @see FilenameFilter java.io.FilenameFilter
- * @see WildcardStringParser
- * @deprecated
- */
-public class FilenameMaskFilter implements FilenameFilter {
-
-     // TODO: Rewrite to use regexp, or create new class
-
-    // Members
-    private String[] filenameMasksForInclusion;
-    private String[] filenameMasksForExclusion;
-    private boolean inclusion = true;
-
-
-    /**
-     * Creates a {@code FilenameMaskFilter}
-     */
-    public FilenameMaskFilter() {
-    }
-
-    /**
-     * Creates a {@code FilenameMaskFilter}
-     *
-     * @param pFilenameMask the filename mask
-     */
-    public FilenameMaskFilter(final String pFilenameMask) {
-        String[] filenameMask = {pFilenameMask};
-        setFilenameMasksForInclusion(filenameMask);
-    }
-
-    /**
-     * Creates a {@code FilenameMaskFilter}
-     *
-     * @param pFilenameMasks the filename masks
-     */
-    public FilenameMaskFilter(final String[] pFilenameMasks) {
-        this(pFilenameMasks, false);
-    }
-
-    /**
-     * Creates a {@code FilenameMaskFilter}
-     *
-     * @param pFilenameMask the filename masks
-     * @param pExclusion if {@code true}, the masks will be excluded
-     */
-    public FilenameMaskFilter(final String pFilenameMask, final boolean pExclusion) {
-        String[] filenameMask = {pFilenameMask};
-
-        if (pExclusion) {
-            setFilenameMasksForExclusion(filenameMask);
-        }
-        else {
-            setFilenameMasksForInclusion(filenameMask);
-        }
-    }
-
-    /**
-     * Creates a {@code FilenameMaskFilter}
-     *
-     * @param pFilenameMasks the filename masks
-     * @param pExclusion if {@code true}, the masks will be excluded
-     */
-    public FilenameMaskFilter(final String[] pFilenameMasks, final boolean pExclusion) {
-        if (pExclusion) {
-            setFilenameMasksForExclusion(pFilenameMasks);
-        }
-        else {
-            setFilenameMasksForInclusion(pFilenameMasks);
-        }
-    }
-
-    /**
-     *
-     * @param pFilenameMasksForInclusion the filename masks to include
-     */
-    public void setFilenameMasksForInclusion(String[] pFilenameMasksForInclusion) {
-        filenameMasksForInclusion = pFilenameMasksForInclusion;
-    }
-
-    /**
-     * @return the current inclusion masks
-     */
-    public String[] getFilenameMasksForInclusion() {
-        return filenameMasksForInclusion.clone();
-    }
-
-    /**
-     * @param pFilenameMasksForExclusion the filename masks to exclude
-     */
-    public void setFilenameMasksForExclusion(String[] pFilenameMasksForExclusion) {
-        filenameMasksForExclusion = pFilenameMasksForExclusion;
-        inclusion = false;
-    }
-
-    /**
-     * @return the current exclusion masks
-     */
-    public String[] getFilenameMasksForExclusion() {
-        return filenameMasksForExclusion.clone();
-    }
-
-    /**
-     * This method implements the {@code java.io.FilenameFilter} interface.
-     *
-     * @param pDir  the directory in which the file was found.
-     * @param pName the name of the file.
-     * @return {@code true} if the file {@code pName} should be included in the file
-     *         list; {@code false} otherwise.
-     */
-    public boolean accept(File pDir, String pName) {
-        WildcardStringParser parser;
-
-        // Check each filename string mask whether the file is to be accepted
-        if (inclusion) {  // Inclusion
-            for (String mask : filenameMasksForInclusion) {
-                parser = new WildcardStringParser(mask);
-                if (parser.parseString(pName)) {
-
-                    // The filename was accepted by the filename masks provided
-                    // - include it in filename list
-                    return true;
-                }
-            }
-
-            // The filename not was accepted by any of the filename masks
-            // provided - NOT to be included in the filename list
-            return false;
-        }
-        else {
-            // Exclusion
-            for (String mask : filenameMasksForExclusion) {
-                parser = new WildcardStringParser(mask);
-                if (parser.parseString(pName)) {
-
-                    // The filename was accepted by the filename masks provided
-                    // - NOT to be included in the filename list
-                    return false;
-                }
-            }
-
-            // The filename was not accepted by any of the filename masks
-            // provided - include it in filename list
-            return true;
-        }
-    }
-
-    /**
-     * @return a string representation for debug purposes
-     */
-    public String toString() {
-        StringBuilder retVal = new StringBuilder();
-        int i;
-
-        if (inclusion) {
-            // Inclusion
-            if (filenameMasksForInclusion == null) {
-                retVal.append("No filename masks set - property filenameMasksForInclusion is null!");
-            }
-            else {
-                retVal.append(filenameMasksForInclusion.length);
-                retVal.append(" filename mask(s) - ");
-                for (i = 0; i < filenameMasksForInclusion.length; i++) {
-                    retVal.append("\"");
-                    retVal.append(filenameMasksForInclusion[i]);
-                    retVal.append("\", \"");
-                }
-            }
-        }
-        else {
-            // Exclusion
-            if (filenameMasksForExclusion == null) {
-                retVal.append("No filename masks set - property filenameMasksForExclusion is null!");
-            }
-            else {
-                retVal.append(filenameMasksForExclusion.length);
-                retVal.append(" exclusion filename mask(s) - ");
-                for (i = 0; i < filenameMasksForExclusion.length; i++) {
-                    retVal.append("\"");
-                    retVal.append(filenameMasksForExclusion[i]);
-                    retVal.append("\", \"");
-                }
-            }
-        }
-        return retVal.toString();
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import com.twelvemonkeys.util.regex.WildcardStringParser;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+/**
+ * A Java Bean used for approving file names which are to be included in a
+ * {@code java.io.File} listing.
+ * The mask is given as a well-known DOS filename format, with '*' and '?' as
+ * wildcards.
+ * All other characters counts as ordinary characters.
+ * <p>
+ * The file name masks are used as a filter input and is given to the class via
+ * the string array property:
+ * </p>
+ * <dl>
+ * <dt>{@code filenameMasksForInclusion}</dt>
+ * <dd>Filename mask for exclusion of
+ * files (default if both properties are defined).</dd>
+ * <dt>{@code filenameMasksForExclusion}</dt>
+ * <dd>Filename mask for exclusion of files.</dd>
+ * </dl>
+ * <p>
+ * A recommended way of doing this is by referencing to the component which uses
+ * this class for file listing. In this way all properties are set in the same
+ * component and this utility component is kept in the background with only
+ * initial configuration necessary.
+ * </p>
+ *
+ * @author <a href="mailto:eirik.torske@iconmedialab.no">Eirik Torske</a>
+ * @see File#list(java.io.FilenameFilter) java.io.File.list
+ * @see FilenameFilter java.io.FilenameFilter
+ * @see WildcardStringParser
+ * @deprecated
+ */
+public class FilenameMaskFilter implements FilenameFilter {
+
+     // TODO: Rewrite to use regexp, or create new class
+
+    // Members
+    private String[] filenameMasksForInclusion;
+    private String[] filenameMasksForExclusion;
+    private boolean inclusion = true;
+
+
+    /**
+     * Creates a {@code FilenameMaskFilter}
+     */
+    public FilenameMaskFilter() {
+    }
+
+    /**
+     * Creates a {@code FilenameMaskFilter}
+     *
+     * @param pFilenameMask the filename mask
+     */
+    public FilenameMaskFilter(final String pFilenameMask) {
+        String[] filenameMask = {pFilenameMask};
+        setFilenameMasksForInclusion(filenameMask);
+    }
+
+    /**
+     * Creates a {@code FilenameMaskFilter}
+     *
+     * @param pFilenameMasks the filename masks
+     */
+    public FilenameMaskFilter(final String[] pFilenameMasks) {
+        this(pFilenameMasks, false);
+    }
+
+    /**
+     * Creates a {@code FilenameMaskFilter}
+     *
+     * @param pFilenameMask the filename masks
+     * @param pExclusion if {@code true}, the masks will be excluded
+     */
+    public FilenameMaskFilter(final String pFilenameMask, final boolean pExclusion) {
+        String[] filenameMask = {pFilenameMask};
+
+        if (pExclusion) {
+            setFilenameMasksForExclusion(filenameMask);
+        }
+        else {
+            setFilenameMasksForInclusion(filenameMask);
+        }
+    }
+
+    /**
+     * Creates a {@code FilenameMaskFilter}
+     *
+     * @param pFilenameMasks the filename masks
+     * @param pExclusion if {@code true}, the masks will be excluded
+     */
+    public FilenameMaskFilter(final String[] pFilenameMasks, final boolean pExclusion) {
+        if (pExclusion) {
+            setFilenameMasksForExclusion(pFilenameMasks);
+        }
+        else {
+            setFilenameMasksForInclusion(pFilenameMasks);
+        }
+    }
+
+    /**
+     *
+     * @param pFilenameMasksForInclusion the filename masks to include
+     */
+    public void setFilenameMasksForInclusion(String[] pFilenameMasksForInclusion) {
+        filenameMasksForInclusion = pFilenameMasksForInclusion;
+    }
+
+    /**
+     * @return the current inclusion masks
+     */
+    public String[] getFilenameMasksForInclusion() {
+        return filenameMasksForInclusion.clone();
+    }
+
+    /**
+     * @param pFilenameMasksForExclusion the filename masks to exclude
+     */
+    public void setFilenameMasksForExclusion(String[] pFilenameMasksForExclusion) {
+        filenameMasksForExclusion = pFilenameMasksForExclusion;
+        inclusion = false;
+    }
+
+    /**
+     * @return the current exclusion masks
+     */
+    public String[] getFilenameMasksForExclusion() {
+        return filenameMasksForExclusion.clone();
+    }
+
+    /**
+     * This method implements the {@code java.io.FilenameFilter} interface.
+     *
+     * @param pDir  the directory in which the file was found.
+     * @param pName the name of the file.
+     * @return {@code true} if the file {@code pName} should be included in the file
+     *         list; {@code false} otherwise.
+     */
+    public boolean accept(File pDir, String pName) {
+        WildcardStringParser parser;
+
+        // Check each filename string mask whether the file is to be accepted
+        if (inclusion) {  // Inclusion
+            for (String mask : filenameMasksForInclusion) {
+                parser = new WildcardStringParser(mask);
+                if (parser.parseString(pName)) {
+
+                    // The filename was accepted by the filename masks provided
+                    // - include it in filename list
+                    return true;
+                }
+            }
+
+            // The filename not was accepted by any of the filename masks
+            // provided - NOT to be included in the filename list
+            return false;
+        }
+        else {
+            // Exclusion
+            for (String mask : filenameMasksForExclusion) {
+                parser = new WildcardStringParser(mask);
+                if (parser.parseString(pName)) {
+
+                    // The filename was accepted by the filename masks provided
+                    // - NOT to be included in the filename list
+                    return false;
+                }
+            }
+
+            // The filename was not accepted by any of the filename masks
+            // provided - include it in filename list
+            return true;
+        }
+    }
+
+    /**
+     * @return a string representation for debug purposes
+     */
+    public String toString() {
+        StringBuilder retVal = new StringBuilder();
+        int i;
+
+        if (inclusion) {
+            // Inclusion
+            if (filenameMasksForInclusion == null) {
+                retVal.append("No filename masks set - property filenameMasksForInclusion is null!");
+            }
+            else {
+                retVal.append(filenameMasksForInclusion.length);
+                retVal.append(" filename mask(s) - ");
+                for (i = 0; i < filenameMasksForInclusion.length; i++) {
+                    retVal.append("\"");
+                    retVal.append(filenameMasksForInclusion[i]);
+                    retVal.append("\", \"");
+                }
+            }
+        }
+        else {
+            // Exclusion
+            if (filenameMasksForExclusion == null) {
+                retVal.append("No filename masks set - property filenameMasksForExclusion is null!");
+            }
+            else {
+                retVal.append(filenameMasksForExclusion.length);
+                retVal.append(" exclusion filename mask(s) - ");
+                for (i = 0; i < filenameMasksForExclusion.length; i++) {
+                    retVal.append("\"");
+                    retVal.append(filenameMasksForExclusion[i]);
+                    retVal.append("\", \"");
+                }
+            }
+        }
+        return retVal.toString();
+    }
+}
@@ -1,453 +1,449 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * From http://www.cafeaulait.org/books/javaio/ioexamples/index.html:
- *
- * Please feel free to use any fragment of this code you need in your own work.
- * As far as I am concerned, it's in the public domain. No permission is necessary
- * or required.  Credit is always appreciated if you use a large chunk or base a
- * significant product on one of my examples, but that's not required either.
- *
- * Elliotte Rusty Harold
- */
-
-package com.twelvemonkeys.io;
-
-import com.twelvemonkeys.lang.Validate;
-
-import java.io.*;
-
-/**
- * A little endian input stream reads two's complement,
- * little endian integers, floating point numbers, and characters
- * and returns them as Java primitive types.
- * <p/>
- * The standard {@code java.io.DataInputStream} class
- * which this class imitates reads big endian quantities.
- * <p/>
- * <em>Warning:
- * <!-- Beware of little indians! -->
- * The {@code DataInput} and {@code DataOutput} interfaces
- * specifies big endian byte order in their documentation.
- * This means that this class is, strictly speaking, not a proper
- * implementation. However, I don't see a reason for the these interfaces to
- * specify the byte order of their underlying representations.
- * </em>
- *
- * @see com.twelvemonkeys.io.LittleEndianRandomAccessFile
- * @see java.io.DataInputStream
- * @see java.io.DataInput
- * @see java.io.DataOutput
- *
- * @author Elliotte Rusty Harold
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version 2
- */
-public class LittleEndianDataInputStream extends FilterInputStream implements DataInput {
-    // TODO: Optimize by reading into a fixed size (8 bytes) buffer instead of individual read operations?
-    /**
-     * Creates a new little endian input stream and chains it to the
-     * input stream specified by the {@code pStream} argument.
-     *
-     * @param pStream the underlying input stream.
-     * @see java.io.FilterInputStream#in
-     */
-    public LittleEndianDataInputStream(final InputStream pStream) {
-        super(Validate.notNull(pStream, "stream"));
-    }
-
-    /**
-     * Reads a {@code boolean} from the underlying input stream by
-     * reading a single byte. If the byte is zero, false is returned.
-     * If the byte is positive, true is returned.
-     *
-     * @return the {@code boolean} value read.
-     * @throws EOFException if the end of the underlying input stream
-     *                      has been reached
-     * @throws IOException  if the underlying stream throws an IOException.
-     */
-    public boolean readBoolean() throws IOException {
-        int b = in.read();
-
-        if (b < 0) {
-            throw new EOFException();
-        }
-
-        return b != 0;
-    }
-
-    /**
-     * Reads a signed {@code byte} from the underlying input stream
-     * with value between -128 and 127
-     *
-     * @return the {@code byte} value read.
-     * @throws EOFException if the end of the underlying input stream
-     *                      has been reached
-     * @throws IOException  if the underlying stream throws an IOException.
-     */
-    public byte readByte() throws IOException {
-        int b = in.read();
-
-        if (b < 0) {
-            throw new EOFException();
-        }
-
-        return (byte) b;
-
-    }
-
-    /**
-     * Reads an unsigned {@code byte} from the underlying
-     * input stream with value between 0 and 255
-     *
-     * @return the {@code byte} value read.
-     * @throws EOFException if the end of the underlying input
-     *                      stream has been reached
-     * @throws IOException  if the underlying stream throws an IOException.
-     */
-    public int readUnsignedByte() throws IOException {
-        int b = in.read();
-
-        if (b < 0) {
-            throw new EOFException();
-        }
-
-        return b;
-    }
-
-    /**
-     * Reads a two byte signed {@code short} from the underlying
-     * input stream in little endian order, low byte first.
-     *
-     * @return the {@code short} read.
-     * @throws EOFException if the end of the underlying input stream
-     *                      has been reached
-     * @throws IOException  if the underlying stream throws an IOException.
-     */
-    public short readShort() throws IOException {
-        int byte1 = in.read();
-        int byte2 = in.read();
-
-        // only need to test last byte read
-        // if byte1 is -1 so is byte2
-        if (byte2 < 0) {
-            throw new EOFException();
-        }
-
-        return (short) (((byte2 << 24) >>> 16) | (byte1 << 24) >>> 24);
-    }
-
-    /**
-     * Reads a two byte unsigned {@code short} from the underlying
-     * input stream in little endian order, low byte first.
-     *
-     * @return the int value of the unsigned short read.
-     * @throws EOFException if the end of the underlying input stream
-     *                      has been reached
-     * @throws IOException  if the underlying stream throws an IOException.
-     */
-    public int readUnsignedShort() throws IOException {
-        int byte1 = in.read();
-        int byte2 = in.read();
-
-        if (byte2 < 0) {
-            throw new EOFException();
-        }
-
-        return (byte2 << 8) + byte1;
-    }
-
-    /**
-     * Reads a two byte Unicode {@code char} from the underlying
-     * input stream in little endian order, low byte first.
-     *
-     * @return the int value of the unsigned short read.
-     * @throws EOFException if the end of the underlying input stream
-     *                      has been reached
-     * @throws IOException  if the underlying stream throws an IOException.
-     */
-    public char readChar() throws IOException {
-        int byte1 = in.read();
-        int byte2 = in.read();
-
-        if (byte2 < 0) {
-            throw new EOFException();
-        }
-
-        return (char) (((byte2 << 24) >>> 16) | ((byte1 << 24) >>> 24));
-    }
-
-
-    /**
-     * Reads a four byte signed {@code int} from the underlying
-     * input stream in little endian order, low byte first.
-     *
-     * @return the {@code int} read.
-     * @throws EOFException if the end of the underlying input stream
-     *                      has been reached
-     * @throws IOException  if the underlying stream throws an IOException.
-     */
-    public int readInt() throws IOException {
-        int byte1 = in.read();
-        int byte2 = in.read();
-        int byte3 = in.read();
-        int byte4 = in.read();
-
-        if (byte4 < 0) {
-            throw new EOFException();
-        }
-
-        return (byte4 << 24) | ((byte3 << 24) >>> 8)
-                | ((byte2 << 24) >>> 16) | ((byte1 << 24) >>> 24);
-    }
-
-    /**
-     * Reads an eight byte signed {@code int} from the underlying
-     * input stream in little endian order, low byte first.
-     *
-     * @return the {@code int} read.
-     * @throws EOFException if the end of the underlying input stream
-     *                      has been reached
-     * @throws IOException  if the underlying stream throws an IOException.
-     */
-    public long readLong() throws IOException {
-        long byte1 = in.read();
-        long byte2 = in.read();
-        long byte3 = in.read();
-        long byte4 = in.read();
-        long byte5 = in.read();
-        long byte6 = in.read();
-        long byte7 = in.read();
-        long byte8 = in.read();
-
-        if (byte8 < 0) {
-            throw new EOFException();
-        }
-
-        return (byte8 << 56) | ((byte7 << 56) >>> 8)
-                | ((byte6 << 56) >>> 16) | ((byte5 << 56) >>> 24)
-                | ((byte4 << 56) >>> 32) | ((byte3 << 56) >>> 40)
-                | ((byte2 << 56) >>> 48) | ((byte1 << 56) >>> 56);
-    }
-
-    /**
-     * Reads a string of no more than 65,535 characters
-     * from the underlying input stream using UTF-8
-     * encoding. This method first reads a two byte short
-     * in <b>big</b> endian order as required by the
-     * UTF-8 specification. This gives the number of bytes in
-     * the UTF-8 encoded version of the string.
-     * Next this many bytes are read and decoded as UTF-8
-     * encoded characters.
-     *
-     * @return the decoded string
-     * @throws UTFDataFormatException if the string cannot be decoded
-     * @throws IOException            if the underlying stream throws an IOException.
-     */
-    public String readUTF() throws IOException {
-        int byte1 = in.read();
-        int byte2 = in.read();
-
-        if (byte2 < 0) {
-            throw new EOFException();
-        }
-
-        int numbytes = (byte1 << 8) + byte2;
-        char result[] = new char[numbytes];
-        int numread = 0;
-        int numchars = 0;
-
-        while (numread < numbytes) {
-            int c1 = readUnsignedByte();
-            int c2, c3;
-
-            // The first four bits of c1 determine how many bytes are in this char
-            int test = c1 >> 4;
-            if (test < 8) {  // one byte
-                numread++;
-                result[numchars++] = (char) c1;
-            }
-            else if (test == 12 || test == 13) { // two bytes
-                numread += 2;
-
-                if (numread > numbytes) {
-                    throw new UTFDataFormatException();
-                }
-
-                c2 = readUnsignedByte();
-
-                if ((c2 & 0xC0) != 0x80) {
-                    throw new UTFDataFormatException();
-                }
-
-                result[numchars++] = (char) (((c1 & 0x1F) << 6) | (c2 & 0x3F));
-            }
-            else if (test == 14) { // three bytes
-                numread += 3;
-
-                if (numread > numbytes) {
-                    throw new UTFDataFormatException();
-                }
-
-                c2 = readUnsignedByte();
-                c3 = readUnsignedByte();
-
-                if (((c2 & 0xC0) != 0x80) || ((c3 & 0xC0) != 0x80)) {
-                    throw new UTFDataFormatException();
-                }
-
-                result[numchars++] = (char) (((c1 & 0x0F) << 12) | ((c2 & 0x3F) << 6) | (c3 & 0x3F));
-            }
-            else { // malformed
-                throw new UTFDataFormatException();
-            }
-
-        }  // end while
-
-        return new String(result, 0, numchars);
-
-    }
-
-    /**
-     * @return the next eight bytes of this input stream, interpreted as a
-     *         little endian {@code double}.
-     * @throws EOFException if end of stream occurs before eight bytes
-     *                      have been read.
-     * @throws IOException  if an I/O error occurs.
-     */
-    public final double readDouble() throws IOException {
-        return Double.longBitsToDouble(readLong());
-    }
-
-    /**
-     * @return the next four bytes of this input stream, interpreted as a
-     *         little endian {@code int}.
-     * @throws EOFException if end of stream occurs before four bytes
-     *                      have been read.
-     * @throws IOException  if an I/O error occurs.
-     */
-    public final float readFloat() throws IOException {
-        return Float.intBitsToFloat(readInt());
-    }
-
-    /**
-     * See the general contract of the {@code skipBytes}
-     * method of {@code DataInput}.
-     * <p>
-     * Bytes for this operation are read from the contained input stream.
-     *
-     * @param pLength the number of bytes to be skipped.
-     * @return the actual number of bytes skipped.
-     * @exception IOException if an I/O error occurs.
-     */
-    public final int skipBytes(int pLength) throws IOException {
-        // NOTE: There was probably a bug in ERH's original code here, as skip
-        // never returns -1, but returns 0 if no more bytes can be skipped...
-        int total = 0;
-        int skipped;
-
-        while ((total < pLength) && ((skipped = (int) in.skip(pLength - total)) > 0)) {
-            total += skipped;
-        }
-
-        return total;
-    }
-
-    /**
-     * See the general contract of the {@code readFully}
-     * method of {@code DataInput}.
-     * <p/>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @param pBytes the buffer into which the data is read.
-     * @throws EOFException if this input stream reaches the end before
-     *                      reading all the bytes.
-     * @throws IOException  if an I/O error occurs.
-     * @see java.io.FilterInputStream#in
-     */
-    public final void readFully(byte pBytes[]) throws IOException {
-        readFully(pBytes, 0, pBytes.length);
-    }
-
-    /**
-     * See the general contract of the {@code readFully}
-     * method of {@code DataInput}.
-     * <p/>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @param pBytes   the buffer into which the data is read.
-     * @param pOffset the start offset of the data.
-     * @param pLength the number of bytes to read.
-     * @throws EOFException if this input stream reaches the end before
-     *                      reading all the bytes.
-     * @throws IOException  if an I/O error occurs.
-     * @see java.io.FilterInputStream#in
-     */
-    public final void readFully(byte pBytes[], int pOffset, int pLength) throws IOException {
-        if (pLength < 0) {
-            throw new IndexOutOfBoundsException();
-        }
-
-        int count = 0;
-
-        while (count < pLength) {
-            int read = in.read(pBytes, pOffset + count, pLength - count);
-
-            if (read < 0) {
-                throw new EOFException();
-            }
-
-            count += read;
-        }
-    }
-
-    /**
-     * See the general contract of the {@code readLine}
-     * method of {@code DataInput}.
-     * <p>
-     * Bytes for this operation are read from the contained input stream.
-     *
-     * @deprecated This method does not properly convert bytes to characters.
-     *
-     * @return     the next line of text from this input stream.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.BufferedReader#readLine()
-     * @see        java.io.DataInputStream#readLine()
-     * @noinspection deprecation
-     */
-    public String readLine() throws IOException {
-        DataInputStream ds = new DataInputStream(in);
-        return ds.readLine();
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * From http://www.cafeaulait.org/books/javaio/ioexamples/index.html:
+ *
+ * Please feel free to use any fragment of this code you need in your own work.
+ * As far as I am concerned, it's in the public domain. No permission is necessary
+ * or required.  Credit is always appreciated if you use a large chunk or base a
+ * significant product on one of my examples, but that's not required either.
+ *
+ * Elliotte Rusty Harold
+ */
+
+package com.twelvemonkeys.io;
+
+import com.twelvemonkeys.lang.Validate;
+
+import java.io.*;
+
+/**
+ * A little endian input stream reads two's complement,
+ * little endian integers, floating point numbers, and characters
+ * and returns them as Java primitive types.
+ * <p>
+ * The standard {@code java.io.DataInputStream} class
+ * which this class imitates reads big endian quantities.
+ * </p>
+ * <p>
+ * <em>Warning:
+ * The {@code DataInput} and {@code DataOutput} interfaces
+ * specifies big endian byte order in their documentation.
+ * This means that this class is, strictly speaking, not a proper
+ * implementation. However, I don't see a reason for the these interfaces to
+ * specify the byte order of their underlying representations.
+ * </em>
+ * </p>
+ *
+ * @see com.twelvemonkeys.io.LittleEndianRandomAccessFile
+ * @see java.io.DataInputStream
+ * @see java.io.DataInput
+ * @see java.io.DataOutput
+ *
+ * @author Elliotte Rusty Harold
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version 2
+ */
+public class LittleEndianDataInputStream extends FilterInputStream implements DataInput {
+    // TODO: Optimize by reading into a fixed size (8 bytes) buffer instead of individual read operations?
+    /**
+     * Creates a new little endian input stream and chains it to the
+     * input stream specified by the {@code pStream} argument.
+     *
+     * @param pStream the underlying input stream.
+     * @see java.io.FilterInputStream#in
+     */
+    public LittleEndianDataInputStream(final InputStream pStream) {
+        super(Validate.notNull(pStream, "stream"));
+    }
+
+    /**
+     * Reads a {@code boolean} from the underlying input stream by
+     * reading a single byte. If the byte is zero, false is returned.
+     * If the byte is positive, true is returned.
+     *
+     * @return the {@code boolean} value read.
+     * @throws EOFException if the end of the underlying input stream
+     *                      has been reached
+     * @throws IOException  if the underlying stream throws an IOException.
+     */
+    public boolean readBoolean() throws IOException {
+        int b = in.read();
+
+        if (b < 0) {
+            throw new EOFException();
+        }
+
+        return b != 0;
+    }
+
+    /**
+     * Reads a signed {@code byte} from the underlying input stream
+     * with value between -128 and 127
+     *
+     * @return the {@code byte} value read.
+     * @throws EOFException if the end of the underlying input stream
+     *                      has been reached
+     * @throws IOException  if the underlying stream throws an IOException.
+     */
+    public byte readByte() throws IOException {
+        int b = in.read();
+
+        if (b < 0) {
+            throw new EOFException();
+        }
+
+        return (byte) b;
+
+    }
+
+    /**
+     * Reads an unsigned {@code byte} from the underlying
+     * input stream with value between 0 and 255
+     *
+     * @return the {@code byte} value read.
+     * @throws EOFException if the end of the underlying input
+     *                      stream has been reached
+     * @throws IOException  if the underlying stream throws an IOException.
+     */
+    public int readUnsignedByte() throws IOException {
+        int b = in.read();
+
+        if (b < 0) {
+            throw new EOFException();
+        }
+
+        return b;
+    }
+
+    /**
+     * Reads a two byte signed {@code short} from the underlying
+     * input stream in little endian order, low byte first.
+     *
+     * @return the {@code short} read.
+     * @throws EOFException if the end of the underlying input stream
+     *                      has been reached
+     * @throws IOException  if the underlying stream throws an IOException.
+     */
+    public short readShort() throws IOException {
+        int byte1 = in.read();
+        int byte2 = in.read();
+
+        // only need to test last byte read
+        // if byte1 is -1 so is byte2
+        if (byte2 < 0) {
+            throw new EOFException();
+        }
+
+        return (short) (((byte2 << 24) >>> 16) | (byte1 << 24) >>> 24);
+    }
+
+    /**
+     * Reads a two byte unsigned {@code short} from the underlying
+     * input stream in little endian order, low byte first.
+     *
+     * @return the int value of the unsigned short read.
+     * @throws EOFException if the end of the underlying input stream
+     *                      has been reached
+     * @throws IOException  if the underlying stream throws an IOException.
+     */
+    public int readUnsignedShort() throws IOException {
+        int byte1 = in.read();
+        int byte2 = in.read();
+
+        if (byte2 < 0) {
+            throw new EOFException();
+        }
+
+        return (byte2 << 8) + byte1;
+    }
+
+    /**
+     * Reads a two byte Unicode {@code char} from the underlying
+     * input stream in little endian order, low byte first.
+     *
+     * @return the int value of the unsigned short read.
+     * @throws EOFException if the end of the underlying input stream
+     *                      has been reached
+     * @throws IOException  if the underlying stream throws an IOException.
+     */
+    public char readChar() throws IOException {
+        int byte1 = in.read();
+        int byte2 = in.read();
+
+        if (byte2 < 0) {
+            throw new EOFException();
+        }
+
+        return (char) (((byte2 << 24) >>> 16) | ((byte1 << 24) >>> 24));
+    }
+
+
+    /**
+     * Reads a four byte signed {@code int} from the underlying
+     * input stream in little endian order, low byte first.
+     *
+     * @return the {@code int} read.
+     * @throws EOFException if the end of the underlying input stream
+     *                      has been reached
+     * @throws IOException  if the underlying stream throws an IOException.
+     */
+    public int readInt() throws IOException {
+        int byte1 = in.read();
+        int byte2 = in.read();
+        int byte3 = in.read();
+        int byte4 = in.read();
+
+        if (byte4 < 0) {
+            throw new EOFException();
+        }
+
+        return (byte4 << 24) | ((byte3 << 24) >>> 8)
+                | ((byte2 << 24) >>> 16) | ((byte1 << 24) >>> 24);
+    }
+
+    /**
+     * Reads an eight byte signed {@code int} from the underlying
+     * input stream in little endian order, low byte first.
+     *
+     * @return the {@code int} read.
+     * @throws EOFException if the end of the underlying input stream
+     *                      has been reached
+     * @throws IOException  if the underlying stream throws an IOException.
+     */
+    public long readLong() throws IOException {
+        long byte1 = in.read();
+        long byte2 = in.read();
+        long byte3 = in.read();
+        long byte4 = in.read();
+        long byte5 = in.read();
+        long byte6 = in.read();
+        long byte7 = in.read();
+        long byte8 = in.read();
+
+        if (byte8 < 0) {
+            throw new EOFException();
+        }
+
+        return (byte8 << 56) | ((byte7 << 56) >>> 8)
+                | ((byte6 << 56) >>> 16) | ((byte5 << 56) >>> 24)
+                | ((byte4 << 56) >>> 32) | ((byte3 << 56) >>> 40)
+                | ((byte2 << 56) >>> 48) | ((byte1 << 56) >>> 56);
+    }
+
+    /**
+     * Reads a string of no more than 65,535 characters
+     * from the underlying input stream using UTF-8
+     * encoding. This method first reads a two byte short
+     * in <b>big</b> endian order as required by the
+     * UTF-8 specification. This gives the number of bytes in
+     * the UTF-8 encoded version of the string.
+     * Next this many bytes are read and decoded as UTF-8
+     * encoded characters.
+     *
+     * @return the decoded string
+     * @throws UTFDataFormatException if the string cannot be decoded
+     * @throws IOException            if the underlying stream throws an IOException.
+     */
+    public String readUTF() throws IOException {
+        int byte1 = in.read();
+        int byte2 = in.read();
+
+        if (byte2 < 0) {
+            throw new EOFException();
+        }
+
+        int numbytes = (byte1 << 8) + byte2;
+        char result[] = new char[numbytes];
+        int numread = 0;
+        int numchars = 0;
+
+        while (numread < numbytes) {
+            int c1 = readUnsignedByte();
+            int c2, c3;
+
+            // The first four bits of c1 determine how many bytes are in this char
+            int test = c1 >> 4;
+            if (test < 8) {  // one byte
+                numread++;
+                result[numchars++] = (char) c1;
+            }
+            else if (test == 12 || test == 13) { // two bytes
+                numread += 2;
+
+                if (numread > numbytes) {
+                    throw new UTFDataFormatException();
+                }
+
+                c2 = readUnsignedByte();
+
+                if ((c2 & 0xC0) != 0x80) {
+                    throw new UTFDataFormatException();
+                }
+
+                result[numchars++] = (char) (((c1 & 0x1F) << 6) | (c2 & 0x3F));
+            }
+            else if (test == 14) { // three bytes
+                numread += 3;
+
+                if (numread > numbytes) {
+                    throw new UTFDataFormatException();
+                }
+
+                c2 = readUnsignedByte();
+                c3 = readUnsignedByte();
+
+                if (((c2 & 0xC0) != 0x80) || ((c3 & 0xC0) != 0x80)) {
+                    throw new UTFDataFormatException();
+                }
+
+                result[numchars++] = (char) (((c1 & 0x0F) << 12) | ((c2 & 0x3F) << 6) | (c3 & 0x3F));
+            }
+            else { // malformed
+                throw new UTFDataFormatException();
+            }
+
+        }  // end while
+
+        return new String(result, 0, numchars);
+
+    }
+
+    /**
+     * @return the next eight bytes of this input stream, interpreted as a
+     *         little endian {@code double}.
+     * @throws EOFException if end of stream occurs before eight bytes
+     *                      have been read.
+     * @throws IOException  if an I/O error occurs.
+     */
+    public final double readDouble() throws IOException {
+        return Double.longBitsToDouble(readLong());
+    }
+
+    /**
+     * @return the next four bytes of this input stream, interpreted as a
+     *         little endian {@code int}.
+     * @throws EOFException if end of stream occurs before four bytes
+     *                      have been read.
+     * @throws IOException  if an I/O error occurs.
+     */
+    public final float readFloat() throws IOException {
+        return Float.intBitsToFloat(readInt());
+    }
+
+    /**
+     * See the general contract of the {@code skipBytes}
+     * method of {@code DataInput}.
+     * <p>
+     * Bytes for this operation are read from the contained input stream.
+     *
+     * @param pLength the number of bytes to be skipped.
+     * @return the actual number of bytes skipped.
+     * @exception IOException if an I/O error occurs.
+     */
+    public final int skipBytes(int pLength) throws IOException {
+        // NOTE: There was probably a bug in ERH's original code here, as skip
+        // never returns -1, but returns 0 if no more bytes can be skipped...
+        int total = 0;
+        int skipped;
+
+        while ((total < pLength) && ((skipped = (int) in.skip(pLength - total)) > 0)) {
+            total += skipped;
+        }
+
+        return total;
+    }
+
+    /**
+     * See the general contract of the {@code readFully} method of {@code DataInput}.
+     * <p>
+     * Bytes for this operation are read from the contained input stream.
+     * </p>
+     *
+     * @param pBytes the buffer into which the data is read.
+     * @throws EOFException if this input stream reaches the end before
+     *                      reading all the bytes.
+     * @throws IOException  if an I/O error occurs.
+     * @see java.io.FilterInputStream#in
+     */
+    public final void readFully(byte pBytes[]) throws IOException {
+        readFully(pBytes, 0, pBytes.length);
+    }
+
+    /**
+     * See the general contract of the {@code readFully} method of {@code DataInput}.
+     * <p>
+     * Bytes for this operation are read from the contained input stream.
+     * </p>
+     *
+     * @param pBytes   the buffer into which the data is read.
+     * @param pOffset the start offset of the data.
+     * @param pLength the number of bytes to read.
+     * @throws EOFException if this input stream reaches the end before
+     *                      reading all the bytes.
+     * @throws IOException  if an I/O error occurs.
+     * @see java.io.FilterInputStream#in
+     */
+    public final void readFully(byte pBytes[], int pOffset, int pLength) throws IOException {
+        if (pLength < 0) {
+            throw new IndexOutOfBoundsException();
+        }
+
+        int count = 0;
+
+        while (count < pLength) {
+            int read = in.read(pBytes, pOffset + count, pLength - count);
+
+            if (read < 0) {
+                throw new EOFException();
+            }
+
+            count += read;
+        }
+    }
+
+    /**
+     * See the general contract of the {@code readLine}
+     * method of {@code DataInput}.
+     * <p>
+     * Bytes for this operation are read from the contained input stream.
+     *
+     * @deprecated This method does not properly convert bytes to characters.
+     *
+     * @return     the next line of text from this input stream.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.BufferedReader#readLine()
+     * @see        java.io.DataInputStream#readLine()
+     */
+    public String readLine() throws IOException {
+        DataInputStream ds = new DataInputStream(in);
+        return ds.readLine();
+    }
+}
@@ -1,341 +1,342 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * From http://www.cafeaulait.org/books/javaio/ioexamples/index.html:
- *
- * Please feel free to use any fragment of this code you need in your own work.
- * As far as I am concerned, it's in the public domain. No permission is necessary
- * or required.  Credit is always appreciated if you use a large chunk or base a
- * significant product on one of my examples, but that's not required either.
- *
- * Elliotte Rusty Harold
- */
-
-package com.twelvemonkeys.io;
-
-import com.twelvemonkeys.lang.Validate;
-
-import java.io.*;
-
-/**
- * A little endian output stream writes primitive Java numbers
- * and characters to an output stream in a little endian format.
- * <p/>
- * The standard {@code java.io.DataOutputStream} class which this class
- * imitates uses big endian integers.
- * <p/>
- * <em>Warning:
- * <!-- Beware of little indians! -->
- * The {@code DataInput} and {@code DataOutput} interfaces
- * specifies big endian byte order in their documentation.
- * This means that this class is, strictly speaking, not a proper
- * implementation. However, I don't see a reason for the these interfaces to
- * specify the byte order of their underlying representations.
- * </em>
- *
- * @see com.twelvemonkeys.io.LittleEndianRandomAccessFile
- * @see java.io.DataOutputStream
- * @see java.io.DataInput
- * @see java.io.DataOutput
- *
- * @author Elliotte Rusty Harold
- * @version 1.0.1, 19 May 1999
- */
-public class LittleEndianDataOutputStream extends FilterOutputStream implements DataOutput {
-
-    /**
-     * The number of bytes written so far to the little endian output stream.
-     */
-    protected int bytesWritten;
-
-    /**
-     * Creates a new little endian output stream and chains it to the
-     * output stream specified by the {@code pStream} argument.
-     *
-     * @param pStream the underlying output stream.
-     * @see java.io.FilterOutputStream#out
-     */
-    public LittleEndianDataOutputStream(OutputStream pStream) {
-        super(Validate.notNull(pStream, "stream"));
-    }
-
-    /**
-     * Writes the specified byte value to the underlying output stream.
-     *
-     * @param pByte the {@code byte} value to be written.
-     * @throws IOException if the underlying stream throws an IOException.
-     */
-    public synchronized void write(int pByte) throws IOException {
-        out.write(pByte);
-        bytesWritten++;
-    }
-
-    /**
-     * Writes {@code pLength} bytes from the specified byte array
-     * starting at {@code pOffset} to the underlying output stream.
-     *
-     * @param pBytes   the data.
-     * @param pOffset the start offset in the data.
-     * @param pLength the number of bytes to write.
-     * @throws IOException if the underlying stream throws an IOException.
-     */
-    public synchronized void write(byte[] pBytes, int pOffset, int pLength) throws IOException {
-        out.write(pBytes, pOffset, pLength);
-        bytesWritten += pLength;
-    }
-
-
-    /**
-     * Writes a {@code boolean} to the underlying output stream as
-     * a single byte. If the argument is true, the byte value 1 is written.
-     * If the argument is false, the byte value {@code 0} in written.
-     *
-     * @param pBoolean the {@code boolean} value to be written.
-     * @throws IOException if the underlying stream throws an IOException.
-     */
-    public void writeBoolean(boolean pBoolean) throws IOException {
-        if (pBoolean) {
-            write(1);
-        }
-        else {
-            write(0);
-        }
-    }
-
-    /**
-     * Writes out a {@code byte} to the underlying output stream
-     *
-     * @param pByte the {@code byte} value to be written.
-     * @throws IOException if the underlying stream throws an IOException.
-     */
-    public void writeByte(int pByte) throws IOException {
-        out.write(pByte);
-        bytesWritten++;
-    }
-
-    /**
-     * Writes a two byte {@code short} to the underlying output stream in
-     * little endian order, low byte first.
-     *
-     * @param pShort the {@code short} to be written.
-     * @throws IOException if the underlying stream throws an IOException.
-     */
-    public void writeShort(int pShort) throws IOException {
-        out.write(pShort & 0xFF);
-        out.write((pShort >>> 8) & 0xFF);
-        bytesWritten += 2;
-    }
-
-    /**
-     * Writes a two byte {@code char} to the underlying output stream
-     * in little endian order, low byte first.
-     *
-     * @param pChar the {@code char} value to be written.
-     * @throws IOException if the underlying stream throws an IOException.
-     */
-    public void writeChar(int pChar) throws IOException {
-        out.write(pChar & 0xFF);
-        out.write((pChar >>> 8) & 0xFF);
-        bytesWritten += 2;
-    }
-
-    /**
-     * Writes a four-byte {@code int} to the underlying output stream
-     * in little endian order, low byte first, high byte last
-     *
-     * @param pInt the {@code int} to be written.
-     * @throws IOException if the underlying stream throws an IOException.
-     */
-    public void writeInt(int pInt) throws IOException {
-        out.write(pInt & 0xFF);
-        out.write((pInt >>> 8) & 0xFF);
-        out.write((pInt >>> 16) & 0xFF);
-        out.write((pInt >>> 24) & 0xFF);
-        bytesWritten += 4;
-
-    }
-
-    /**
-     * Writes an eight-byte {@code long} to the underlying output stream
-     * in little endian order, low byte first, high byte last
-     *
-     * @param pLong the {@code long} to be written.
-     * @throws IOException if the underlying stream throws an IOException.
-     */
-    public void writeLong(long pLong) throws IOException {
-        out.write((int) pLong & 0xFF);
-        out.write((int) (pLong >>> 8) & 0xFF);
-        out.write((int) (pLong >>> 16) & 0xFF);
-        out.write((int) (pLong >>> 24) & 0xFF);
-        out.write((int) (pLong >>> 32) & 0xFF);
-        out.write((int) (pLong >>> 40) & 0xFF);
-        out.write((int) (pLong >>> 48) & 0xFF);
-        out.write((int) (pLong >>> 56) & 0xFF);
-        bytesWritten += 8;
-    }
-
-    /**
-     * Writes a 4 byte Java float to the underlying output stream in
-     * little endian order.
-     *
-     * @param f the {@code float} value to be written.
-     * @throws IOException if an I/O error occurs.
-     */
-    public final void writeFloat(float f) throws IOException {
-        writeInt(Float.floatToIntBits(f));
-    }
-
-    /**
-     * Writes an 8 byte Java double to the underlying output stream in
-     * little endian order.
-     *
-     * @param d the {@code double} value to be written.
-     * @throws IOException if an I/O error occurs.
-     */
-    public final void writeDouble(double d) throws IOException {
-        writeLong(Double.doubleToLongBits(d));
-    }
-
-    /**
-     * Writes a string to the underlying output stream as a sequence of
-     * bytes. Each character is written to the data output stream as
-     * if by the {@link #writeByte(int)} method.
-     *
-     * @param pString the {@code String} value to be written.
-     * @throws IOException if the underlying stream throws an IOException.
-     * @see #writeByte(int)
-     * @see #out
-     */
-    public void writeBytes(String pString) throws IOException {
-        int length = pString.length();
-
-        for (int i = 0; i < length; i++) {
-            out.write((byte) pString.charAt(i));
-        }
-
-        bytesWritten += length;
-    }
-
-    /**
-     * Writes a string to the underlying output stream as a sequence of
-     * characters. Each character is written to the data output stream as
-     * if by the {@code writeChar} method.
-     *
-     * @param pString a {@code String} value to be written.
-     * @throws IOException if the underlying stream throws an IOException.
-     * @see #writeChar(int)
-     * @see #out
-     */
-    public void writeChars(String pString) throws IOException {
-        int length = pString.length();
-
-        for (int i = 0; i < length; i++) {
-            int c = pString.charAt(i);
-            out.write(c & 0xFF);
-            out.write((c >>> 8) & 0xFF);
-        }
-
-        bytesWritten += length * 2;
-    }
-
-    /**
-     * Writes a string of no more than 65,535 characters
-     * to the underlying output stream using UTF-8
-     * encoding. This method first writes a two byte short
-     * in <b>big</b> endian order as required by the
-     * UTF-8 specification. This gives the number of bytes in the
-     * UTF-8 encoded version of the string, not the number of characters
-     * in the string. Next each character of the string is written
-     * using the UTF-8 encoding for the character.
-     *
-     * @param pString the string to be written.
-     * @throws UTFDataFormatException if the string is longer than
-     *                                65,535 characters.
-     * @throws IOException            if the underlying stream throws an IOException.
-     */
-    public void writeUTF(String pString) throws IOException {
-        int numchars = pString.length();
-        int numbytes = 0;
-
-        for (int i = 0; i < numchars; i++) {
-            int c = pString.charAt(i);
-
-            if ((c >= 0x0001) && (c <= 0x007F)) {
-                numbytes++;
-            }
-            else if (c > 0x07FF) {
-                numbytes += 3;
-            }
-            else {
-                numbytes += 2;
-            }
-        }
-
-        if (numbytes > 65535) {
-            throw new UTFDataFormatException();
-        }
-
-        out.write((numbytes >>> 8) & 0xFF);
-        out.write(numbytes & 0xFF);
-
-        for (int i = 0; i < numchars; i++) {
-            int c = pString.charAt(i);
-
-            if ((c >= 0x0001) && (c <= 0x007F)) {
-                out.write(c);
-            }
-            else if (c > 0x07FF) {
-                out.write(0xE0 | ((c >> 12) & 0x0F));
-                out.write(0x80 | ((c >> 6) & 0x3F));
-                out.write(0x80 | (c & 0x3F));
-                bytesWritten += 2;
-            }
-            else {
-                out.write(0xC0 | ((c >> 6) & 0x1F));
-                out.write(0x80 | (c & 0x3F));
-                bytesWritten += 1;
-            }
-        }
-
-        bytesWritten += numchars + 2;
-    }
-
-    /**
-     * Returns the number of bytes written to this little endian output stream.
-     * (This class is not thread-safe with respect to this method. It is
-     * possible that this number is temporarily less than the actual
-     * number of bytes written.)
-     * @return the value of the {@code written} field.
-     * @see     #bytesWritten
-     */
-    public int size() {
-        return bytesWritten;
-  }
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * From http://www.cafeaulait.org/books/javaio/ioexamples/index.html:
+ *
+ * Please feel free to use any fragment of this code you need in your own work.
+ * As far as I am concerned, it's in the public domain. No permission is necessary
+ * or required.  Credit is always appreciated if you use a large chunk or base a
+ * significant product on one of my examples, but that's not required either.
+ *
+ * Elliotte Rusty Harold
+ */
+
+package com.twelvemonkeys.io;
+
+import com.twelvemonkeys.lang.Validate;
+
+import java.io.*;
+
+/**
+ * A little endian output stream writes primitive Java numbers
+ * and characters to an output stream in a little endian format.
+ * <p>
+ * The standard {@code java.io.DataOutputStream} class which this class
+ * imitates uses big endian integers.
+ * </p>
+ * <p>
+ * <em>Warning:
+ * The {@code DataInput} and {@code DataOutput} interfaces
+ * specifies big endian byte order in their documentation.
+ * This means that this class is, strictly speaking, not a proper
+ * implementation. However, I don't see a reason for the these interfaces to
+ * specify the byte order of their underlying representations.
+ * </em>
+ * <p>
+ *
+ * @see com.twelvemonkeys.io.LittleEndianRandomAccessFile
+ * @see java.io.DataOutputStream
+ * @see java.io.DataInput
+ * @see java.io.DataOutput
+ *
+ * @author Elliotte Rusty Harold
+ * @version 1.0.1, 19 May 1999
+ */
+public class LittleEndianDataOutputStream extends FilterOutputStream implements DataOutput {
+
+    /**
+     * The number of bytes written so far to the little endian output stream.
+     */
+    protected int bytesWritten;
+
+    /**
+     * Creates a new little endian output stream and chains it to the
+     * output stream specified by the {@code pStream} argument.
+     *
+     * @param pStream the underlying output stream.
+     * @see java.io.FilterOutputStream#out
+     */
+    public LittleEndianDataOutputStream(OutputStream pStream) {
+        super(Validate.notNull(pStream, "stream"));
+    }
+
+    /**
+     * Writes the specified byte value to the underlying output stream.
+     *
+     * @param pByte the {@code byte} value to be written.
+     * @throws IOException if the underlying stream throws an IOException.
+     */
+    public synchronized void write(int pByte) throws IOException {
+        out.write(pByte);
+        bytesWritten++;
+    }
+
+    /**
+     * Writes {@code pLength} bytes from the specified byte array
+     * starting at {@code pOffset} to the underlying output stream.
+     *
+     * @param pBytes   the data.
+     * @param pOffset the start offset in the data.
+     * @param pLength the number of bytes to write.
+     * @throws IOException if the underlying stream throws an IOException.
+     */
+    public synchronized void write(byte[] pBytes, int pOffset, int pLength) throws IOException {
+        out.write(pBytes, pOffset, pLength);
+        bytesWritten += pLength;
+    }
+
+
+    /**
+     * Writes a {@code boolean} to the underlying output stream as
+     * a single byte. If the argument is true, the byte value 1 is written.
+     * If the argument is false, the byte value {@code 0} in written.
+     *
+     * @param pBoolean the {@code boolean} value to be written.
+     * @throws IOException if the underlying stream throws an IOException.
+     */
+    public void writeBoolean(boolean pBoolean) throws IOException {
+        if (pBoolean) {
+            write(1);
+        }
+        else {
+            write(0);
+        }
+    }
+
+    /**
+     * Writes out a {@code byte} to the underlying output stream
+     *
+     * @param pByte the {@code byte} value to be written.
+     * @throws IOException if the underlying stream throws an IOException.
+     */
+    public void writeByte(int pByte) throws IOException {
+        out.write(pByte);
+        bytesWritten++;
+    }
+
+    /**
+     * Writes a two byte {@code short} to the underlying output stream in
+     * little endian order, low byte first.
+     *
+     * @param pShort the {@code short} to be written.
+     * @throws IOException if the underlying stream throws an IOException.
+     */
+    public void writeShort(int pShort) throws IOException {
+        out.write(pShort & 0xFF);
+        out.write((pShort >>> 8) & 0xFF);
+        bytesWritten += 2;
+    }
+
+    /**
+     * Writes a two byte {@code char} to the underlying output stream
+     * in little endian order, low byte first.
+     *
+     * @param pChar the {@code char} value to be written.
+     * @throws IOException if the underlying stream throws an IOException.
+     */
+    public void writeChar(int pChar) throws IOException {
+        out.write(pChar & 0xFF);
+        out.write((pChar >>> 8) & 0xFF);
+        bytesWritten += 2;
+    }
+
+    /**
+     * Writes a four-byte {@code int} to the underlying output stream
+     * in little endian order, low byte first, high byte last
+     *
+     * @param pInt the {@code int} to be written.
+     * @throws IOException if the underlying stream throws an IOException.
+     */
+    public void writeInt(int pInt) throws IOException {
+        out.write(pInt & 0xFF);
+        out.write((pInt >>> 8) & 0xFF);
+        out.write((pInt >>> 16) & 0xFF);
+        out.write((pInt >>> 24) & 0xFF);
+        bytesWritten += 4;
+
+    }
+
+    /**
+     * Writes an eight-byte {@code long} to the underlying output stream
+     * in little endian order, low byte first, high byte last
+     *
+     * @param pLong the {@code long} to be written.
+     * @throws IOException if the underlying stream throws an IOException.
+     */
+    public void writeLong(long pLong) throws IOException {
+        out.write((int) pLong & 0xFF);
+        out.write((int) (pLong >>> 8) & 0xFF);
+        out.write((int) (pLong >>> 16) & 0xFF);
+        out.write((int) (pLong >>> 24) & 0xFF);
+        out.write((int) (pLong >>> 32) & 0xFF);
+        out.write((int) (pLong >>> 40) & 0xFF);
+        out.write((int) (pLong >>> 48) & 0xFF);
+        out.write((int) (pLong >>> 56) & 0xFF);
+        bytesWritten += 8;
+    }
+
+    /**
+     * Writes a 4 byte Java float to the underlying output stream in
+     * little endian order.
+     *
+     * @param f the {@code float} value to be written.
+     * @throws IOException if an I/O error occurs.
+     */
+    public final void writeFloat(float f) throws IOException {
+        writeInt(Float.floatToIntBits(f));
+    }
+
+    /**
+     * Writes an 8 byte Java double to the underlying output stream in
+     * little endian order.
+     *
+     * @param d the {@code double} value to be written.
+     * @throws IOException if an I/O error occurs.
+     */
+    public final void writeDouble(double d) throws IOException {
+        writeLong(Double.doubleToLongBits(d));
+    }
+
+    /**
+     * Writes a string to the underlying output stream as a sequence of
+     * bytes. Each character is written to the data output stream as
+     * if by the {@link #writeByte(int)} method.
+     *
+     * @param pString the {@code String} value to be written.
+     * @throws IOException if the underlying stream throws an IOException.
+     * @see #writeByte(int)
+     * @see #out
+     */
+    public void writeBytes(String pString) throws IOException {
+        int length = pString.length();
+
+        for (int i = 0; i < length; i++) {
+            out.write((byte) pString.charAt(i));
+        }
+
+        bytesWritten += length;
+    }
+
+    /**
+     * Writes a string to the underlying output stream as a sequence of
+     * characters. Each character is written to the data output stream as
+     * if by the {@code writeChar} method.
+     *
+     * @param pString a {@code String} value to be written.
+     * @throws IOException if the underlying stream throws an IOException.
+     * @see #writeChar(int)
+     * @see #out
+     */
+    public void writeChars(String pString) throws IOException {
+        int length = pString.length();
+
+        for (int i = 0; i < length; i++) {
+            int c = pString.charAt(i);
+            out.write(c & 0xFF);
+            out.write((c >>> 8) & 0xFF);
+        }
+
+        bytesWritten += length * 2;
+    }
+
+    /**
+     * Writes a string of no more than 65,535 characters
+     * to the underlying output stream using UTF-8
+     * encoding. This method first writes a two byte short
+     * in <b>big</b> endian order as required by the
+     * UTF-8 specification. This gives the number of bytes in the
+     * UTF-8 encoded version of the string, not the number of characters
+     * in the string. Next each character of the string is written
+     * using the UTF-8 encoding for the character.
+     *
+     * @param pString the string to be written.
+     * @throws UTFDataFormatException if the string is longer than
+     *                                65,535 characters.
+     * @throws IOException            if the underlying stream throws an IOException.
+     */
+    public void writeUTF(String pString) throws IOException {
+        int numchars = pString.length();
+        int numbytes = 0;
+
+        for (int i = 0; i < numchars; i++) {
+            int c = pString.charAt(i);
+
+            if ((c >= 0x0001) && (c <= 0x007F)) {
+                numbytes++;
+            }
+            else if (c > 0x07FF) {
+                numbytes += 3;
+            }
+            else {
+                numbytes += 2;
+            }
+        }
+
+        if (numbytes > 65535) {
+            throw new UTFDataFormatException();
+        }
+
+        out.write((numbytes >>> 8) & 0xFF);
+        out.write(numbytes & 0xFF);
+
+        for (int i = 0; i < numchars; i++) {
+            int c = pString.charAt(i);
+
+            if ((c >= 0x0001) && (c <= 0x007F)) {
+                out.write(c);
+            }
+            else if (c > 0x07FF) {
+                out.write(0xE0 | ((c >> 12) & 0x0F));
+                out.write(0x80 | ((c >> 6) & 0x3F));
+                out.write(0x80 | (c & 0x3F));
+                bytesWritten += 2;
+            }
+            else {
+                out.write(0xC0 | ((c >> 6) & 0x1F));
+                out.write(0x80 | (c & 0x3F));
+                bytesWritten += 1;
+            }
+        }
+
+        bytesWritten += numchars + 2;
+    }
+
+    /**
+     * Returns the number of bytes written to this little endian output stream.
+     * (This class is not thread-safe with respect to this method. It is
+     * possible that this number is temporarily less than the actual
+     * number of bytes written.)
+     * @return the value of the {@code written} field.
+     * @see     #bytesWritten
+     */
+    public int size() {
+        return bytesWritten;
+  }
 }
@@ -1,193 +1,197 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A {@code SeekableInputStream} implementation that caches data in memory.
- * <p/>
- *
- * @see FileCacheSeekableStream
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/MemoryCacheSeekableStream.java#3 $
- */
-public final class MemoryCacheSeekableStream extends AbstractCachedSeekableStream {
-
-    /**
-     * Creates a {@code MemoryCacheSeekableStream}, reading from the given
-     * {@code InputStream}. Data will be cached in memory.
-     *
-     * @param pStream the {@code InputStream} to read from.
-     */
-    public MemoryCacheSeekableStream(final InputStream pStream) {
-        super(pStream, new MemoryCache());
-    }
-
-    public final boolean isCachedMemory() {
-        return true;
-    }
-
-    public final boolean isCachedFile() {
-        return false;
-    }
-
-    final static class MemoryCache extends StreamCache {
-        final static int BLOCK_SIZE = 1 << 13;
-
-        private final List<byte[]> cache = new ArrayList<byte[]>();
-        private long length;
-        private long position;
-        private long start;
-
-        private byte[] getBlock() throws IOException {
-            final long currPos = position - start;
-            if (currPos < 0) {
-                throw new IOException("StreamCache flushed before read position");
-            }
-
-            long index = currPos / BLOCK_SIZE;
-
-            if (index >= Integer.MAX_VALUE) {
-                throw new IOException("Memory cache max size exceeded");
-            }
-
-            if (index >= cache.size()) {
-                try {
-                    cache.add(new byte[BLOCK_SIZE]);
-//                    System.out.println("Allocating new block, size: " + BLOCK_SIZE);
-//                    System.out.println("New total size: " + cache.size() * BLOCK_SIZE + " (" + cache.size() + " blocks)");
-                }
-                catch (OutOfMemoryError e) {
-                    throw new IOException("No more memory for cache: " + cache.size() * BLOCK_SIZE);
-                }
-            }
-
-            //System.out.println("index: " + index);
-
-            return cache.get((int) index);
-        }
-
-        public void write(final int pByte) throws IOException {
-            byte[] buffer = getBlock();
-
-            int idx = (int) (position % BLOCK_SIZE);
-            buffer[idx] = (byte) pByte;
-            position++;
-
-            if (position > length) {
-                length = position;
-            }
-        }
-
-        // TODO: OptimizeMe!!!
-        @Override
-        public void write(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException {
-            byte[] buffer = getBlock();
-            for (int i = 0; i < pLength; i++) {
-                int index = (int) position % BLOCK_SIZE;
-                if (index == 0) {
-                    buffer = getBlock();
-                }
-                buffer[index] = pBuffer[pOffset + i];
-
-                position++;
-            }
-            if (position > length) {
-                length = position;
-            }
-        }
-
-        public int read() throws IOException {
-            if (position >= length) {
-                return -1;
-            }
-
-            byte[] buffer = getBlock();
-
-            int idx = (int) (position % BLOCK_SIZE);
-            position++;
-
-            return buffer[idx] & 0xff;
-        }
-
-        // TODO: OptimizeMe!!!
-        @Override
-        public int read(final byte[] pBytes, final int pOffset, final int pLength) throws IOException {
-            if (position >= length) {
-                return -1;
-            }
-
-            byte[] buffer = getBlock();
-
-            int bufferPos = (int) (position % BLOCK_SIZE);
-
-            // Find maxIdx and simplify test in for-loop
-            int maxLen = (int) Math.min(Math.min(pLength, buffer.length - bufferPos), length - position);
-
-            int i;
-            //for (i = 0; i < pLength && i < buffer.length - idx && i < length - position; i++) {
-            for (i = 0; i < maxLen; i++) {
-                pBytes[pOffset + i] = buffer[bufferPos + i];
-            }
-
-            position += i;
-
-            return i;
-        }
-
-        public void seek(final long pPosition) throws IOException {
-            if (pPosition < start) {
-                throw new IOException("Seek before flush position");
-            }
-            position = pPosition;
-        }
-
-        @Override
-        public void flush(final long pPosition) {
-            int firstPos = (int) (pPosition / BLOCK_SIZE) - 1;
-
-            for (int i = 0; i < firstPos; i++) {
-                cache.remove(0);
-            }
-
-            start = pPosition;
-        }
-
-        public long getPosition() {
-            return position;
-        }
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A {@code SeekableInputStream} implementation that caches data in memory.
+ *
+ * @see FileCacheSeekableStream
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/MemoryCacheSeekableStream.java#3 $
+ */
+public final class MemoryCacheSeekableStream extends AbstractCachedSeekableStream {
+
+    /**
+     * Creates a {@code MemoryCacheSeekableStream}, reading from the given
+     * {@code InputStream}. Data will be cached in memory.
+     *
+     * @param pStream the {@code InputStream} to read from.
+     */
+    public MemoryCacheSeekableStream(final InputStream pStream) {
+        super(pStream, new MemoryCache());
+    }
+
+    public final boolean isCachedMemory() {
+        return true;
+    }
+
+    public final boolean isCachedFile() {
+        return false;
+    }
+
+    final static class MemoryCache extends StreamCache {
+        final static int BLOCK_SIZE = 1 << 13;
+
+        private final List<byte[]> cache = new ArrayList<>();
+        private long length;
+        private long position;
+        private long start;
+
+        private byte[] getBlock() throws IOException {
+            final long currPos = position - start;
+            if (currPos < 0) {
+                throw new IOException("StreamCache flushed before read position");
+            }
+
+            long index = currPos / BLOCK_SIZE;
+
+            if (index >= Integer.MAX_VALUE) {
+                throw new IOException("Memory cache max size exceeded");
+            }
+
+            if (index >= cache.size()) {
+                try {
+                    cache.add(new byte[BLOCK_SIZE]);
+//                    System.out.println("Allocating new block, size: " + BLOCK_SIZE);
+//                    System.out.println("New total size: " + cache.size() * BLOCK_SIZE + " (" + cache.size() + " blocks)");
+                }
+                catch (OutOfMemoryError e) {
+                    throw new IOException("No more memory for cache: " + cache.size() * BLOCK_SIZE);
+                }
+            }
+
+            //System.out.println("index: " + index);
+
+            return cache.get((int) index);
+        }
+
+        public void write(final int pByte) throws IOException {
+            byte[] buffer = getBlock();
+
+            int idx = (int) (position % BLOCK_SIZE);
+            buffer[idx] = (byte) pByte;
+            position++;
+
+            if (position > length) {
+                length = position;
+            }
+        }
+
+        // TODO: OptimizeMe!!!
+        @Override
+        public void write(final byte[] pBuffer, final int pOffset, final int pLength) throws IOException {
+            byte[] buffer = getBlock();
+            for (int i = 0; i < pLength; i++) {
+                int index = (int) position % BLOCK_SIZE;
+                if (index == 0) {
+                    buffer = getBlock();
+                }
+                buffer[index] = pBuffer[pOffset + i];
+
+                position++;
+            }
+            if (position > length) {
+                length = position;
+            }
+        }
+
+        public int read() throws IOException {
+            if (position >= length) {
+                return -1;
+            }
+
+            byte[] buffer = getBlock();
+
+            int idx = (int) (position % BLOCK_SIZE);
+            position++;
+
+            return buffer[idx] & 0xff;
+        }
+
+        // TODO: OptimizeMe!!!
+        @Override
+        public int read(final byte[] pBytes, final int pOffset, final int pLength) throws IOException {
+            if (position >= length) {
+                return -1;
+            }
+
+            byte[] buffer = getBlock();
+
+            int bufferPos = (int) (position % BLOCK_SIZE);
+
+            // Find maxIdx and simplify test in for-loop
+            int maxLen = (int) Math.min(Math.min(pLength, buffer.length - bufferPos), length - position);
+
+            int i;
+            //for (i = 0; i < pLength && i < buffer.length - idx && i < length - position; i++) {
+            for (i = 0; i < maxLen; i++) {
+                pBytes[pOffset + i] = buffer[bufferPos + i];
+            }
+
+            position += i;
+
+            return i;
+        }
+
+        public void seek(final long pPosition) throws IOException {
+            if (pPosition < start) {
+                throw new IOException("Seek before flush position");
+            }
+            position = pPosition;
+        }
+
+        @Override
+        public void flush(final long pPosition) {
+            int firstPos = (int) (pPosition / BLOCK_SIZE) - 1;
+
+            for (int i = 0; i < firstPos; i++) {
+                cache.remove(0);
+            }
+
+            start = pPosition;
+        }
+
+        @Override
+        void close() throws IOException {
+            cache.clear();
+        }
+
+        public long getPosition() {
+            return position;
+        }
+    }
+}
@@ -1,82 +1,81 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * An {@code InputStream} that contains no bytes.
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/NullInputStream.java#2 $
- */
-public class NullInputStream extends InputStream {
-
-    /**
-     * Creates a {@code NullInputStream}.
-     */
-    public NullInputStream() {
-    }
-
-    /**
-     * This implementation returns {@code -1} (EOF), always.
-     *
-     * @return {@code -1}
-     * @throws IOException
-     */
-    public int read() throws IOException {
-        return -1;
-    }
-
-    /**
-     * This implementation returns {@code 0}, always.
-     *
-     * @return {@code 0}
-     * @throws IOException
-     */
-    @Override
-    public int available() throws IOException {
-        return 0;
-    }
-
-    /**
-     * This implementation returns {@code 0}, always.
-     *
-     * @return {@code 0}
-     * @throws IOException
-     */
-    @Override
-    public long skip(long pOffset) throws IOException {
-        return 0l;
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * An {@code InputStream} that contains no bytes.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/NullInputStream.java#2 $
+ */
+public class NullInputStream extends InputStream {
+
+    /**
+     * Creates a {@code NullInputStream}.
+     */
+    public NullInputStream() {
+    }
+
+    /**
+     * This implementation returns {@code -1} (EOF), always.
+     *
+     * @return {@code -1}
+     * @throws IOException
+     */
+    public int read() throws IOException {
+        return -1;
+    }
+
+    /**
+     * This implementation returns {@code 0}, always.
+     *
+     * @return {@code 0}
+     * @throws IOException
+     */
+    @Override
+    public int available() throws IOException {
+        return 0;
+    }
+
+    /**
+     * This implementation returns {@code 0}, always.
+     *
+     * @return {@code 0}
+     * @throws IOException
+     */
+    @Override
+    public long skip(long pOffset) throws IOException {
+        return 0l;
+    }
+}
@@ -1,70 +1,69 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * An {@code OutputStream} implementation that works as a sink.
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/NullOutputStream.java#2 $
- */
-public class NullOutputStream extends OutputStream {
-
-    /**
-     * Creates a {@code NullOutputStream}.
-     */
-    public NullOutputStream() {
-    }
-
-    /**
-     * This implementation does nothing.
-     */
-    public void write(int pByte) throws IOException {
-    }
-
-    /**
-     * This implementation does nothing.
-     */
-    @Override
-    public void write(byte pBytes[]) throws IOException {
-    }
-
-    /**
-     * This implementation does nothing.
-     */
-    @Override
-    public void write(byte pBytes[], int pOffset, int pLength) throws IOException {
-    }
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * An {@code OutputStream} implementation that works as a sink.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/NullOutputStream.java#2 $
+ */
+public class NullOutputStream extends OutputStream {
+
+    /**
+     * Creates a {@code NullOutputStream}.
+     */
+    public NullOutputStream() {
+    }
+
+    /**
+     * This implementation does nothing.
+     */
+    public void write(int pByte) throws IOException {
+    }
+
+    /**
+     * This implementation does nothing.
+     */
+    @Override
+    public void write(byte pBytes[]) throws IOException {
+    }
+
+    /**
+     * This implementation does nothing.
+     */
+    @Override
+    public void write(byte pBytes[], int pOffset, int pLength) throws IOException {
+    }
 }
@@ -1,241 +1,242 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.EOFException;
-import java.io.IOException;
-
-/**
- * A data stream that is both readable and writable, much like a
- * {@code RandomAccessFile}, except it may be backed by something other than a file.
- * <p/>
- *
- * @see java.io.RandomAccessFile
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haku $
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/RandomAccessStream.java#3 $
- */
-public abstract class RandomAccessStream implements Seekable, DataInput, DataOutput {
-    // TODO: Use a RandomAcceessFile as backing in impl, probably
-    // TODO: Create an in-memory implementation too?
-    // TODO: Package private SeekableDelegate?
-
-    // TODO: Both read and write must update stream position
-    //private int position = -1;
-
-    /** This random access stream, wrapped in an {@code InputStream} */
-    SeekableInputStream inputView = null;
-    /** This random access stream, wrapped in an {@code OutputStream} */
-    SeekableOutputStream outputView = null;
-
-    // TODO: Create an Input and an Output interface matching InputStream and OutputStream?
-    public int read() throws IOException {
-        try {
-            return readByte() & 0xff;
-        }
-        catch (EOFException e) {
-            return -1;
-        }
-    }
-
-    public int read(final byte[] pBytes, final int pOffset, final int pLength) throws IOException {
-        if (pBytes == null) {
-            throw new NullPointerException("bytes == null");
-        }
-        else if ((pOffset < 0) || (pOffset > pBytes.length) || (pLength < 0) ||
-                ((pOffset + pLength) > pBytes.length) || ((pOffset + pLength) < 0)) {
-            throw new IndexOutOfBoundsException();
-        }
-        else if (pLength == 0) {
-            return 0;
-        }
-
-        // Special case, allready at EOF
-        int c = read();
-        if (c == -1) {
-            return -1;
-        }
-
-        // Otherwise, read as many as bytes as possible
-        pBytes[pOffset] = (byte) c;
-
-        int i = 1;
-        try {
-            for (; i < pLength; i++) {
-                c = read();
-                if (c == -1) {
-                    break;
-                }
-                pBytes[pOffset + i] = (byte) c;
-            }
-        }
-        catch (IOException ignore) {
-            // Ignore exception, just return length
-        }
-
-        return i;
-    }
-
-    public final int read(byte[] pBytes) throws IOException {
-        return read(pBytes, 0, pBytes != null ? pBytes.length : 1);
-    }
-
-    /**
-     * Returns an input view of this {@code RandomAccessStream}.
-     * Invoking this method several times, will return the same object.
-     * <p/>
-     * <em>Note that read access is NOT synchronized.</em>
-     *
-     * @return a {@code SeekableInputStream} reading from this stream
-     */
-    public final SeekableInputStream asInputStream() {
-        if (inputView == null) {
-             inputView = new InputStreamView(this);
-        }
-        return inputView;
-    }
-
-    /**
-     * Returns an output view of this {@code RandomAccessStream}.
-     * Invoking this method several times, will return the same object.
-     * <p/>
-     * <em>Note that write access is NOT synchronized.</em>
-     *
-     * @return a {@code SeekableOutputStream} writing to this stream
-     */
-    public final SeekableOutputStream asOutputStream() {
-        if (outputView == null) {
-            outputView = new OutputStreamView(this);
-        }
-        return outputView;
-    }
-
-    static final class InputStreamView extends SeekableInputStream {
-        // TODO: Consider adding synchonization (on stream) for all operations
-        // TODO: Is is a good thing that close/flush etc works on stream?
-        //  - Or should it rather just work on the views?
-        //  - Allow multiple views?
-
-        final private RandomAccessStream mStream;
-
-        public InputStreamView(RandomAccessStream pStream) {
-            if (pStream == null) {
-                throw new IllegalArgumentException("stream == null");
-            }
-            mStream = pStream;
-        }
-
-        public boolean isCached() {
-            return mStream.isCached();
-        }
-
-        public boolean isCachedFile() {
-            return mStream.isCachedFile();
-        }
-
-        public boolean isCachedMemory() {
-            return mStream.isCachedMemory();
-        }
-
-        protected void closeImpl() throws IOException {
-            mStream.close();
-        }
-
-        protected void flushBeforeImpl(long pPosition) throws IOException {
-            mStream.flushBefore(pPosition);
-        }
-
-        protected void seekImpl(long pPosition) throws IOException {
-            mStream.seek(pPosition);
-        }
-
-        public int read() throws IOException {
-            return mStream.read();
-        }
-
-        @Override
-        public int read(byte pBytes[], int pOffset, int pLength) throws IOException {
-            return mStream.read(pBytes, pOffset, pLength);
-        }
-    }
-
-    static final class OutputStreamView extends SeekableOutputStream {
-        // TODO: Consider adding synchonization (on stream) for all operations
-        // TODO: Is is a good thing that close/flush etc works on stream?
-        //  - Or should it rather just work on the views?
-        //  - Allow multiple views?
-
-        final private RandomAccessStream mStream;
-
-        public OutputStreamView(RandomAccessStream pStream) {
-            if (pStream == null) {
-                throw new IllegalArgumentException("stream == null");
-            }
-            mStream = pStream;
-        }
-
-        public boolean isCached() {
-            return mStream.isCached();
-        }
-
-        public boolean isCachedFile() {
-            return mStream.isCachedFile();
-        }
-
-        public boolean isCachedMemory() {
-            return mStream.isCachedMemory();
-        }
-
-        protected void closeImpl() throws IOException {
-            mStream.close();
-        }
-
-        protected void flushBeforeImpl(long pPosition) throws IOException {
-            mStream.flushBefore(pPosition);
-        }
-
-        protected void seekImpl(long pPosition) throws IOException {
-            mStream.seek(pPosition);
-        }
-
-        public void write(int pByte) throws IOException {
-            mStream.write(pByte);
-        }
-
-        @Override
-        public void write(byte pBytes[], int pOffset, int pLength) throws IOException {
-            mStream.write(pBytes, pOffset, pLength);
-        }
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.EOFException;
+import java.io.IOException;
+
+/**
+ * A data stream that is both readable and writable, much like a
+ * {@code RandomAccessFile}, except it may be backed by something other than a file.
+ *
+ * @see java.io.RandomAccessFile
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haku $
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/RandomAccessStream.java#3 $
+ */
+public abstract class RandomAccessStream implements Seekable, DataInput, DataOutput {
+    // TODO: Use a RandomAcceessFile as backing in impl, probably
+    // TODO: Create an in-memory implementation too?
+    // TODO: Package private SeekableDelegate?
+
+    // TODO: Both read and write must update stream position
+    //private int position = -1;
+
+    /** This random access stream, wrapped in an {@code InputStream} */
+    SeekableInputStream inputView = null;
+    /** This random access stream, wrapped in an {@code OutputStream} */
+    SeekableOutputStream outputView = null;
+
+    // TODO: Create an Input and an Output interface matching InputStream and OutputStream?
+    public int read() throws IOException {
+        try {
+            return readByte() & 0xff;
+        }
+        catch (EOFException e) {
+            return -1;
+        }
+    }
+
+    public int read(final byte[] pBytes, final int pOffset, final int pLength) throws IOException {
+        if (pBytes == null) {
+            throw new NullPointerException("bytes == null");
+        }
+        else if ((pOffset < 0) || (pOffset > pBytes.length) || (pLength < 0) ||
+                ((pOffset + pLength) > pBytes.length) || ((pOffset + pLength) < 0)) {
+            throw new IndexOutOfBoundsException();
+        }
+        else if (pLength == 0) {
+            return 0;
+        }
+
+        // Special case, allready at EOF
+        int c = read();
+        if (c == -1) {
+            return -1;
+        }
+
+        // Otherwise, read as many as bytes as possible
+        pBytes[pOffset] = (byte) c;
+
+        int i = 1;
+        try {
+            for (; i < pLength; i++) {
+                c = read();
+                if (c == -1) {
+                    break;
+                }
+                pBytes[pOffset + i] = (byte) c;
+            }
+        }
+        catch (IOException ignore) {
+            // Ignore exception, just return length
+        }
+
+        return i;
+    }
+
+    public final int read(byte[] pBytes) throws IOException {
+        return read(pBytes, 0, pBytes != null ? pBytes.length : 1);
+    }
+
+    /**
+     * Returns an input view of this {@code RandomAccessStream}.
+     * Invoking this method several times, will return the same object.
+     * <p>
+     * <em>Note that read access is NOT synchronized.</em>
+     * </p>
+     *
+     * @return a {@code SeekableInputStream} reading from this stream
+     */
+    public final SeekableInputStream asInputStream() {
+        if (inputView == null) {
+             inputView = new InputStreamView(this);
+        }
+        return inputView;
+    }
+
+    /**
+     * Returns an output view of this {@code RandomAccessStream}.
+     * Invoking this method several times, will return the same object.
+     * <p>
+     * <em>Note that write access is NOT synchronized.</em>
+     * </p>
+     *
+     * @return a {@code SeekableOutputStream} writing to this stream
+     */
+    public final SeekableOutputStream asOutputStream() {
+        if (outputView == null) {
+            outputView = new OutputStreamView(this);
+        }
+        return outputView;
+    }
+
+    static final class InputStreamView extends SeekableInputStream {
+        // TODO: Consider adding synchonization (on stream) for all operations
+        // TODO: Is is a good thing that close/flush etc works on stream?
+        //  - Or should it rather just work on the views?
+        //  - Allow multiple views?
+
+        final private RandomAccessStream mStream;
+
+        public InputStreamView(RandomAccessStream pStream) {
+            if (pStream == null) {
+                throw new IllegalArgumentException("stream == null");
+            }
+            mStream = pStream;
+        }
+
+        public boolean isCached() {
+            return mStream.isCached();
+        }
+
+        public boolean isCachedFile() {
+            return mStream.isCachedFile();
+        }
+
+        public boolean isCachedMemory() {
+            return mStream.isCachedMemory();
+        }
+
+        protected void closeImpl() throws IOException {
+            mStream.close();
+        }
+
+        protected void flushBeforeImpl(long pPosition) throws IOException {
+            mStream.flushBefore(pPosition);
+        }
+
+        protected void seekImpl(long pPosition) throws IOException {
+            mStream.seek(pPosition);
+        }
+
+        public int read() throws IOException {
+            return mStream.read();
+        }
+
+        @Override
+        public int read(byte pBytes[], int pOffset, int pLength) throws IOException {
+            return mStream.read(pBytes, pOffset, pLength);
+        }
+    }
+
+    static final class OutputStreamView extends SeekableOutputStream {
+        // TODO: Consider adding synchonization (on stream) for all operations
+        // TODO: Is is a good thing that close/flush etc works on stream?
+        //  - Or should it rather just work on the views?
+        //  - Allow multiple views?
+
+        final private RandomAccessStream mStream;
+
+        public OutputStreamView(RandomAccessStream pStream) {
+            if (pStream == null) {
+                throw new IllegalArgumentException("stream == null");
+            }
+            mStream = pStream;
+        }
+
+        public boolean isCached() {
+            return mStream.isCached();
+        }
+
+        public boolean isCachedFile() {
+            return mStream.isCachedFile();
+        }
+
+        public boolean isCachedMemory() {
+            return mStream.isCachedMemory();
+        }
+
+        protected void closeImpl() throws IOException {
+            mStream.close();
+        }
+
+        protected void flushBeforeImpl(long pPosition) throws IOException {
+            mStream.flushBefore(pPosition);
+        }
+
+        protected void seekImpl(long pPosition) throws IOException {
+            mStream.seek(pPosition);
+        }
+
+        public void write(int pByte) throws IOException {
+            mStream.write(pByte);
+        }
+
+        @Override
+        public void write(byte pBytes[], int pOffset, int pLength) throws IOException {
+            mStream.write(pBytes, pOffset, pLength);
+        }
+    }
+}
@@ -1,186 +1,193 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.IOException;
-
-/**
- * Interface for seekable streams.
- * <p/>
- * @see SeekableInputStream
- * @see SeekableOutputStream
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Seekable.java#1 $
- */
-public interface Seekable {
-
-    /**
-     * Returns the current byte position of the stream. The next read will take
-     * place starting at this offset.
-     *
-     * @return a {@code long} containing the position of the stream.
-     * @throws IOException if an I/O error occurs.
-     */
-    long getStreamPosition() throws IOException;
-
-    /**
-     * Sets the current stream position to the desired location.
-     * The next read will occur at this location.
-     * <p/>
-     * An {@code IndexOutOfBoundsException} will be thrown if pPosition is smaller
-     * than the flushed position (as returned by {@link #getFlushedPosition()}).
-     * <p/>
-     * It is legal to seek past the end of the file; an {@code EOFException}
-     * will be thrown only if a read is performed.
-     *
-     * @param pPosition a long containing the desired file pointer position.
-     *
-     * @throws IndexOutOfBoundsException if {@code pPosition} is smaller than
-     * the flushed position.
-     * @throws IOException if any other I/O error occurs.
-     */
-    void seek(long pPosition) throws IOException;
-
-    /**
-     * Marks a position in the stream to be returned to by a subsequent call to
-     * reset.
-     * Unlike a standard {@code InputStream}, all {@code Seekable}
-     * streams upport marking. Additionally, calls to {@code mark} and
-     * {@code reset} may be nested arbitrarily.
-     * <p/>
-     * Unlike the {@code mark} methods declared by the {@code Reader} or
-     * {@code InputStream}
-     * interfaces, no {@code readLimit} parameter is used. An arbitrary amount
-     * of data may be read following the call to {@code mark}.
-     */
-    void mark();
-
-    /**
-     * Returns the file pointer to its previous position,
-     * at the time of the most recent unmatched call to mark.
-     * <p/>
-     * Calls to reset without a corresponding call to mark will either:
-     * <ul>
-     * <li>throw an {@code IOException}</li>
-     * <li>or, reset to the beginning of the stream.</li>
-     * </ul>
-     * An {@code IOException} will be thrown if the previous marked position
-     * lies in the discarded portion of the stream.
-     *
-     * @throws IOException if an I/O error occurs.
-     * @see java.io.InputStream#reset()
-     */
-    void reset() throws IOException;
-
-    /**
-     * Discards the initial portion of the stream prior to the indicated
-     * postion. Attempting to seek to an offset within the flushed portion of
-     * the stream will result in an {@code IndexOutOfBoundsException}.
-     * <p/>
-     * Calling {@code flushBefore} may allow classes implementing this
-     * interface to free up resources such as memory or disk space that are
-     * being used to store data from the stream.
-     *
-     * @param pPosition a long containing the length of the file prefix that
-     * may be flushed.
-     *
-     * @throws IndexOutOfBoundsException if {@code pPosition} lies in the
-     * flushed portion of the stream or past the current stream position.
-     * @throws IOException if an I/O error occurs.
-     */
-    void flushBefore(long pPosition) throws IOException;
-
-    /**
-     * Discards the initial position of the stream prior to the current stream
-     * position. Equivalent to {@code flushBefore(getStreamPosition())}.
-     *
-     * @throws IOException if an I/O error occurs.
-     */
-    void flush() throws IOException;
-
-    /**
-     * Returns the earliest position in the stream to which seeking may be
-     * performed. The returned value will be the maximum of all values passed
-     * into previous calls to {@code flushBefore}.
-     *
-     * @return the earliest legal position for seeking, as a {@code long}.
-     *
-     * @throws IOException if an I/O error occurs.
-     */
-    long getFlushedPosition() throws IOException;
-
-    /**
-     * Returns true if this {@code Seekable} stream caches data itself in order
-     * to allow seeking backwards. Applications may consult this in order to
-     * decide how frequently, or whether, to flush in order to conserve cache
-     * resources.
-     *
-     * @return {@code true} if this {@code Seekable} caches data.
-     * @see #isCachedMemory()
-     * @see #isCachedFile()
-     */
-    boolean isCached();
-
-    /**
-     * Returns true if this {@code Seekable} stream caches data itself in order
-     * to allow seeking backwards, and the cache is kept in main memory.
-     * Applications may consult this in order to decide how frequently, or
-     * whether, to flush in order to conserve cache resources.
-     *
-     * @return {@code true} if this {@code Seekable} caches data in main
-     * memory.
-     * @see #isCached()
-     * @see #isCachedFile()
-     */
-    boolean isCachedMemory();
-
-    /**
-     * Returns true if this {@code Seekable} stream caches data itself in
-     * order to allow seeking backwards, and the cache is kept in a
-     * temporary file.
-     * Applications may consult this in order to decide how frequently,
-     * or whether, to flush in order to conserve cache resources.
-     *
-     * @return {@code true} if this {@code Seekable} caches data in a
-     * temporary file.
-     * @see #isCached
-     * @see #isCachedMemory
-     */
-    boolean isCachedFile();
-
-    /**
-     * Closes the stream.
-     *
-     * @throws java.io.IOException if the stream can't be closed.
-     */
-    void close() throws IOException;
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.IOException;
+
+/**
+ * Interface for seekable streams.
+ *
+ * @see SeekableInputStream
+ * @see SeekableOutputStream
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Seekable.java#1 $
+ */
+public interface Seekable {
+
+    /**
+     * Returns the current byte position of the stream. The next read will take
+     * place starting at this offset.
+     *
+     * @return a {@code long} containing the position of the stream.
+     * @throws IOException if an I/O error occurs.
+     */
+    long getStreamPosition() throws IOException;
+
+    /**
+     * Sets the current stream position to the desired location.
+     * The next read will occur at this location.
+     * <p>
+     * An {@code IndexOutOfBoundsException} will be thrown if pPosition is smaller
+     * than the flushed position (as returned by {@link #getFlushedPosition()}).
+     * </p>
+     * <p>
+     * It is legal to seek past the end of the file; an {@code EOFException}
+     * will be thrown only if a read is performed.
+     * </p>
+     *
+     * @param pPosition a long containing the desired file pointer position.
+     *
+     * @throws IndexOutOfBoundsException if {@code pPosition} is smaller than
+     * the flushed position.
+     * @throws IOException if any other I/O error occurs.
+     */
+    void seek(long pPosition) throws IOException;
+
+    /**
+     * Marks a position in the stream to be returned to by a subsequent call to
+     * reset.
+     * Unlike a standard {@code InputStream}, all {@code Seekable}
+     * streams upport marking. Additionally, calls to {@code mark} and
+     * {@code reset} may be nested arbitrarily.
+     * <p>
+     * Unlike the {@code mark} methods declared by the {@code Reader} or
+     * {@code InputStream}
+     * interfaces, no {@code readLimit} parameter is used. An arbitrary amount
+     * of data may be read following the call to {@code mark}.
+     * </p>
+     */
+    void mark();
+
+    /**
+     * Returns the file pointer to its previous position,
+     * at the time of the most recent unmatched call to mark.
+     * <p>
+     * Calls to reset without a corresponding call to mark will either:
+     * </p>
+     * <ul>
+     * <li>throw an {@code IOException}</li>
+     * <li>or, reset to the beginning of the stream.</li>
+     * </ul>
+     * <p>
+     * An {@code IOException} will be thrown if the previous marked position
+     * lies in the discarded portion of the stream.
+     * </p>
+     *
+     * @throws IOException if an I/O error occurs.
+     * @see java.io.InputStream#reset()
+     */
+    void reset() throws IOException;
+
+    /**
+     * Discards the initial portion of the stream prior to the indicated
+     * postion. Attempting to seek to an offset within the flushed portion of
+     * the stream will result in an {@code IndexOutOfBoundsException}.
+     * <p>
+     * Calling {@code flushBefore} may allow classes implementing this
+     * interface to free up resources such as memory or disk space that are
+     * being used to store data from the stream.
+     * </p>
+     *
+     * @param pPosition a long containing the length of the file prefix that
+     * may be flushed.
+     *
+     * @throws IndexOutOfBoundsException if {@code pPosition} lies in the
+     * flushed portion of the stream or past the current stream position.
+     * @throws IOException if an I/O error occurs.
+     */
+    void flushBefore(long pPosition) throws IOException;
+
+    /**
+     * Discards the initial position of the stream prior to the current stream
+     * position. Equivalent to {@code flushBefore(getStreamPosition())}.
+     *
+     * @throws IOException if an I/O error occurs.
+     */
+    void flush() throws IOException;
+
+    /**
+     * Returns the earliest position in the stream to which seeking may be
+     * performed. The returned value will be the maximum of all values passed
+     * into previous calls to {@code flushBefore}.
+     *
+     * @return the earliest legal position for seeking, as a {@code long}.
+     *
+     * @throws IOException if an I/O error occurs.
+     */
+    long getFlushedPosition() throws IOException;
+
+    /**
+     * Returns true if this {@code Seekable} stream caches data itself in order
+     * to allow seeking backwards. Applications may consult this in order to
+     * decide how frequently, or whether, to flush in order to conserve cache
+     * resources.
+     *
+     * @return {@code true} if this {@code Seekable} caches data.
+     * @see #isCachedMemory()
+     * @see #isCachedFile()
+     */
+    boolean isCached();
+
+    /**
+     * Returns true if this {@code Seekable} stream caches data itself in order
+     * to allow seeking backwards, and the cache is kept in main memory.
+     * Applications may consult this in order to decide how frequently, or
+     * whether, to flush in order to conserve cache resources.
+     *
+     * @return {@code true} if this {@code Seekable} caches data in main
+     * memory.
+     * @see #isCached()
+     * @see #isCachedFile()
+     */
+    boolean isCachedMemory();
+
+    /**
+     * Returns true if this {@code Seekable} stream caches data itself in
+     * order to allow seeking backwards, and the cache is kept in a
+     * temporary file.
+     * Applications may consult this in order to decide how frequently,
+     * or whether, to flush in order to conserve cache resources.
+     *
+     * @return {@code true} if this {@code Seekable} caches data in a
+     * temporary file.
+     * @see #isCached
+     * @see #isCachedMemory
+     */
+    boolean isCachedFile();
+
+    /**
+     * Closes the stream.
+     *
+     * @throws java.io.IOException if the stream can't be closed.
+     */
+    void close() throws IOException;
+}
@@ -1,238 +1,238 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Stack;
-
-/**
- * Abstract base class for {@code InputStream}s implementing the {@code Seekable} interface.
- * <p/>
- * @see SeekableOutputStream
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SeekableInputStream.java#4 $
- */
-public abstract class SeekableInputStream extends InputStream implements Seekable {
-
-    // TODO: It's at the moment not possible to create subclasses outside this
-    // package, as there's no access to position. position needs to be
-    // updated from the read/read/read methods...
-
-    /** The stream position in this stream */
-    long position;
-    long flushedPosition;
-    boolean closed;
-
-    protected Stack<Long> markedPositions = new Stack<Long>();
-
-    /// InputStream overrides
-    @Override
-    public final int read(byte[] pBytes) throws IOException {
-        return read(pBytes, 0, pBytes != null ? pBytes.length : 1);
-    }
-
-    /**
-     * Implemented using {@code seek(currentPos + pLength)}.
-     *
-     * @param pLength the number of bytes to skip
-     * @return the actual number of bytes skipped (may be equal to or less
-     *         than {@code pLength})
-     *
-     * @throws IOException if an I/O exception occurs during skip
-     */
-    @Override
-    public final long skip(final long pLength) throws IOException {
-        long pos = position;
-        long wantedPosition = pos + pLength;
-        if (wantedPosition < flushedPosition) {
-            throw new IOException("position < flushedPosition");
-        }
-
-        // Stop at stream length for compatibility, even though it might be allowed
-        // to seek past end of stream
-        int available = available();
-        if (available > 0) {
-            seek(Math.min(wantedPosition, pos + available));
-        }
-        // TODO: Add optimization for streams with known length!
-        else {
-            // Slow mode...
-            int toSkip = (int) Math.max(Math.min(pLength, 512), -512);
-            while (toSkip > 0 && read() >= 0) {
-                toSkip--;
-            }
-        }
-
-        return position - pos;
-    }
-
-    @Override
-    public final void mark(int pLimit) {
-        mark();
-
-        // TODO: We don't really need to do this.. Is it a good idea?
-        try {
-            flushBefore(Math.max(position - pLimit, flushedPosition));
-        }
-        catch (IOException ignore) {
-            // Ignore, as it's not really critical
-        }
-    }
-
-    /**
-     * Returns {@code true}, as marking is always supported.
-     *
-     * @return {@code true}.
-     */
-    @Override
-    public final boolean markSupported() {
-        return true;
-    }
-
-    /// Seekable implementation
-    public final void seek(long pPosition) throws IOException {
-        checkOpen();
-
-        // NOTE: This is correct according to javax.imageio (IndexOutOfBoundsException),
-        // but it's kind of inconsistent with reset that throws IOException...
-        if (pPosition < flushedPosition) {
-           throw new IndexOutOfBoundsException("position < flushedPosition");
-        }
-
-        seekImpl(pPosition);
-        position = pPosition;
-    }
-
-    protected abstract void seekImpl(long pPosition) throws IOException;
-
-    public final void mark() {
-        markedPositions.push(position);
-    }
-
-    @Override
-    public final void reset() throws IOException {
-        checkOpen();
-        if (!markedPositions.isEmpty()) {
-            long newPos = markedPositions.pop();
-
-            // NOTE: This is correct according to javax.imageio (IOException),
-            // but it's kind of inconsistent with seek that throws IndexOutOfBoundsException...
-            if (newPos < flushedPosition) {
-                throw new IOException("Previous marked position has been discarded");
-            }
-
-            seek(newPos);
-        }
-        else {
-            // TODO: To iron out some wrinkles due to conflicting contracts
-            // (InputStream and Seekable both declare reset),
-            // we might need to reset to the last marked position instead..
-            // However, that becomes REALLY confusing if that position is after
-            // the current position...
-            seek(0);
-        }
-    }
-
-    public final void flushBefore(long pPosition) throws IOException {
-        if (pPosition < flushedPosition) {
-            throw new IndexOutOfBoundsException("position < flushedPosition");
-        }
-        if (pPosition > getStreamPosition()) {
-            throw new IndexOutOfBoundsException("position > stream position");
-        }
-        checkOpen();
-        flushBeforeImpl(pPosition);
-        flushedPosition = pPosition;
-    }
-
-    /**
-     * Discards the initial portion of the stream prior to the indicated postion.
-     *
-     * @param pPosition the position to flush to
-     * @throws IOException if an I/O exception occurs during the flush operation
-     *
-     * @see #flushBefore(long)
-     */
-    protected abstract void flushBeforeImpl(long pPosition) throws IOException;
-
-    public final void flush() throws IOException {
-        flushBefore(flushedPosition);
-    }
-
-    public final long getFlushedPosition() throws IOException {
-        checkOpen();
-        return flushedPosition;
-    }
-
-    public final long getStreamPosition() throws IOException {
-        checkOpen();
-        return position;
-    }
-
-    protected final void checkOpen() throws IOException {
-        if (closed) {
-            throw new IOException("closed");
-        }
-    }
-
-    @Override
-    public final void close() throws IOException {
-        checkOpen();
-        closed = true;
-        closeImpl();
-    }
-
-    protected abstract void closeImpl() throws IOException;
-
-    /**
-     * Finalizes this object prior to garbage collection.  The
-     * {@code close} method is called to close any open input
-     * source.  This method should not be called from application
-     * code.
-     *
-     * @exception Throwable if an error occurs during superclass
-     * finalization.
-     */
-    @Override
-    protected void finalize() throws Throwable {
-        if (!closed) {
-            try {
-                close();
-            }
-            catch (IOException ignore) {
-                // Ignroe
-            }
-        }
-        super.finalize();
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Stack;
+
+/**
+ * Abstract base class for {@code InputStream}s implementing the {@code Seekable} interface.
+ *
+ * @see SeekableOutputStream
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SeekableInputStream.java#4 $
+ */
+public abstract class SeekableInputStream extends InputStream implements Seekable {
+
+    // TODO: It's at the moment not possible to create subclasses outside this
+    // package, as there's no access to position. position needs to be
+    // updated from the read/read/read methods...
+
+    /** The stream position in this stream */
+    long position;
+    long flushedPosition;
+    boolean closed;
+
+    protected Stack<Long> markedPositions = new Stack<Long>();
+
+    /// InputStream overrides
+    @Override
+    public final int read(byte[] pBytes) throws IOException {
+        return read(pBytes, 0, pBytes != null ? pBytes.length : 1);
+    }
+
+    /**
+     * Implemented using {@code seek(currentPos + pLength)}.
+     *
+     * @param pLength the number of bytes to skip
+     * @return the actual number of bytes skipped (may be equal to or less
+     *         than {@code pLength})
+     *
+     * @throws IOException if an I/O exception occurs during skip
+     */
+    @Override
+    public final long skip(final long pLength) throws IOException {
+        long pos = position;
+        long wantedPosition = pos + pLength;
+        if (wantedPosition < flushedPosition) {
+            throw new IOException("position < flushedPosition");
+        }
+
+        // Stop at stream length for compatibility, even though it might be allowed
+        // to seek past end of stream
+        int available = available();
+        if (available > 0) {
+            seek(Math.min(wantedPosition, pos + available));
+        }
+        // TODO: Add optimization for streams with known length!
+        else {
+            // Slow mode...
+            int toSkip = (int) Math.max(Math.min(pLength, 512), -512);
+            while (toSkip > 0 && read() >= 0) {
+                toSkip--;
+            }
+        }
+
+        return position - pos;
+    }
+
+    @Override
+    public final void mark(int pLimit) {
+        mark();
+
+        // TODO: We don't really need to do this.. Is it a good idea?
+        try {
+            flushBefore(Math.max(position - pLimit, flushedPosition));
+        }
+        catch (IOException ignore) {
+            // Ignore, as it's not really critical
+        }
+    }
+
+    /**
+     * Returns {@code true}, as marking is always supported.
+     *
+     * @return {@code true}.
+     */
+    @Override
+    public final boolean markSupported() {
+        return true;
+    }
+
+    /// Seekable implementation
+    public final void seek(long pPosition) throws IOException {
+        checkOpen();
+
+        // NOTE: This is correct according to javax.imageio (IndexOutOfBoundsException),
+        // but it's kind of inconsistent with reset that throws IOException...
+        if (pPosition < flushedPosition) {
+           throw new IndexOutOfBoundsException("position < flushedPosition");
+        }
+
+        seekImpl(pPosition);
+        position = pPosition;
+    }
+
+    protected abstract void seekImpl(long pPosition) throws IOException;
+
+    public final void mark() {
+        markedPositions.push(position);
+    }
+
+    @Override
+    public final void reset() throws IOException {
+        checkOpen();
+        if (!markedPositions.isEmpty()) {
+            long newPos = markedPositions.pop();
+
+            // NOTE: This is correct according to javax.imageio (IOException),
+            // but it's kind of inconsistent with seek that throws IndexOutOfBoundsException...
+            if (newPos < flushedPosition) {
+                throw new IOException("Previous marked position has been discarded");
+            }
+
+            seek(newPos);
+        }
+        else {
+            // TODO: To iron out some wrinkles due to conflicting contracts
+            // (InputStream and Seekable both declare reset),
+            // we might need to reset to the last marked position instead..
+            // However, that becomes REALLY confusing if that position is after
+            // the current position...
+            seek(0);
+        }
+    }
+
+    public final void flushBefore(long pPosition) throws IOException {
+        if (pPosition < flushedPosition) {
+            throw new IndexOutOfBoundsException("position < flushedPosition");
+        }
+        if (pPosition > getStreamPosition()) {
+            throw new IndexOutOfBoundsException("position > stream position");
+        }
+        checkOpen();
+        flushBeforeImpl(pPosition);
+        flushedPosition = pPosition;
+    }
+
+    /**
+     * Discards the initial portion of the stream prior to the indicated postion.
+     *
+     * @param pPosition the position to flush to
+     * @throws IOException if an I/O exception occurs during the flush operation
+     *
+     * @see #flushBefore(long)
+     */
+    protected abstract void flushBeforeImpl(long pPosition) throws IOException;
+
+    public final void flush() throws IOException {
+        flushBefore(flushedPosition);
+    }
+
+    public final long getFlushedPosition() throws IOException {
+        checkOpen();
+        return flushedPosition;
+    }
+
+    public final long getStreamPosition() throws IOException {
+        checkOpen();
+        return position;
+    }
+
+    protected final void checkOpen() throws IOException {
+        if (closed) {
+            throw new IOException("closed");
+        }
+    }
+
+    @Override
+    public final void close() throws IOException {
+        checkOpen();
+        closed = true;
+        closeImpl();
+    }
+
+    protected abstract void closeImpl() throws IOException;
+
+    /**
+     * Finalizes this object prior to garbage collection.  The
+     * {@code close} method is called to close any open input
+     * source.  This method should not be called from application
+     * code.
+     *
+     * @exception Throwable if an error occurs during superclass
+     * finalization.
+     */
+    @Override
+    protected void finalize() throws Throwable {
+        if (!closed) {
+            try {
+                close();
+            }
+            catch (IOException ignore) {
+                // Ignroe
+            }
+        }
+        super.finalize();
+    }
+}
@@ -1,140 +1,140 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Stack;
-
-/**
- * Abstract base class for {@code OutputStream}s implementing the
- * {@code Seekable} interface.
- * <p/>
- * @see SeekableInputStream
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SeekableOutputStream.java#2 $
- */
-public abstract class SeekableOutputStream extends OutputStream implements Seekable {
-    // TODO: Implement
-    long position;
-    long flushedPosition;
-    boolean closed;
-
-    protected Stack<Long> markedPositions = new Stack<Long>();
-
-    /// Outputstream overrides
-    @Override
-    public final void write(byte pBytes[]) throws IOException {
-        write(pBytes, 0, pBytes != null ? pBytes.length : 1);
-    }
-
-    /// Seekable implementation
-    // TODO: This is common behaviour/implementation with SeekableInputStream,
-    // probably a good idea to extract a delegate..?
-    public final void seek(long pPosition) throws IOException {
-        checkOpen();
-
-        // TODO: This is correct according to javax.imageio (IndexOutOfBoundsException),
-        // but it's inconsistent with reset that throws IOException...
-        if (pPosition < flushedPosition) {
-            throw new IndexOutOfBoundsException("position < flushedPosition!");
-        }
-
-        seekImpl(pPosition);
-        position = pPosition;
-    }
-
-    protected abstract void seekImpl(long pPosition) throws IOException;
-
-    public final void mark() {
-        markedPositions.push(position);
-    }
-
-    public final void reset() throws IOException {
-        checkOpen();
-        if (!markedPositions.isEmpty()) {
-            long newPos = markedPositions.pop();
-
-            // TODO: This is correct according to javax.imageio (IOException),
-            // but it's inconsistent with seek that throws IndexOutOfBoundsException...
-            if (newPos < flushedPosition) {
-                throw new IOException("Previous marked position has been discarded!");
-            }
-
-            seek(newPos);
-        }
-    }
-
-    public final void flushBefore(long pPosition) throws IOException {
-        if (pPosition < flushedPosition) {
-            throw new IndexOutOfBoundsException("position < flushedPosition!");
-        }
-        if (pPosition > getStreamPosition()) {
-            throw new IndexOutOfBoundsException("position > getStreamPosition()!");
-        }
-        checkOpen();
-        flushBeforeImpl(pPosition);
-        flushedPosition = pPosition;
-    }
-
-    protected abstract void flushBeforeImpl(long pPosition) throws IOException;
-
-    @Override
-    public final void flush() throws IOException {
-        flushBefore(flushedPosition);
-    }
-
-    public final long getFlushedPosition() throws IOException {
-        checkOpen();
-        return flushedPosition;
-    }
-
-    public final long getStreamPosition() throws IOException {
-        checkOpen();
-        return position;
-    }
-
-    protected final void checkOpen() throws IOException {
-        if (closed) {
-            throw new IOException("closed");
-        }
-    }
-
-    @Override
-    public final void close() throws IOException {
-        checkOpen();
-        closed = true;
-        closeImpl();
-    }
-
-    protected abstract void closeImpl() throws IOException;
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Stack;
+
+/**
+ * Abstract base class for {@code OutputStream}s implementing the
+ * {@code Seekable} interface.
+ *
+ * @see SeekableInputStream
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SeekableOutputStream.java#2 $
+ */
+public abstract class SeekableOutputStream extends OutputStream implements Seekable {
+    // TODO: Implement
+    long position;
+    long flushedPosition;
+    boolean closed;
+
+    protected Stack<Long> markedPositions = new Stack<Long>();
+
+    /// Outputstream overrides
+    @Override
+    public final void write(byte pBytes[]) throws IOException {
+        write(pBytes, 0, pBytes != null ? pBytes.length : 1);
+    }
+
+    /// Seekable implementation
+    // TODO: This is common behaviour/implementation with SeekableInputStream,
+    // probably a good idea to extract a delegate..?
+    public final void seek(long pPosition) throws IOException {
+        checkOpen();
+
+        // TODO: This is correct according to javax.imageio (IndexOutOfBoundsException),
+        // but it's inconsistent with reset that throws IOException...
+        if (pPosition < flushedPosition) {
+            throw new IndexOutOfBoundsException("position < flushedPosition!");
+        }
+
+        seekImpl(pPosition);
+        position = pPosition;
+    }
+
+    protected abstract void seekImpl(long pPosition) throws IOException;
+
+    public final void mark() {
+        markedPositions.push(position);
+    }
+
+    public final void reset() throws IOException {
+        checkOpen();
+        if (!markedPositions.isEmpty()) {
+            long newPos = markedPositions.pop();
+
+            // TODO: This is correct according to javax.imageio (IOException),
+            // but it's inconsistent with seek that throws IndexOutOfBoundsException...
+            if (newPos < flushedPosition) {
+                throw new IOException("Previous marked position has been discarded!");
+            }
+
+            seek(newPos);
+        }
+    }
+
+    public final void flushBefore(long pPosition) throws IOException {
+        if (pPosition < flushedPosition) {
+            throw new IndexOutOfBoundsException("position < flushedPosition!");
+        }
+        if (pPosition > getStreamPosition()) {
+            throw new IndexOutOfBoundsException("position > getStreamPosition()!");
+        }
+        checkOpen();
+        flushBeforeImpl(pPosition);
+        flushedPosition = pPosition;
+    }
+
+    protected abstract void flushBeforeImpl(long pPosition) throws IOException;
+
+    @Override
+    public final void flush() throws IOException {
+        flushBefore(flushedPosition);
+    }
+
+    public final long getFlushedPosition() throws IOException {
+        checkOpen();
+        return flushedPosition;
+    }
+
+    public final long getStreamPosition() throws IOException {
+        checkOpen();
+        return position;
+    }
+
+    protected final void checkOpen() throws IOException {
+        if (closed) {
+            throw new IOException("closed");
+        }
+    }
+
+    @Override
+    public final void close() throws IOException {
+        checkOpen();
+        closed = true;
+        closeImpl();
+    }
+
+    protected abstract void closeImpl() throws IOException;
+}
@@ -1,189 +1,188 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import com.twelvemonkeys.lang.Validate;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
-/**
- * StringArrayReader
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haku $
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/StringArrayReader.java#2 $
- */
-public class StringArrayReader extends StringReader {
-
-    private StringReader current;
-    private String[] strings;
-    protected final Object finalLock;
-    private int currentSting;
-    private int markedString;
-    private int mark;
-    private int next;
-
-    /**
-     * Create a new string array reader.
-     *
-     * @param pStrings {@code String}s providing the character stream.
-     */
-    public StringArrayReader(final String[] pStrings) {
-        super("");
-
-        Validate.notNull(pStrings, "strings");
-
-        finalLock = lock = pStrings; // NOTE: It's ok to sync on pStrings, as the
-                                 // reference can't change, only it's elements
-
-        strings = pStrings.clone(); // Defensive copy for content
-        nextReader();
-    }
-
-    protected final Reader nextReader() {
-        if (currentSting >= strings.length) {
-            current = new EmptyReader();
-        }
-        else {
-            current = new StringReader(strings[currentSting++]);
-        }
-
-        // NOTE: Reset next for every reader, and record marked reader in mark/reset methods!
-        next = 0;
-        
-        return current;
-    }
-
-    /**
-     * Check to make sure that the stream has not been closed
-     *
-     * @throws IOException if the stream is closed
-     */
-    protected final void ensureOpen() throws IOException {
-        if (strings == null) {
-            throw new IOException("Stream closed");
-        }
-    }
-
-    public void close() {
-        super.close();
-        strings = null;
-        current.close();
-    }
-
-    public void mark(int pReadLimit) throws IOException {
-        if (pReadLimit < 0){
-            throw new IllegalArgumentException("Read limit < 0");
-        }
-
-        synchronized (finalLock) {
-            ensureOpen();
-            mark = next;
-            markedString = currentSting;
-
-            current.mark(pReadLimit);
-        }
-    }
-
-    public void reset() throws IOException {
-        synchronized (finalLock) {
-            ensureOpen();
-
-            if (currentSting != markedString) {
-                currentSting = markedString - 1;
-                nextReader();
-                current.skip(mark);
-            }
-            else {
-                current.reset();
-            }
-
-            next = mark;
-        }
-    }
-
-    public boolean markSupported() {
-        return true;
-    }
-
-    public int read() throws IOException {
-        synchronized (finalLock) {
-            int read = current.read();
-
-            if (read < 0 && currentSting < strings.length) {
-                nextReader();
-                return read(); // In case of empty strings
-            }
-
-            next++;
-
-            return read;
-        }
-    }
-
-    public int read(char pBuffer[], int pOffset, int pLength) throws IOException {
-        synchronized (finalLock) {
-            int read = current.read(pBuffer, pOffset, pLength);
-
-            if (read < 0 && currentSting < strings.length) {
-                nextReader();
-                return read(pBuffer, pOffset, pLength); // In case of empty strings
-            }
-
-            next += read;
-
-            return read;
-        }
-    }
-
-    public boolean ready() throws IOException {
-        return current.ready();
-    }
-
-    public long skip(long pChars) throws IOException {
-        synchronized (finalLock) {
-            long skipped = current.skip(pChars);
-
-            if (skipped == 0 && currentSting < strings.length) {
-                nextReader();
-                return skip(pChars);
-            }
-
-            next += skipped;
-
-            return skipped;
-        }
-    }
-
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import com.twelvemonkeys.lang.Validate;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+
+/**
+ * StringArrayReader
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haku $
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/StringArrayReader.java#2 $
+ */
+public class StringArrayReader extends StringReader {
+
+    private StringReader current;
+    private String[] strings;
+    protected final Object finalLock;
+    private int currentSting;
+    private int markedString;
+    private int mark;
+    private int next;
+
+    /**
+     * Create a new string array reader.
+     *
+     * @param pStrings {@code String}s providing the character stream.
+     */
+    public StringArrayReader(final String[] pStrings) {
+        super("");
+
+        Validate.notNull(pStrings, "strings");
+
+        finalLock = lock = pStrings; // NOTE: It's ok to sync on pStrings, as the
+                                 // reference can't change, only it's elements
+
+        strings = pStrings.clone(); // Defensive copy for content
+        nextReader();
+    }
+
+    protected final Reader nextReader() {
+        if (currentSting >= strings.length) {
+            current = new EmptyReader();
+        }
+        else {
+            current = new StringReader(strings[currentSting++]);
+        }
+
+        // NOTE: Reset next for every reader, and record marked reader in mark/reset methods!
+        next = 0;
+        
+        return current;
+    }
+
+    /**
+     * Check to make sure that the stream has not been closed
+     *
+     * @throws IOException if the stream is closed
+     */
+    protected final void ensureOpen() throws IOException {
+        if (strings == null) {
+            throw new IOException("Stream closed");
+        }
+    }
+
+    public void close() {
+        super.close();
+        strings = null;
+        current.close();
+    }
+
+    public void mark(int pReadLimit) throws IOException {
+        if (pReadLimit < 0){
+            throw new IllegalArgumentException("Read limit < 0");
+        }
+
+        synchronized (finalLock) {
+            ensureOpen();
+            mark = next;
+            markedString = currentSting;
+
+            current.mark(pReadLimit);
+        }
+    }
+
+    public void reset() throws IOException {
+        synchronized (finalLock) {
+            ensureOpen();
+
+            if (currentSting != markedString) {
+                currentSting = markedString - 1;
+                nextReader();
+                current.skip(mark);
+            }
+            else {
+                current.reset();
+            }
+
+            next = mark;
+        }
+    }
+
+    public boolean markSupported() {
+        return true;
+    }
+
+    public int read() throws IOException {
+        synchronized (finalLock) {
+            int read = current.read();
+
+            if (read < 0 && currentSting < strings.length) {
+                nextReader();
+                return read(); // In case of empty strings
+            }
+
+            next++;
+
+            return read;
+        }
+    }
+
+    public int read(char pBuffer[], int pOffset, int pLength) throws IOException {
+        synchronized (finalLock) {
+            int read = current.read(pBuffer, pOffset, pLength);
+
+            if (read < 0 && currentSting < strings.length) {
+                nextReader();
+                return read(pBuffer, pOffset, pLength); // In case of empty strings
+            }
+
+            next += read;
+
+            return read;
+        }
+    }
+
+    public boolean ready() throws IOException {
+        return current.ready();
+    }
+
+    public long skip(long pChars) throws IOException {
+        synchronized (finalLock) {
+            long skipped = current.skip(pChars);
+
+            if (skipped == 0 && currentSting < strings.length) {
+                nextReader();
+                return skip(pChars);
+            }
+
+            next += skipped;
+
+            return skipped;
+        }
+    }
+
+}
@@ -1,137 +1,136 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import com.twelvemonkeys.lang.Validate;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * An {@code InputStream} reading up to a specified number of bytes from an
- * underlying stream.
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SubStream.java#2 $
- */
-public final class SubStream extends FilterInputStream {
-    private long bytesLeft;
-    private int markLimit;
-
-    /**
-     * Creates a {@code SubStream} of the given {@code pStream}.
-     *
-     * @param pStream the underlying input stream
-     * @param pLength maximum number of bytes to read drom this stream
-     */
-    public SubStream(final InputStream pStream, final long pLength) {
-        super(Validate.notNull(pStream, "stream"));
-        bytesLeft = pLength;
-    }
-
-    /**
-     * Marks this stream as closed.
-     * This implementation does <em>not</em> close the underlying stream.
-     */
-    @Override
-    public void close() throws IOException {
-        // NOTE: Do not close the underlying stream
-        while (bytesLeft > 0) {
-            //noinspection ResultOfMethodCallIgnored
-            skip(bytesLeft);
-        }
-    }
-
-    @Override
-    public int available() throws IOException {
-        return (int) Math.min(super.available(), bytesLeft);
-    }
-
-    @Override
-    public void mark(int pReadLimit) {
-        super.mark(pReadLimit);// This either succeeds or does nothing...
-        markLimit = pReadLimit;
-    }
-
-    @Override
-    public void reset() throws IOException {
-        super.reset();// This either succeeds or throws IOException
-        bytesLeft += markLimit;
-    }
-
-    @Override
-    public int read() throws IOException {
-        if (bytesLeft-- <= 0) {
-            return -1;
-        }
-        return super.read();
-    }
-
-    @Override
-    public final int read(byte[] pBytes) throws IOException {
-        return read(pBytes, 0, pBytes.length);
-    }
-
-    @Override
-    public int read(final byte[] pBytes, final int pOffset, final int pLength) throws IOException {
-        if (bytesLeft <= 0) {
-            return -1;
-        }
-
-        int read = super.read(pBytes, pOffset, (int) findMaxLen(pLength));
-        bytesLeft = read < 0 ? 0 : bytesLeft - read;
-        return read;
-    }
-
-    /**
-     * Finds the maximum number of bytes we can read or skip, from this stream.
-     *
-     * @param pLength the requested length
-     * @return the maximum number of bytes to read
-     */
-    private long findMaxLen(long pLength) {
-        if (bytesLeft < pLength) {
-            return (int) Math.max(bytesLeft, 0);
-        }
-        else {
-            return pLength;
-        }
-    }
-
-    @Override
-    public long skip(long pLength) throws IOException {
-        long skipped = super.skip(findMaxLen(pLength));// Skips 0 or more, never -1
-        bytesLeft -= skipped;
-        return skipped;
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import com.twelvemonkeys.lang.Validate;
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * An {@code InputStream} reading up to a specified number of bytes from an
+ * underlying stream.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SubStream.java#2 $
+ */
+public final class SubStream extends FilterInputStream {
+    private long bytesLeft;
+    private int markLimit;
+
+    /**
+     * Creates a {@code SubStream} of the given {@code pStream}.
+     *
+     * @param pStream the underlying input stream
+     * @param pLength maximum number of bytes to read drom this stream
+     */
+    public SubStream(final InputStream pStream, final long pLength) {
+        super(Validate.notNull(pStream, "stream"));
+        bytesLeft = pLength;
+    }
+
+    /**
+     * Marks this stream as closed.
+     * This implementation does <em>not</em> close the underlying stream.
+     */
+    @Override
+    public void close() throws IOException {
+        // NOTE: Do not close the underlying stream
+        while (bytesLeft > 0) {
+            //noinspection ResultOfMethodCallIgnored
+            skip(bytesLeft);
+        }
+    }
+
+    @Override
+    public int available() throws IOException {
+        return (int) Math.min(super.available(), bytesLeft);
+    }
+
+    @Override
+    public void mark(int pReadLimit) {
+        super.mark(pReadLimit);// This either succeeds or does nothing...
+        markLimit = pReadLimit;
+    }
+
+    @Override
+    public void reset() throws IOException {
+        super.reset();// This either succeeds or throws IOException
+        bytesLeft += markLimit;
+    }
+
+    @Override
+    public int read() throws IOException {
+        if (bytesLeft-- <= 0) {
+            return -1;
+        }
+        return super.read();
+    }
+
+    @Override
+    public final int read(byte[] pBytes) throws IOException {
+        return read(pBytes, 0, pBytes.length);
+    }
+
+    @Override
+    public int read(final byte[] pBytes, final int pOffset, final int pLength) throws IOException {
+        if (bytesLeft <= 0) {
+            return -1;
+        }
+
+        int read = super.read(pBytes, pOffset, (int) findMaxLen(pLength));
+        bytesLeft = read < 0 ? 0 : bytesLeft - read;
+        return read;
+    }
+
+    /**
+     * Finds the maximum number of bytes we can read or skip, from this stream.
+     *
+     * @param pLength the requested length
+     * @return the maximum number of bytes to read
+     */
+    private long findMaxLen(long pLength) {
+        if (bytesLeft < pLength) {
+            return (int) Math.max(bytesLeft, 0);
+        }
+        else {
+            return pLength;
+        }
+    }
+
+    @Override
+    public long skip(long pLength) throws IOException {
+        long skipped = super.skip(findMaxLen(pLength));// Skips 0 or more, never -1
+        bytesLeft -= skipped;
+        return skipped;
+    }
+}
@@ -1,107 +1,106 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import com.twelvemonkeys.util.StringTokenIterator;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * UnixFileSystem
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/UnixFileSystem.java#1 $
- */
-final class UnixFileSystem extends FileSystem {
-    long getFreeSpace(File pPath) {
-        try {
-            return getNumber(pPath, 3);
-        }
-        catch (IOException e) {
-            return 0l;
-        }
-    }
-
-    long getTotalSpace(File pPath) {
-        try {
-            return getNumber(pPath, 5);
-        }
-        catch (IOException e) {
-            return 0l;
-        }
-    }
-
-    private long getNumber(File pPath, int pIndex) throws IOException {
-        // TODO: Test on other platforms
-        // Tested on Mac OS X, CygWin
-        BufferedReader reader = exec(new String[] {"df", "-k", pPath.getAbsolutePath()});
-
-        String last = null;
-        String line;
-        try {
-            while ((line = reader.readLine()) != null) {
-                last = line;
-            }
-        }
-        finally {
-            FileUtil.close(reader);
-        }
-
-        if (last != null) {
-            String blocks = null;
-            StringTokenIterator tokens = new StringTokenIterator(last, " ", StringTokenIterator.REVERSE);
-            int count = 0;
-            // We want the 3rd last token
-            while (count < pIndex && tokens.hasNext()) {
-                blocks = tokens.nextToken();
-                count++;
-            }
-
-            if (blocks != null) {
-                try {
-                    return Long.parseLong(blocks) * 1024L;
-                }
-                catch (NumberFormatException ignore) {
-                    // Ignore
-                }
-            }
-        }
-
-        return 0l;
-    }
-
-    String getName() {
-        return "Unix";
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import com.twelvemonkeys.util.StringTokenIterator;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * UnixFileSystem
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/UnixFileSystem.java#1 $
+ */
+final class UnixFileSystem extends FileSystem {
+    long getFreeSpace(File pPath) {
+        try {
+            return getNumber(pPath, 3);
+        }
+        catch (IOException e) {
+            return 0l;
+        }
+    }
+
+    long getTotalSpace(File pPath) {
+        try {
+            return getNumber(pPath, 5);
+        }
+        catch (IOException e) {
+            return 0l;
+        }
+    }
+
+    private long getNumber(File pPath, int pIndex) throws IOException {
+        // TODO: Test on other platforms
+        // Tested on Mac OS X, CygWin
+        BufferedReader reader = exec(new String[] {"df", "-k", pPath.getAbsolutePath()});
+
+        String last = null;
+        String line;
+        try {
+            while ((line = reader.readLine()) != null) {
+                last = line;
+            }
+        }
+        finally {
+            FileUtil.close(reader);
+        }
+
+        if (last != null) {
+            String blocks = null;
+            StringTokenIterator tokens = new StringTokenIterator(last, " ", StringTokenIterator.REVERSE);
+            int count = 0;
+            // We want the 3rd last token
+            while (count < pIndex && tokens.hasNext()) {
+                blocks = tokens.nextToken();
+                count++;
+            }
+
+            if (blocks != null) {
+                try {
+                    return Long.parseLong(blocks) * 1024L;
+                }
+                catch (NumberFormatException ignore) {
+                    // Ignore
+                }
+            }
+        }
+
+        return 0l;
+    }
+
+    String getName() {
+        return "Unix";
+    }
+}
@@ -1,195 +1,194 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FilenameFilter;
-import java.io.IOException;
-
-/**
- * Win32File
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32File.java#2 $
- */
-final class Win32File extends File {
-    private final static boolean IS_WINDOWS = isWindows();
-
-    private static boolean isWindows() {
-        try {
-            String os = System.getProperty("os.name");
-            return os.toLowerCase().indexOf("windows") >= 0;
-        }
-        catch (Throwable t) {
-            // Ignore
-        }
-        return false;
-    }
-
-    private Win32File(File pPath) {
-        super(pPath.getPath());
-    }
-
-    public static void main(String[] pArgs) {
-        int argIdx = 0;
-        boolean recursive = false;
-        while (pArgs.length > argIdx + 1 && pArgs[argIdx].charAt(0) == '-' && pArgs[argIdx].length() > 1) {
-            if (pArgs[argIdx].charAt(1) == 'R' || pArgs[argIdx].equals("--recursive")) {
-                recursive = true;
-            }
-            else {
-                System.err.println("Unknown option: " + pArgs[argIdx]);
-            }
-            argIdx++;
-        }
-
-        File file = wrap(new File(pArgs[argIdx]));
-        System.out.println("file: " + file);
-        System.out.println("file.getClass(): " + file.getClass());
-
-        listFiles(file, 0, recursive);
-    }
-
-    private static void listFiles(File pFile, int pLevel, boolean pRecursive) {
-        if (pFile.isDirectory()) {
-            File[] files = pFile.listFiles();
-            for (int l = 0; l < pLevel; l++) {
-                System.out.print(" ");
-            }
-            System.out.println("Contents of " + pFile + ": ");
-            for (File file : files) {
-                for (int l = 0; l < pLevel; l++) {
-                    System.out.print(" ");
-                }
-                System.out.println("  " + file);
-                if (pRecursive) {
-                    listFiles(file, pLevel + 1, pLevel < 4);
-                }
-            }
-        }
-    }
-
-    /**
-     * Wraps a {@code File} object pointing to a Windows symbolic link
-     * ({@code .lnk} file) in a {@code Win32Lnk}.
-     * If the operating system is not Windows, the
-     * {@code pPath} parameter is returned unwrapped.
-     *
-     * @param pPath any path, possibly pointing to a Windows symbolic link file.
-     * May be {@code null}, in which case {@code null} is returned.
-     *
-     * @return a new {@code Win32Lnk} object if the current os is Windows, and
-     * the file is a Windows symbolic link ({@code .lnk} file), otherwise
-     * {@code pPath}
-     */
-    public static File wrap(final File pPath) {
-        if (pPath == null) {
-            return null;
-        }
-
-        if (IS_WINDOWS) {
-            // Don't wrap if allready wrapped
-            if (pPath instanceof Win32File || pPath instanceof Win32Lnk) {
-                return pPath;
-            }
-
-            if (pPath.exists() && pPath.getName().endsWith(".lnk")) {
-                // If Win32 .lnk, let's wrap
-                try {
-                    return new Win32Lnk(pPath);
-                }
-                catch (IOException e) {
-                    // TODO: FixMe!
-                    e.printStackTrace();
-                }
-            }
-
-            // Wwrap even if not a .lnk, as the listFiles() methods etc,
-            // could potentially return .lnk's, that we want to wrap later...
-            return new Win32File(pPath);
-        }
-
-        return pPath;
-    }
-
-    /**
-     * Wraps a {@code File} array, possibly pointing to Windows symbolic links
-     * ({@code .lnk} files) in {@code Win32Lnk}s.
-     *
-     * @param pPaths an array of {@code File}s, possibly pointing to Windows
-     * symbolic link files.
-     * May be {@code null}, in which case {@code null} is returned.
-     *
-     * @return {@code pPaths}, with any {@code File} representing a Windows
-     * symbolic link ({@code .lnk} file) wrapped in a {@code Win32Lnk}.
-     */
-    public static File[] wrap(File[] pPaths) {
-        if (IS_WINDOWS) {
-            for (int i = 0; pPaths != null && i < pPaths.length; i++) {
-                pPaths[i] = wrap(pPaths[i]);
-            }
-        }
-        return pPaths;
-    }
-
-    // File overrides
-    @Override
-    public File getAbsoluteFile() {
-        return wrap(super.getAbsoluteFile());
-    }
-
-    @Override
-    public File getCanonicalFile() throws IOException {
-        return wrap(super.getCanonicalFile());
-    }
-
-    @Override
-    public File getParentFile() {
-        return wrap(super.getParentFile());
-    }
-
-    @Override
-    public File[] listFiles() {
-        return wrap(super.listFiles());
-    }
-
-    @Override
-    public File[] listFiles(FileFilter filter) {
-        return wrap(super.listFiles(filter));
-    }
-
-    @Override
-    public File[] listFiles(FilenameFilter filter) {
-        return wrap(super.listFiles(filter));
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+
+/**
+ * Win32File
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32File.java#2 $
+ */
+final class Win32File extends File {
+    private final static boolean IS_WINDOWS = isWindows();
+
+    private static boolean isWindows() {
+        try {
+            String os = System.getProperty("os.name");
+            return os.toLowerCase().indexOf("windows") >= 0;
+        }
+        catch (Throwable t) {
+            // Ignore
+        }
+        return false;
+    }
+
+    private Win32File(File pPath) {
+        super(pPath.getPath());
+    }
+
+    public static void main(String[] pArgs) {
+        int argIdx = 0;
+        boolean recursive = false;
+        while (pArgs.length > argIdx + 1 && pArgs[argIdx].charAt(0) == '-' && pArgs[argIdx].length() > 1) {
+            if (pArgs[argIdx].charAt(1) == 'R' || pArgs[argIdx].equals("--recursive")) {
+                recursive = true;
+            }
+            else {
+                System.err.println("Unknown option: " + pArgs[argIdx]);
+            }
+            argIdx++;
+        }
+
+        File file = wrap(new File(pArgs[argIdx]));
+        System.out.println("file: " + file);
+        System.out.println("file.getClass(): " + file.getClass());
+
+        listFiles(file, 0, recursive);
+    }
+
+    private static void listFiles(File pFile, int pLevel, boolean pRecursive) {
+        if (pFile.isDirectory()) {
+            File[] files = pFile.listFiles();
+            for (int l = 0; l < pLevel; l++) {
+                System.out.print(" ");
+            }
+            System.out.println("Contents of " + pFile + ": ");
+            for (File file : files) {
+                for (int l = 0; l < pLevel; l++) {
+                    System.out.print(" ");
+                }
+                System.out.println("  " + file);
+                if (pRecursive) {
+                    listFiles(file, pLevel + 1, pLevel < 4);
+                }
+            }
+        }
+    }
+
+    /**
+     * Wraps a {@code File} object pointing to a Windows symbolic link
+     * ({@code .lnk} file) in a {@code Win32Lnk}.
+     * If the operating system is not Windows, the
+     * {@code pPath} parameter is returned unwrapped.
+     *
+     * @param pPath any path, possibly pointing to a Windows symbolic link file.
+     * May be {@code null}, in which case {@code null} is returned.
+     *
+     * @return a new {@code Win32Lnk} object if the current os is Windows, and
+     * the file is a Windows symbolic link ({@code .lnk} file), otherwise
+     * {@code pPath}
+     */
+    public static File wrap(final File pPath) {
+        if (pPath == null) {
+            return null;
+        }
+
+        if (IS_WINDOWS) {
+            // Don't wrap if allready wrapped
+            if (pPath instanceof Win32File || pPath instanceof Win32Lnk) {
+                return pPath;
+            }
+
+            if (pPath.exists() && pPath.getName().endsWith(".lnk")) {
+                // If Win32 .lnk, let's wrap
+                try {
+                    return new Win32Lnk(pPath);
+                }
+                catch (IOException e) {
+                    // TODO: FixMe!
+                    e.printStackTrace();
+                }
+            }
+
+            // Wwrap even if not a .lnk, as the listFiles() methods etc,
+            // could potentially return .lnk's, that we want to wrap later...
+            return new Win32File(pPath);
+        }
+
+        return pPath;
+    }
+
+    /**
+     * Wraps a {@code File} array, possibly pointing to Windows symbolic links
+     * ({@code .lnk} files) in {@code Win32Lnk}s.
+     *
+     * @param pPaths an array of {@code File}s, possibly pointing to Windows
+     * symbolic link files.
+     * May be {@code null}, in which case {@code null} is returned.
+     *
+     * @return {@code pPaths}, with any {@code File} representing a Windows
+     * symbolic link ({@code .lnk} file) wrapped in a {@code Win32Lnk}.
+     */
+    public static File[] wrap(File[] pPaths) {
+        if (IS_WINDOWS) {
+            for (int i = 0; pPaths != null && i < pPaths.length; i++) {
+                pPaths[i] = wrap(pPaths[i]);
+            }
+        }
+        return pPaths;
+    }
+
+    // File overrides
+    @Override
+    public File getAbsoluteFile() {
+        return wrap(super.getAbsoluteFile());
+    }
+
+    @Override
+    public File getCanonicalFile() throws IOException {
+        return wrap(super.getCanonicalFile());
+    }
+
+    @Override
+    public File getParentFile() {
+        return wrap(super.getParentFile());
+    }
+
+    @Override
+    public File[] listFiles() {
+        return wrap(super.listFiles());
+    }
+
+    @Override
+    public File[] listFiles(FileFilter filter) {
+        return wrap(super.listFiles(filter));
+    }
+
+    @Override
+    public File[] listFiles(FilenameFilter filter) {
+        return wrap(super.listFiles(filter));
+    }
+}
@@ -1,92 +1,91 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * WindowsFileSystem
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32FileSystem.java#2 $
- */
-final class Win32FileSystem extends FileSystem {
-    public long getFreeSpace(File pPath) {
-        try {
-            // Windows version
-            // TODO: Test on W2K/95/98/etc... (tested on XP)
-            BufferedReader reader = exec(new String[] {"CMD.EXE", "/C", "DIR", "/-C", pPath.getAbsolutePath()});
-
-            String last = null;
-            String line;
-            try {
-                while ((line = reader.readLine()) != null) {
-                    last = line;
-                }
-            }
-            finally {
-                FileUtil.close(reader);
-            }
-
-            if (last != null) {
-                int end = last.lastIndexOf(" bytes free");
-                int start = last.lastIndexOf(' ', end - 1);
-
-                if (start >= 0 && end >= 0) {
-                    try {
-                        return Long.parseLong(last.substring(start + 1, end));
-                    }
-                    catch (NumberFormatException ignore) {
-                        // Ignore
-                    }
-                }
-            }
-        }
-        catch (IOException ignore) {
-            // Ignore
-        }
-
-        return 0l;
-    }
-
-    long getTotalSpace(File pPath) {
-        // TODO: Implement, probably need some JNI stuff...
-        // Distribute df.exe and execute from temp!? ;-)
-        return getFreeSpace(pPath);
-    }
-
-    String getName() {
-        return "Win32";
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * WindowsFileSystem
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32FileSystem.java#2 $
+ */
+final class Win32FileSystem extends FileSystem {
+    public long getFreeSpace(File pPath) {
+        try {
+            // Windows version
+            // TODO: Test on W2K/95/98/etc... (tested on XP)
+            BufferedReader reader = exec(new String[] {"CMD.EXE", "/C", "DIR", "/-C", pPath.getAbsolutePath()});
+
+            String last = null;
+            String line;
+            try {
+                while ((line = reader.readLine()) != null) {
+                    last = line;
+                }
+            }
+            finally {
+                FileUtil.close(reader);
+            }
+
+            if (last != null) {
+                int end = last.lastIndexOf(" bytes free");
+                int start = last.lastIndexOf(' ', end - 1);
+
+                if (start >= 0 && end >= 0) {
+                    try {
+                        return Long.parseLong(last.substring(start + 1, end));
+                    }
+                    catch (NumberFormatException ignore) {
+                        // Ignore
+                    }
+                }
+            }
+        }
+        catch (IOException ignore) {
+            // Ignore
+        }
+
+        return 0l;
+    }
+
+    long getTotalSpace(File pPath) {
+        // TODO: Implement, probably need some JNI stuff...
+        // Distribute df.exe and execute from temp!? ;-)
+        return getFreeSpace(pPath);
+    }
+
+    String getName() {
+        return "Win32";
+    }
+}
@@ -1,475 +1,477 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import java.io.*;
-import java.util.Arrays;
-
-/**
- * A {@code File} implementation that resolves the Windows {@code .lnk} files as symbolic links.
- * <p/>
- * This class is based on example code from
- * <a href="http://www.oreilly.com/catalog/swinghks/index.html">Swing Hacks</a>,
- * By Joshua Marinacci, Chris Adamson (O'Reilly, ISBN: 0-596-00907-0), Hack 30.
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32Lnk.java#2 $
- */
-final class Win32Lnk extends File {
-    private final static byte[] LNK_MAGIC = {
-            'L', 0x00, 0x00, 0x00, // Magic
-    };
-    private final static byte[] LNK_GUID = {
-            0x01, 0x14, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, // Shell Link GUID
-            (byte) 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 'F'
-    };
-
-    private final File target;
-
-    private static final int FLAG_ITEM_ID_LIST = 0x01;
-    private static final int FLAG_FILE_LOC_INFO = 0x02;
-    private static final int FLAG_DESC_STRING = 0x04;
-    private static final int FLAG_REL_PATH_STRING = 0x08;
-    private static final int FLAG_WORKING_DIRECTORY = 0x10;
-    private static final int FLAG_COMMAND_LINE_ARGS = 0x20;
-    private static final int FLAG_ICON_FILENAME = 0x40;
-    private static final int FLAG_ADDITIONAL_INFO = 0x80;
-
-    private Win32Lnk(final String pPath) throws IOException {
-        super(pPath);
-        File target = parse(this);
-        if (target == this) {
-            // NOTE: This is a workaround
-            // target = this causes infinite loops in some methods
-            target = new File(pPath);
-        }
-        this.target = target;
-    }
-
-    Win32Lnk(final File pPath) throws IOException {
-        this(pPath.getPath());
-    }
-
-    /**
-     * Parses a {@code .lnk} file to find the real file.
-     *
-     * @param pPath the path to the {@code .lnk} file
-     * @return a new file object that
-     * @throws java.io.IOException if the {@code .lnk} cannot be parsed
-     */
-    static File parse(final File pPath) throws IOException {
-        if (!pPath.getName().endsWith(".lnk")) {
-            return pPath;
-        }
-
-        File result = pPath;
-
-        LittleEndianDataInputStream in = new LittleEndianDataInputStream(new BufferedInputStream(new FileInputStream(pPath)));
-        try {
-            byte[] magic = new byte[4];
-            in.readFully(magic);
-
-            byte[] guid = new byte[16];
-            in.readFully(guid);
-
-            if (!(Arrays.equals(LNK_MAGIC, magic) && Arrays.equals(LNK_GUID, guid))) {
-                //System.out.println("Not a symlink");
-                // Not a symlink
-                return pPath;
-            }
-
-            // Get the flags
-            int flags = in.readInt();
-            //System.out.println("flags: " + Integer.toBinaryString(flags & 0xff));
-
-            // Get to the file settings
-            /*int attributes = */in.readInt();
-
-            // File attributes
-            // 0 Target is read only.
-            // 1 Target is hidden.
-            // 2 Target is a system file.
-            // 3 Target is a volume label. (Not possible)
-            // 4 Target is a directory.
-            // 5 Target has been modified since last backup. (archive)
-            // 6 Target is encrypted (NTFS EFS)
-            // 7 Target is Normal??
-            // 8 Target is temporary.
-            // 9 Target is a sparse file.
-            // 10 Target has reparse point data.
-            // 11 Target is compressed.
-            // 12 Target is offline.
-            //System.out.println("attributes: " + Integer.toBinaryString(attributes));
-            // NOTE: Cygwin .lnks are not directory links, can't rely on this.. :-/
-
-            in.skipBytes(48); // TODO: Make sense of this data...
-
-            // Skipped data:
-            // long time 1 (creation)
-            // long time 2 (modification)
-            // long time 3 (last access)
-            // int file length
-            // int icon number
-            // int ShowVnd value
-            // int hotkey
-            // int, int - unknown: 0,0
-
-            // If the shell settings are present, skip them
-            if ((flags & FLAG_ITEM_ID_LIST) != 0) {
-                // Shell Item Id List present
-                //System.out.println("Shell Item Id List present");
-                int shellLen = in.readShort(); // Short
-                //System.out.println("shellLen: " + shellLen);
-
-                // TODO: Probably need to parse this data, to determine
-                // Cygwin folders...
-
-                /*
-                int read = 2;
-                int itemLen = in.readShort();
-                while (itemLen > 0) {
-                    System.out.println("--> ITEM: " + itemLen);
-
-                    BufferedReader reader = new BufferedReader(new InputStreamReader(new SubStream(in, itemLen - 2)));
-                    //byte[] itemBytes = new byte[itemLen - 2]; // NOTE: Lenght included
-                    //in.readFully(itemBytes);
-
-                    String item = reader.readLine();
-                    System.out.println("item: \"" + item + "\"");
-
-                    itemLen = in.readShort();
-                    read += itemLen;
-                }
-
-                System.out.println("read: " + read);
-                */
-
-                in.skipBytes(shellLen);
-            }
-
-            if ((flags & FLAG_FILE_LOC_INFO) != 0) {
-                // File Location Info Table present
-                //System.out.println("File Location Info Table present");
-
-                // 0h 1 dword This is the total length of this structure and all following data
-                // 4h 1 dword This is a pointer to first offset after this structure. 1Ch
-                // 8h 1 dword Flags
-                // Ch 1 dword Offset of local volume info
-                // 10h 1 dword Offset of base pathname on local system
-                // 14h 1 dword Offset of network volume info
-                // 18h 1 dword Offset of remaining pathname
-
-                // Flags:
-                // Bit Meaning
-                // 0 Available on a local volume
-                // 1 Available on a network share
-                // TODO: Make sure the path is on a local disk, etc..
-
-                int tableLen = in.readInt(); // Int
-                //System.out.println("tableLen: " + tableLen);
-
-                in.readInt(); // Skip
-
-                int locFlags = in.readInt();
-                //System.out.println("locFlags: " + Integer.toBinaryString(locFlags));
-                if ((locFlags & 0x01) != 0) {
-                    //System.out.println("Available local");
-                }
-                if ((locFlags & 0x02) != 0) {
-                    //System.err.println("Available on network path");
-                }
-
-                // Get the local volume and local system values
-                in.skipBytes(4); // TODO: see above for structure
-
-                int localSysOff = in.readInt();
-                //System.out.println("localSysOff: " + localSysOff);
-                in.skipBytes(localSysOff - 20);  // Relative to start of chunk
-
-                byte[] pathBytes = new byte[tableLen - localSysOff - 1];
-                in.readFully(pathBytes, 0, pathBytes.length);
-                String path = new String(pathBytes, 0, pathBytes.length - 1);
-                /*
-                ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-                byte read;
-                // Read bytes until the null (0) character
-                while (true) {
-                    read = in.readByte();
-                    if (read == 0) {
-                        break;
-                    }
-                    bytes.write(read & 0xff);
-                }
-
-                String path = new String(bytes.toByteArray(), 0, bytes.size());
-                //*/
-
-                // Recurse to end of link chain
-                // TODO: This may cause endless loop if cyclic chain...
-                //System.out.println("path: \"" + path + "\"");
-                try {
-                    result = parse(new File(path));
-                }
-                catch (StackOverflowError e) {
-                    throw new IOException("Cannot resolve cyclic link: " + e.getMessage());
-                }
-            }
-
-            if ((flags & FLAG_DESC_STRING) != 0) {
-                // Description String present, skip it.
-                //System.out.println("Description String present");
-
-                // The string length is the first word which must also be skipped.
-                int descLen = in.readShort();
-                //System.out.println("descLen: " + descLen);
-
-                byte[] descBytes = new byte[descLen];
-                in.readFully(descBytes, 0, descLen);
-
-                //String desc = new String(descBytes, 0, descLen);
-                //System.out.println("desc: " + desc);
-            }
-
-            if ((flags & FLAG_REL_PATH_STRING) != 0) {
-                // Relative Path String present
-                //System.out.println("Relative Path String present");
-
-                // The string length is the first word which must also be skipped.
-                int pathLen = in.readShort();
-                //System.out.println("pathLen: " + pathLen);
-
-                byte[] pathBytes = new byte[pathLen];
-                in.readFully(pathBytes, 0, pathLen);
-
-                String path = new String(pathBytes, 0, pathLen);
-
-                // TODO: This may cause endless loop if cyclic chain...
-                //System.out.println("path: \"" + path + "\"");
-                if (result == pPath) {
-                    try {
-                        result = parse(new File(pPath.getParentFile(), path));
-                    }
-                    catch (StackOverflowError e) {
-                        throw new IOException("Cannot resolve cyclic link: " + e.getMessage());
-                    }
-                }
-            }
-
-            if ((flags & FLAG_WORKING_DIRECTORY) != 0) {
-                //System.out.println("Working Directory present");
-            }
-            if ((flags & FLAG_COMMAND_LINE_ARGS) != 0) {
-                //System.out.println("Command Line Arguments present");
-                // NOTE: This means this .lnk is not a folder, don't follow
-                result = pPath;
-            }
-            if ((flags & FLAG_ICON_FILENAME) != 0) {
-                //System.out.println("Icon Filename present");
-            }
-            if ((flags & FLAG_ADDITIONAL_INFO) != 0) {
-                //System.out.println("Additional Info present");
-            }
-        }
-        finally {
-            in.close();
-        }
-
-        return result;
-    }
-
-    /*
-    private static String getNullDelimitedString(byte[] bytes, int off) {
-        int len = 0;
-        // Count bytes until the null (0) character
-        while (true) {
-            if (bytes[off + len] == 0) {
-                break;
-            }
-            len++;
-        }
-
-        System.err.println("--> " + len);
-
-        return new String(bytes, off, len);
-    }
-    */
-
-    /**
-     * Converts two bytes into a short.
-     * <p/>
-     * NOTE: this is little endian because it's for an
-     * Intel only OS
-     *
-     * @ param bytes
-     * @ param off
-     * @return the bytes as a short.
-     */
-    /*
-    private static int bytes2short(byte[] bytes, int off) {
-        return ((bytes[off + 1] & 0xff) << 8) | (bytes[off] & 0xff);
-    }
-    */
-
-    public File getTarget() {
-        return target;
-    }
-
-    // java.io.File overrides below
-
-    @Override
-    public boolean isDirectory() {
-        return target.isDirectory();
-    }
-
-    @Override
-    public boolean canRead() {
-        return target.canRead();
-    }
-
-    @Override
-    public boolean canWrite() {
-        return target.canWrite();
-    }
-
-    // NOTE: equals is implemented using compareto == 0
-    /*
-    public int compareTo(File pathname) {
-        // TODO: Verify this
-        // Probably not a good idea, as it IS NOT THE SAME file
-        // It's probably better to not override
-        return target.compareTo(pathname);
-    }
-    */
-
-    // Should probably never allow creating a new .lnk
-    // public boolean createNewFile() throws IOException
-
-    // Deletes only the .lnk
-    // public boolean delete() {
-    //public void deleteOnExit() {
-
-    @Override
-    public boolean exists() {
-        return target.exists();
-    }
-
-    // A .lnk may be absolute
-    //public File getAbsoluteFile() {
-    //public String getAbsolutePath() {
-
-    // Theses should be resolved according to the API (for Unix).
-    @Override
-    public File getCanonicalFile() throws IOException {
-        return target.getCanonicalFile();
-    }
-
-    @Override
-    public String getCanonicalPath() throws IOException {
-        return target.getCanonicalPath();
-    }
-
-    //public String getName() {
-
-    // I guess the parent should be the parent of the .lnk, not the target
-    //public String getParent() {
-    //public File getParentFile() {
-
-    // public boolean isAbsolute() {
-    @Override
-    public boolean isFile() {
-        return target.isFile();
-    }
-
-    @Override
-    public boolean isHidden() {
-        return target.isHidden();
-    }
-
-    @Override
-    public long lastModified() {
-        return target.lastModified();
-    }
-
-    @Override
-    public long length() {
-        return target.length();
-    }
-
-    @Override
-    public String[] list() {
-        return target.list();
-    }
-
-    @Override
-    public String[] list(final FilenameFilter filter) {
-        return target.list(filter);
-    }
-
-    @Override
-    public File[] listFiles() {
-        return Win32File.wrap(target.listFiles());
-    }
-
-    @Override
-    public File[] listFiles(final FileFilter filter) {
-        return Win32File.wrap(target.listFiles(filter));
-    }
-
-    @Override
-    public File[] listFiles(final FilenameFilter filter) {
-        return Win32File.wrap(target.listFiles(filter));
-    }
-
-    // Makes no sense, does it?
-    //public boolean mkdir() {
-    //public boolean mkdirs() {
-
-    // Only rename the lnk
-    //public boolean renameTo(File dest) {
-
-    @Override
-    public boolean setLastModified(long time) {
-        return target.setLastModified(time);
-    }
-
-    @Override
-    public boolean setReadOnly() {
-        return target.setReadOnly();
-    }
-
-    @Override
-    public String toString() {
-        if (target.equals(this)) {
-            return super.toString();
-        }
-        return super.toString() + " -> " + target.toString();
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import java.io.*;
+import java.util.Arrays;
+
+/**
+ * A {@code File} implementation that resolves the Windows {@code .lnk} files as symbolic links.
+ * <p>
+ * This class is based on example code from
+ * <a href="http://www.oreilly.com/catalog/swinghks/index.html">Swing Hacks</a>,
+ * By Joshua Marinacci, Chris Adamson (O'Reilly, ISBN: 0-596-00907-0), Hack 30.
+ * </p>
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32Lnk.java#2 $
+ */
+final class Win32Lnk extends File {
+    private final static byte[] LNK_MAGIC = {
+            'L', 0x00, 0x00, 0x00, // Magic
+    };
+    private final static byte[] LNK_GUID = {
+            0x01, 0x14, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, // Shell Link GUID
+            (byte) 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 'F'
+    };
+
+    private final File target;
+
+    private static final int FLAG_ITEM_ID_LIST = 0x01;
+    private static final int FLAG_FILE_LOC_INFO = 0x02;
+    private static final int FLAG_DESC_STRING = 0x04;
+    private static final int FLAG_REL_PATH_STRING = 0x08;
+    private static final int FLAG_WORKING_DIRECTORY = 0x10;
+    private static final int FLAG_COMMAND_LINE_ARGS = 0x20;
+    private static final int FLAG_ICON_FILENAME = 0x40;
+    private static final int FLAG_ADDITIONAL_INFO = 0x80;
+
+    private Win32Lnk(final String pPath) throws IOException {
+        super(pPath);
+        File target = parse(this);
+        if (target == this) {
+            // NOTE: This is a workaround
+            // target = this causes infinite loops in some methods
+            target = new File(pPath);
+        }
+        this.target = target;
+    }
+
+    Win32Lnk(final File pPath) throws IOException {
+        this(pPath.getPath());
+    }
+
+    /**
+     * Parses a {@code .lnk} file to find the real file.
+     *
+     * @param pPath the path to the {@code .lnk} file
+     * @return a new file object that
+     * @throws java.io.IOException if the {@code .lnk} cannot be parsed
+     */
+    static File parse(final File pPath) throws IOException {
+        if (!pPath.getName().endsWith(".lnk")) {
+            return pPath;
+        }
+
+        File result = pPath;
+
+        LittleEndianDataInputStream in = new LittleEndianDataInputStream(new BufferedInputStream(new FileInputStream(pPath)));
+        try {
+            byte[] magic = new byte[4];
+            in.readFully(magic);
+
+            byte[] guid = new byte[16];
+            in.readFully(guid);
+
+            if (!(Arrays.equals(LNK_MAGIC, magic) && Arrays.equals(LNK_GUID, guid))) {
+                //System.out.println("Not a symlink");
+                // Not a symlink
+                return pPath;
+            }
+
+            // Get the flags
+            int flags = in.readInt();
+            //System.out.println("flags: " + Integer.toBinaryString(flags & 0xff));
+
+            // Get to the file settings
+            /*int attributes = */in.readInt();
+
+            // File attributes
+            // 0 Target is read only.
+            // 1 Target is hidden.
+            // 2 Target is a system file.
+            // 3 Target is a volume label. (Not possible)
+            // 4 Target is a directory.
+            // 5 Target has been modified since last backup. (archive)
+            // 6 Target is encrypted (NTFS EFS)
+            // 7 Target is Normal??
+            // 8 Target is temporary.
+            // 9 Target is a sparse file.
+            // 10 Target has reparse point data.
+            // 11 Target is compressed.
+            // 12 Target is offline.
+            //System.out.println("attributes: " + Integer.toBinaryString(attributes));
+            // NOTE: Cygwin .lnks are not directory links, can't rely on this.. :-/
+
+            in.skipBytes(48); // TODO: Make sense of this data...
+
+            // Skipped data:
+            // long time 1 (creation)
+            // long time 2 (modification)
+            // long time 3 (last access)
+            // int file length
+            // int icon number
+            // int ShowVnd value
+            // int hotkey
+            // int, int - unknown: 0,0
+
+            // If the shell settings are present, skip them
+            if ((flags & FLAG_ITEM_ID_LIST) != 0) {
+                // Shell Item Id List present
+                //System.out.println("Shell Item Id List present");
+                int shellLen = in.readShort(); // Short
+                //System.out.println("shellLen: " + shellLen);
+
+                // TODO: Probably need to parse this data, to determine
+                // Cygwin folders...
+
+                /*
+                int read = 2;
+                int itemLen = in.readShort();
+                while (itemLen > 0) {
+                    System.out.println("--> ITEM: " + itemLen);
+
+                    BufferedReader reader = new BufferedReader(new InputStreamReader(new SubStream(in, itemLen - 2)));
+                    //byte[] itemBytes = new byte[itemLen - 2]; // NOTE: Lenght included
+                    //in.readFully(itemBytes);
+
+                    String item = reader.readLine();
+                    System.out.println("item: \"" + item + "\"");
+
+                    itemLen = in.readShort();
+                    read += itemLen;
+                }
+
+                System.out.println("read: " + read);
+                */
+
+                in.skipBytes(shellLen);
+            }
+
+            if ((flags & FLAG_FILE_LOC_INFO) != 0) {
+                // File Location Info Table present
+                //System.out.println("File Location Info Table present");
+
+                // 0h 1 dword This is the total length of this structure and all following data
+                // 4h 1 dword This is a pointer to first offset after this structure. 1Ch
+                // 8h 1 dword Flags
+                // Ch 1 dword Offset of local volume info
+                // 10h 1 dword Offset of base pathname on local system
+                // 14h 1 dword Offset of network volume info
+                // 18h 1 dword Offset of remaining pathname
+
+                // Flags:
+                // Bit Meaning
+                // 0 Available on a local volume
+                // 1 Available on a network share
+                // TODO: Make sure the path is on a local disk, etc..
+
+                int tableLen = in.readInt(); // Int
+                //System.out.println("tableLen: " + tableLen);
+
+                in.readInt(); // Skip
+
+                int locFlags = in.readInt();
+                //System.out.println("locFlags: " + Integer.toBinaryString(locFlags));
+                if ((locFlags & 0x01) != 0) {
+                    //System.out.println("Available local");
+                }
+                if ((locFlags & 0x02) != 0) {
+                    //System.err.println("Available on network path");
+                }
+
+                // Get the local volume and local system values
+                in.skipBytes(4); // TODO: see above for structure
+
+                int localSysOff = in.readInt();
+                //System.out.println("localSysOff: " + localSysOff);
+                in.skipBytes(localSysOff - 20);  // Relative to start of chunk
+
+                byte[] pathBytes = new byte[tableLen - localSysOff - 1];
+                in.readFully(pathBytes, 0, pathBytes.length);
+                String path = new String(pathBytes, 0, pathBytes.length - 1);
+                /*
+                ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+                byte read;
+                // Read bytes until the null (0) character
+                while (true) {
+                    read = in.readByte();
+                    if (read == 0) {
+                        break;
+                    }
+                    bytes.write(read & 0xff);
+                }
+
+                String path = new String(bytes.toByteArray(), 0, bytes.size());
+                //*/
+
+                // Recurse to end of link chain
+                // TODO: This may cause endless loop if cyclic chain...
+                //System.out.println("path: \"" + path + "\"");
+                try {
+                    result = parse(new File(path));
+                }
+                catch (StackOverflowError e) {
+                    throw new IOException("Cannot resolve cyclic link: " + e.getMessage());
+                }
+            }
+
+            if ((flags & FLAG_DESC_STRING) != 0) {
+                // Description String present, skip it.
+                //System.out.println("Description String present");
+
+                // The string length is the first word which must also be skipped.
+                int descLen = in.readShort();
+                //System.out.println("descLen: " + descLen);
+
+                byte[] descBytes = new byte[descLen];
+                in.readFully(descBytes, 0, descLen);
+
+                //String desc = new String(descBytes, 0, descLen);
+                //System.out.println("desc: " + desc);
+            }
+
+            if ((flags & FLAG_REL_PATH_STRING) != 0) {
+                // Relative Path String present
+                //System.out.println("Relative Path String present");
+
+                // The string length is the first word which must also be skipped.
+                int pathLen = in.readShort();
+                //System.out.println("pathLen: " + pathLen);
+
+                byte[] pathBytes = new byte[pathLen];
+                in.readFully(pathBytes, 0, pathLen);
+
+                String path = new String(pathBytes, 0, pathLen);
+
+                // TODO: This may cause endless loop if cyclic chain...
+                //System.out.println("path: \"" + path + "\"");
+                if (result == pPath) {
+                    try {
+                        result = parse(new File(pPath.getParentFile(), path));
+                    }
+                    catch (StackOverflowError e) {
+                        throw new IOException("Cannot resolve cyclic link: " + e.getMessage());
+                    }
+                }
+            }
+
+            if ((flags & FLAG_WORKING_DIRECTORY) != 0) {
+                //System.out.println("Working Directory present");
+            }
+            if ((flags & FLAG_COMMAND_LINE_ARGS) != 0) {
+                //System.out.println("Command Line Arguments present");
+                // NOTE: This means this .lnk is not a folder, don't follow
+                result = pPath;
+            }
+            if ((flags & FLAG_ICON_FILENAME) != 0) {
+                //System.out.println("Icon Filename present");
+            }
+            if ((flags & FLAG_ADDITIONAL_INFO) != 0) {
+                //System.out.println("Additional Info present");
+            }
+        }
+        finally {
+            in.close();
+        }
+
+        return result;
+    }
+
+    /*
+    private static String getNullDelimitedString(byte[] bytes, int off) {
+        int len = 0;
+        // Count bytes until the null (0) character
+        while (true) {
+            if (bytes[off + len] == 0) {
+                break;
+            }
+            len++;
+        }
+
+        System.err.println("--> " + len);
+
+        return new String(bytes, off, len);
+    }
+    */
+
+    /**
+     * Converts two bytes into a short.
+     * <p>
+     * NOTE: this is little endian because it's for an
+     * Intel only OS
+     * </p>
+     *
+     * @ param bytes
+     * @ param off
+     * @return the bytes as a short.
+     */
+    /*
+    private static int bytes2short(byte[] bytes, int off) {
+        return ((bytes[off + 1] & 0xff) << 8) | (bytes[off] & 0xff);
+    }
+    */
+
+    public File getTarget() {
+        return target;
+    }
+
+    // java.io.File overrides below
+
+    @Override
+    public boolean isDirectory() {
+        return target.isDirectory();
+    }
+
+    @Override
+    public boolean canRead() {
+        return target.canRead();
+    }
+
+    @Override
+    public boolean canWrite() {
+        return target.canWrite();
+    }
+
+    // NOTE: equals is implemented using compareto == 0
+    /*
+    public int compareTo(File pathname) {
+        // TODO: Verify this
+        // Probably not a good idea, as it IS NOT THE SAME file
+        // It's probably better to not override
+        return target.compareTo(pathname);
+    }
+    */
+
+    // Should probably never allow creating a new .lnk
+    // public boolean createNewFile() throws IOException
+
+    // Deletes only the .lnk
+    // public boolean delete() {
+    //public void deleteOnExit() {
+
+    @Override
+    public boolean exists() {
+        return target.exists();
+    }
+
+    // A .lnk may be absolute
+    //public File getAbsoluteFile() {
+    //public String getAbsolutePath() {
+
+    // Theses should be resolved according to the API (for Unix).
+    @Override
+    public File getCanonicalFile() throws IOException {
+        return target.getCanonicalFile();
+    }
+
+    @Override
+    public String getCanonicalPath() throws IOException {
+        return target.getCanonicalPath();
+    }
+
+    //public String getName() {
+
+    // I guess the parent should be the parent of the .lnk, not the target
+    //public String getParent() {
+    //public File getParentFile() {
+
+    // public boolean isAbsolute() {
+    @Override
+    public boolean isFile() {
+        return target.isFile();
+    }
+
+    @Override
+    public boolean isHidden() {
+        return target.isHidden();
+    }
+
+    @Override
+    public long lastModified() {
+        return target.lastModified();
+    }
+
+    @Override
+    public long length() {
+        return target.length();
+    }
+
+    @Override
+    public String[] list() {
+        return target.list();
+    }
+
+    @Override
+    public String[] list(final FilenameFilter filter) {
+        return target.list(filter);
+    }
+
+    @Override
+    public File[] listFiles() {
+        return Win32File.wrap(target.listFiles());
+    }
+
+    @Override
+    public File[] listFiles(final FileFilter filter) {
+        return Win32File.wrap(target.listFiles(filter));
+    }
+
+    @Override
+    public File[] listFiles(final FilenameFilter filter) {
+        return Win32File.wrap(target.listFiles(filter));
+    }
+
+    // Makes no sense, does it?
+    //public boolean mkdir() {
+    //public boolean mkdirs() {
+
+    // Only rename the lnk
+    //public boolean renameTo(File dest) {
+
+    @Override
+    public boolean setLastModified(long time) {
+        return target.setLastModified(time);
+    }
+
+    @Override
+    public boolean setReadOnly() {
+        return target.setReadOnly();
+    }
+
+    @Override
+    public String toString() {
+        if (target.equals(this)) {
+            return super.toString();
+        }
+        return super.toString() + " -> " + target.toString();
+    }
+}
@@ -1,239 +1,240 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io;
-
-import com.twelvemonkeys.lang.DateUtil;
-
-import java.io.*;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-
-/**
- * Wraps a {@code Writer} in an {@code OutputStream}.
- * <p/>
- * <em>Instances of this class are not thread-safe.</em>
- * <p/>
- * <em>NOTE: This class is probably not the right way of solving your problem,
- * however it might prove useful in JSPs etc.
- * If possible, it's always better to use the {@code Writer}'s underlying
- * {@code OutputStream}, or wrap it's native backing.
- * </em>
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/WriterOutputStream.java#2 $
- */
-public class WriterOutputStream extends OutputStream {
-    protected Writer writer;
-    final protected Decoder decoder;
-    final ByteArrayOutputStream bufferStream = new FastByteArrayOutputStream(1024);
-
-    private volatile boolean isFlushing = false; // Ugly but critical...
-
-    private static final boolean NIO_AVAILABLE = isNIOAvailable();
-
-    private static boolean isNIOAvailable() {
-        try {
-            Class.forName("java.nio.charset.Charset");
-            return true;
-        }
-        catch (Throwable t) {
-            // Ignore
-        }
-
-        return false;
-    }
-
-    public WriterOutputStream(final Writer pWriter, final String pCharset) {
-        writer = pWriter;
-        decoder = getDecoder(pCharset);
-    }
-
-    public WriterOutputStream(final Writer pWriter) {
-        this(pWriter, null);
-    }
-
-    private static Decoder getDecoder(final String pCharset) {
-        // NOTE: The CharsetDecoder is typically 10-20% faster than
-        // StringDecoder according to my tests
-        // StringEncoder is horribly slow on 1.2 systems, but there's no
-        // alternative...
-        if (NIO_AVAILABLE) {
-            return new CharsetDecoder(pCharset);
-        }
-
-        return new StringDecoder(pCharset);
-    }
-
-    @Override
-    public void close() throws IOException {
-        flush();
-        writer.close();
-        writer = null;
-    }
-
-    @Override
-    public void flush() throws IOException {
-        flushBuffer();
-        writer.flush();
-    }
-
-    @Override
-    public final void write(byte[] pBytes) throws IOException {
-        if (pBytes == null) {
-            throw new NullPointerException("bytes == null");
-        }
-        write(pBytes, 0, pBytes.length);
-    }
-
-    @Override
-    public final void write(byte[] pBytes, int pOffset, int pLength) throws IOException {
-        flushBuffer();
-        decoder.decodeTo(writer, pBytes, pOffset, pLength);
-    }
-
-    @Override
-    public final void write(int pByte)  {
-        // TODO: Is it possible to know if this is a good place in the stream to
-        // flush? It might be in the middle of a multi-byte encoded character..
-        bufferStream.write(pByte);
-    }
-
-    private void flushBuffer() throws IOException {
-        if (!isFlushing && bufferStream.size() > 0) {
-            isFlushing = true;
-            bufferStream.writeTo(this); // NOTE: Avoids cloning buffer array
-            bufferStream.reset();
-            isFlushing = false;
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    public static void main(String[] pArgs) throws IOException {
-        int iterations = 1000000;
-
-        byte[] bytes = "������ klashf lkash ljah lhaaklhghdfgu ksd".getBytes("UTF-8");
-
-        Decoder d;
-        long start;
-        long time;
-        Writer sink = new PrintWriter(new NullOutputStream());
-        StringWriter writer;
-        String str;
-
-        d = new StringDecoder("UTF-8");
-        for (int i = 0; i < 10000; i++) {
-            d.decodeTo(sink, bytes, 0, bytes.length);
-        }
-        start = System.currentTimeMillis();
-        for (int i = 0; i < iterations; i++) {
-            d.decodeTo(sink, bytes, 0, bytes.length);
-        }
-        time = DateUtil.delta(start);
-        System.out.println("StringDecoder");
-        System.out.println("time: " + time);
-
-        writer = new StringWriter();
-        d.decodeTo(writer, bytes, 0, bytes.length);
-        str = writer.toString();
-        System.out.println("str: \"" + str + "\"");
-        System.out.println("chars.length: " + str.length());
-        System.out.println();
-
-        if (NIO_AVAILABLE) {
-            d = new CharsetDecoder("UTF-8");
-            for (int i = 0; i < 10000; i++) {
-                d.decodeTo(sink, bytes, 0, bytes.length);
-            }
-            start = System.currentTimeMillis();
-            for (int i = 0; i < iterations; i++) {
-                d.decodeTo(sink, bytes, 0, bytes.length);
-            }
-            time = DateUtil.delta(start);
-            System.out.println("CharsetDecoder");
-            System.out.println("time: " + time);
-            writer = new StringWriter();
-            d.decodeTo(writer, bytes, 0, bytes.length);
-            str = writer.toString();
-            System.out.println("str: \"" + str + "\"");
-            System.out.println("chars.length: " + str.length());
-            System.out.println();
-        }
-
-        OutputStream os = new WriterOutputStream(new PrintWriter(System.out), "UTF-8");
-        os.write(bytes);
-        os.flush();
-        System.out.println();
-
-        for (byte b : bytes) {
-            os.write(b & 0xff);
-        }
-        os.flush();
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    private static interface Decoder {
-        void decodeTo(Writer pWriter, byte[] pBytes, int pOffset, int pLength) throws IOException;
-    }
-
-    private static final class CharsetDecoder implements Decoder {
-        final Charset mCharset;
-
-        CharsetDecoder(String pCharset) {
-            // Handle null-case, to get default charset
-            String charset = pCharset != null ? pCharset :
-                    System.getProperty("file.encoding", "ISO-8859-1");
-            mCharset = Charset.forName(charset);
-        }
-
-        public void decodeTo(Writer pWriter, byte[] pBytes, int pOffset, int pLength) throws IOException {
-            CharBuffer cb = mCharset.decode(ByteBuffer.wrap(pBytes, pOffset, pLength));
-            pWriter.write(cb.array(), 0, cb.length());
-        }
-    }
-
-    private static final class StringDecoder implements Decoder {
-        final String mCharset;
-
-        StringDecoder(String pCharset) {
-            mCharset = pCharset;
-        }
-
-        public void decodeTo(Writer pWriter, byte[] pBytes, int pOffset, int pLength) throws IOException {
-            String str = mCharset == null ?
-                    new String(pBytes, pOffset, pLength) :
-                    new String(pBytes, pOffset, pLength, mCharset);
-
-            pWriter.write(str);
-        }
-    }
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io;
+
+import com.twelvemonkeys.lang.DateUtil;
+
+import java.io.*;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+
+/**
+ * Wraps a {@code Writer} in an {@code OutputStream}.
+ * <p>
+ * <em>Instances of this class are not thread-safe.</em>
+ * </p>
+ * <p>
+ * <em>NOTE: This class is probably not the right way of solving your problem,
+ * however it might prove useful in JSPs etc.
+ * If possible, it's always better to use the {@code Writer}'s underlying
+ * {@code OutputStream}, or wrap it's native backing.
+ * </em>
+ * </p>
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/WriterOutputStream.java#2 $
+ */
+public class WriterOutputStream extends OutputStream {
+    protected Writer writer;
+    final protected Decoder decoder;
+    final ByteArrayOutputStream bufferStream = new FastByteArrayOutputStream(1024);
+
+    private volatile boolean isFlushing = false; // Ugly but critical...
+
+    private static final boolean NIO_AVAILABLE = isNIOAvailable();
+
+    private static boolean isNIOAvailable() {
+        try {
+            Class.forName("java.nio.charset.Charset");
+            return true;
+        }
+        catch (Throwable t) {
+            // Ignore
+        }
+
+        return false;
+    }
+
+    public WriterOutputStream(final Writer pWriter, final String pCharset) {
+        writer = pWriter;
+        decoder = getDecoder(pCharset);
+    }
+
+    public WriterOutputStream(final Writer pWriter) {
+        this(pWriter, null);
+    }
+
+    private static Decoder getDecoder(final String pCharset) {
+        // NOTE: The CharsetDecoder is typically 10-20% faster than
+        // StringDecoder according to my tests
+        // StringEncoder is horribly slow on 1.2 systems, but there's no
+        // alternative...
+        if (NIO_AVAILABLE) {
+            return new CharsetDecoder(pCharset);
+        }
+
+        return new StringDecoder(pCharset);
+    }
+
+    @Override
+    public void close() throws IOException {
+        flush();
+        writer.close();
+        writer = null;
+    }
+
+    @Override
+    public void flush() throws IOException {
+        flushBuffer();
+        writer.flush();
+    }
+
+    @Override
+    public final void write(byte[] pBytes) throws IOException {
+        if (pBytes == null) {
+            throw new NullPointerException("bytes == null");
+        }
+        write(pBytes, 0, pBytes.length);
+    }
+
+    @Override
+    public final void write(byte[] pBytes, int pOffset, int pLength) throws IOException {
+        flushBuffer();
+        decoder.decodeTo(writer, pBytes, pOffset, pLength);
+    }
+
+    @Override
+    public final void write(int pByte)  {
+        // TODO: Is it possible to know if this is a good place in the stream to
+        // flush? It might be in the middle of a multi-byte encoded character..
+        bufferStream.write(pByte);
+    }
+
+    private void flushBuffer() throws IOException {
+        if (!isFlushing && bufferStream.size() > 0) {
+            isFlushing = true;
+            bufferStream.writeTo(this); // NOTE: Avoids cloning buffer array
+            bufferStream.reset();
+            isFlushing = false;
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    public static void main(String[] pArgs) throws IOException {
+        int iterations = 1000000;
+
+        byte[] bytes = "������ klashf lkash ljah lhaaklhghdfgu ksd".getBytes("UTF-8");
+
+        Decoder d;
+        long start;
+        long time;
+        Writer sink = new PrintWriter(new NullOutputStream());
+        StringWriter writer;
+        String str;
+
+        d = new StringDecoder("UTF-8");
+        for (int i = 0; i < 10000; i++) {
+            d.decodeTo(sink, bytes, 0, bytes.length);
+        }
+        start = System.currentTimeMillis();
+        for (int i = 0; i < iterations; i++) {
+            d.decodeTo(sink, bytes, 0, bytes.length);
+        }
+        time = DateUtil.delta(start);
+        System.out.println("StringDecoder");
+        System.out.println("time: " + time);
+
+        writer = new StringWriter();
+        d.decodeTo(writer, bytes, 0, bytes.length);
+        str = writer.toString();
+        System.out.println("str: \"" + str + "\"");
+        System.out.println("chars.length: " + str.length());
+        System.out.println();
+
+        if (NIO_AVAILABLE) {
+            d = new CharsetDecoder("UTF-8");
+            for (int i = 0; i < 10000; i++) {
+                d.decodeTo(sink, bytes, 0, bytes.length);
+            }
+            start = System.currentTimeMillis();
+            for (int i = 0; i < iterations; i++) {
+                d.decodeTo(sink, bytes, 0, bytes.length);
+            }
+            time = DateUtil.delta(start);
+            System.out.println("CharsetDecoder");
+            System.out.println("time: " + time);
+            writer = new StringWriter();
+            d.decodeTo(writer, bytes, 0, bytes.length);
+            str = writer.toString();
+            System.out.println("str: \"" + str + "\"");
+            System.out.println("chars.length: " + str.length());
+            System.out.println();
+        }
+
+        OutputStream os = new WriterOutputStream(new PrintWriter(System.out), "UTF-8");
+        os.write(bytes);
+        os.flush();
+        System.out.println();
+
+        for (byte b : bytes) {
+            os.write(b & 0xff);
+        }
+        os.flush();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    private static interface Decoder {
+        void decodeTo(Writer pWriter, byte[] pBytes, int pOffset, int pLength) throws IOException;
+    }
+
+    private static final class CharsetDecoder implements Decoder {
+        final Charset mCharset;
+
+        CharsetDecoder(String pCharset) {
+            // Handle null-case, to get default charset
+            String charset = pCharset != null ? pCharset :
+                    System.getProperty("file.encoding", "ISO-8859-1");
+            mCharset = Charset.forName(charset);
+        }
+
+        public void decodeTo(Writer pWriter, byte[] pBytes, int pOffset, int pLength) throws IOException {
+            CharBuffer cb = mCharset.decode(ByteBuffer.wrap(pBytes, pOffset, pLength));
+            pWriter.write(cb.array(), 0, cb.length());
+        }
+    }
+
+    private static final class StringDecoder implements Decoder {
+        final String mCharset;
+
+        StringDecoder(String pCharset) {
+            mCharset = pCharset;
+        }
+
+        public void decodeTo(Writer pWriter, byte[] pBytes, int pOffset, int pLength) throws IOException {
+            String str = mCharset == null ?
+                    new String(pBytes, pOffset, pLength) :
+                    new String(pBytes, pOffset, pLength, mCharset);
+
+            pWriter.write(str);
+        }
+    }
 }
@@ -1,188 +1,188 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io.enc;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-/**
- * {@code Decoder} implementation for standard base64 encoding.
- * <p/>
- * @see <a href="http://tools.ietf.org/html/rfc1421">RFC 1421</a>
- * @see <a href="http://tools.ietf.org/html/rfc2045"RFC 2045</a>
- *
- * @see Base64Encoder
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64Decoder.java#2 $
- */
-public final class Base64Decoder implements Decoder {
-    /**
-     * This array maps the characters to their 6 bit values
-     */
-    final static byte[] PEM_ARRAY = {
-            //0   1    2    3    4    5    6    7
-            'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', // 0
-            'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 1
-            'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 2
-            'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', // 3
-            'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', // 4
-            'o', 'p', 'q', 'r', 's', 't', 'u', 'v', // 5
-            'w', 'x', 'y', 'z', '0', '1', '2', '3', // 6
-            '4', '5', '6', '7', '8', '9', '+', '/'  // 7
-    };
-
-    final static byte[] PEM_CONVERT_ARRAY;
-
-    private byte[] decodeBuffer = new byte[4];
-
-    static {
-        PEM_CONVERT_ARRAY = new byte[256];
-
-        for (int i = 0; i < 255; i++) {
-            PEM_CONVERT_ARRAY[i] = -1;
-        }
-
-        for (int i = 0; i < PEM_ARRAY.length; i++) {
-            PEM_CONVERT_ARRAY[PEM_ARRAY[i]] = (byte) i;
-        }
-    }
-
-    protected static int readFully(final InputStream pStream, final byte pBytes[], final int pOffset, final int pLength)
-            throws IOException
-    {
-        for (int i = 0; i < pLength; i++) {
-            int read = pStream.read();
-
-            if (read == -1) {
-                return i != 0 ? i : -1;
-            }
-
-            pBytes[i + pOffset] = (byte) read;
-        }
-
-        return pLength;
-    }
-
-    protected boolean decodeAtom(final InputStream pInput, final ByteBuffer pOutput, final int pLength)
-            throws IOException {
-
-        byte byte0 = -1;
-        byte byte1 = -1;
-        byte byte2 = -1;
-        byte byte3 = -1;
-
-        if (pLength < 2) {
-            throw new IOException("BASE64Decoder: Not enough bytes for an atom.");
-        }
-
-        int read;
-
-        // Skip line feeds
-        do {
-            read = pInput.read();
-
-            if (read == -1) {
-                return false;
-            }
-        } while (read == 10 || read == 13);
-
-        decodeBuffer[0] = (byte) read;
-        read = readFully(pInput, decodeBuffer, 1, pLength - 1);
-
-        if (read == -1) {
-            return false;
-        }
-
-        int length = pLength;
-
-        if (length > 3 && decodeBuffer[3] == 61) {
-            length = 3;
-        }
-
-        if (length > 2 && decodeBuffer[2] == 61) {
-            length = 2;
-        }
-
-        switch (length) {
-            case 4:
-                byte3 = PEM_CONVERT_ARRAY[decodeBuffer[3] & 255];
-                // fall through
-            case 3:
-                byte2 = PEM_CONVERT_ARRAY[decodeBuffer[2] & 255];
-                // fall through
-            case 2:
-                byte1 = PEM_CONVERT_ARRAY[decodeBuffer[1] & 255];
-                byte0 = PEM_CONVERT_ARRAY[decodeBuffer[0] & 255];
-                // fall through
-            default:
-                switch (length) {
-                    case 2:
-                        pOutput.put((byte) (byte0 << 2 & 252 | byte1 >>> 4 & 3));
-                        break;
-                    case 3:
-                        pOutput.put((byte) (byte0 << 2 & 252 | byte1 >>> 4 & 3));
-                        pOutput.put((byte) (byte1 << 4 & 240 | byte2 >>> 2 & 15));
-                        break;
-                    case 4:
-                        pOutput.put((byte) (byte0 << 2 & 252 | byte1 >>> 4 & 3));
-                        pOutput.put((byte) (byte1 << 4 & 240 | byte2 >>> 2 & 15));
-                        pOutput.put((byte) (byte2 << 6 & 192 | byte3 & 63));
-                        break;
-                }
-
-                break;
-        }
-
-        return true;
-    }
-
-    public int decode(final InputStream stream, final ByteBuffer buffer) throws IOException {
-        do {
-            int k = 72;
-            int i;
-
-            for (i = 0; i + 4 < k; i += 4) {
-                if(!decodeAtom(stream, buffer, 4)) {
-                    break;
-                }
-            }
-
-            if (!decodeAtom(stream, buffer, k - i)) {
-                break;
-            }
-        }
-        while (buffer.remaining() > 54); // 72 char lines should produce no more than 54 bytes
-
-        return buffer.position();
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io.enc;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+
+/**
+ * {@code Decoder} implementation for standard base64 encoding.
+ *
+ * @see <a href="http://tools.ietf.org/html/rfc1421">RFC 1421</a>
+ * @see <a href="http://tools.ietf.org/html/rfc2045">RFC 2045</a>
+ *
+ * @see Base64Encoder
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64Decoder.java#2 $
+ */
+public final class Base64Decoder implements Decoder {
+    /**
+     * This array maps the characters to their 6 bit values
+     */
+    final static byte[] PEM_ARRAY = {
+            //0   1    2    3    4    5    6    7
+            'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', // 0
+            'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 1
+            'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 2
+            'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', // 3
+            'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', // 4
+            'o', 'p', 'q', 'r', 's', 't', 'u', 'v', // 5
+            'w', 'x', 'y', 'z', '0', '1', '2', '3', // 6
+            '4', '5', '6', '7', '8', '9', '+', '/'  // 7
+    };
+
+    final static byte[] PEM_CONVERT_ARRAY;
+
+    private byte[] decodeBuffer = new byte[4];
+
+    static {
+        PEM_CONVERT_ARRAY = new byte[256];
+
+        for (int i = 0; i < 255; i++) {
+            PEM_CONVERT_ARRAY[i] = -1;
+        }
+
+        for (int i = 0; i < PEM_ARRAY.length; i++) {
+            PEM_CONVERT_ARRAY[PEM_ARRAY[i]] = (byte) i;
+        }
+    }
+
+    protected static int readFully(final InputStream pStream, final byte pBytes[], final int pOffset, final int pLength)
+            throws IOException
+    {
+        for (int i = 0; i < pLength; i++) {
+            int read = pStream.read();
+
+            if (read == -1) {
+                return i != 0 ? i : -1;
+            }
+
+            pBytes[i + pOffset] = (byte) read;
+        }
+
+        return pLength;
+    }
+
+    protected boolean decodeAtom(final InputStream pInput, final ByteBuffer pOutput, final int pLength)
+            throws IOException {
+
+        byte byte0 = -1;
+        byte byte1 = -1;
+        byte byte2 = -1;
+        byte byte3 = -1;
+
+        if (pLength < 2) {
+            throw new IOException("BASE64Decoder: Not enough bytes for an atom.");
+        }
+
+        int read;
+
+        // Skip line feeds
+        do {
+            read = pInput.read();
+
+            if (read == -1) {
+                return false;
+            }
+        } while (read == 10 || read == 13);
+
+        decodeBuffer[0] = (byte) read;
+        read = readFully(pInput, decodeBuffer, 1, pLength - 1);
+
+        if (read == -1) {
+            return false;
+        }
+
+        int length = pLength;
+
+        if (length > 3 && decodeBuffer[3] == 61) {
+            length = 3;
+        }
+
+        if (length > 2 && decodeBuffer[2] == 61) {
+            length = 2;
+        }
+
+        switch (length) {
+            case 4:
+                byte3 = PEM_CONVERT_ARRAY[decodeBuffer[3] & 255];
+                // fall through
+            case 3:
+                byte2 = PEM_CONVERT_ARRAY[decodeBuffer[2] & 255];
+                // fall through
+            case 2:
+                byte1 = PEM_CONVERT_ARRAY[decodeBuffer[1] & 255];
+                byte0 = PEM_CONVERT_ARRAY[decodeBuffer[0] & 255];
+                // fall through
+            default:
+                switch (length) {
+                    case 2:
+                        pOutput.put((byte) (byte0 << 2 & 252 | byte1 >>> 4 & 3));
+                        break;
+                    case 3:
+                        pOutput.put((byte) (byte0 << 2 & 252 | byte1 >>> 4 & 3));
+                        pOutput.put((byte) (byte1 << 4 & 240 | byte2 >>> 2 & 15));
+                        break;
+                    case 4:
+                        pOutput.put((byte) (byte0 << 2 & 252 | byte1 >>> 4 & 3));
+                        pOutput.put((byte) (byte1 << 4 & 240 | byte2 >>> 2 & 15));
+                        pOutput.put((byte) (byte2 << 6 & 192 | byte3 & 63));
+                        break;
+                }
+
+                break;
+        }
+
+        return true;
+    }
+
+    public int decode(final InputStream stream, final ByteBuffer buffer) throws IOException {
+        do {
+            int k = 72;
+            int i;
+
+            for (i = 0; i + 4 < k; i += 4) {
+                if(!decodeAtom(stream, buffer, 4)) {
+                    break;
+                }
+            }
+
+            if (!decodeAtom(stream, buffer, k - i)) {
+                break;
+            }
+        }
+        while (buffer.remaining() > 54); // 72 char lines should produce no more than 54 bytes
+
+        return buffer.position();
+    }
+}
@@ -1,106 +1,106 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io.enc;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-/**
- * {@code Encoder} implementation for standard base64 encoding.
- * <p/>
- * @see <a href="http://tools.ietf.org/html/rfc1421">RFC 1421</a>
- * @see <a href="http://tools.ietf.org/html/rfc2045"RFC 2045</a>
- *
- * @see Base64Decoder
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64Encoder.java#2 $
- */
-public class Base64Encoder implements Encoder {
-
-    public void encode(final OutputStream stream, final ByteBuffer buffer)
-            throws IOException
-    {
-
-        // TODO: Implement
-        // NOTE: This is impossible, given the current spec, as we need to either:
-        //  - buffer all data in the EncoderStream
-        //  - or have flush/end method(s) in the Encoder
-        // to ensure proper end of stream handling
-
-        int length;
-
-        // TODO: Temp impl, will only work for single writes
-        while (buffer.hasRemaining()) {
-            byte a, b, c;
-
-//            if ((buffer.remaining()) > 2) {
-//                length = 3;
-//            }
-//            else {
-//                length = buffer.remaining();
-//            }
-            length = Math.min(3, buffer.remaining());
-
-            switch (length) {
-                case 1:
-                    a = buffer.get();
-                    b = 0;
-                    stream.write(Base64Decoder.PEM_ARRAY[(a >>> 2) & 0x3F]);
-                    stream.write(Base64Decoder.PEM_ARRAY[((a << 4) & 0x30) + ((b >>> 4) & 0xf)]);
-                    stream.write('=');
-                    stream.write('=');
-                    break;
-
-                case 2:
-                    a = buffer.get();
-                    b = buffer.get();
-                    c = 0;
-                    stream.write(Base64Decoder.PEM_ARRAY[(a >>> 2) & 0x3F]);
-                    stream.write(Base64Decoder.PEM_ARRAY[((a << 4) & 0x30) + ((b >>> 4) & 0xf)]);
-                    stream.write(Base64Decoder.PEM_ARRAY[((b << 2) & 0x3c) + ((c >>> 6) & 0x3)]);
-                    stream.write('=');
-                    break;
-
-                default:
-                    a = buffer.get();
-                    b = buffer.get();
-                    c = buffer.get();
-                    stream.write(Base64Decoder.PEM_ARRAY[(a >>> 2) & 0x3F]);
-                    stream.write(Base64Decoder.PEM_ARRAY[((a << 4) & 0x30) + ((b >>> 4) & 0xf)]);
-                    stream.write(Base64Decoder.PEM_ARRAY[((b << 2) & 0x3c) + ((c >>> 6) & 0x3)]);
-                    stream.write(Base64Decoder.PEM_ARRAY[c & 0x3F]);
-                    break;
-            }
-        }
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io.enc;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+
+/**
+ * {@code Encoder} implementation for standard base64 encoding.
+ *
+ * @see <a href="http://tools.ietf.org/html/rfc1421">RFC 1421</a>
+ * @see <a href="http://tools.ietf.org/html/rfc2045">RFC 2045</a>
+ *
+ * @see Base64Decoder
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64Encoder.java#2 $
+ */
+public class Base64Encoder implements Encoder {
+
+    public void encode(final OutputStream stream, final ByteBuffer buffer)
+            throws IOException
+    {
+
+        // TODO: Implement
+        // NOTE: This is impossible, given the current spec, as we need to either:
+        //  - buffer all data in the EncoderStream
+        //  - or have flush/end method(s) in the Encoder
+        // to ensure proper end of stream handling
+
+        int length;
+
+        // TODO: Temp impl, will only work for single writes
+        while (buffer.hasRemaining()) {
+            byte a, b, c;
+
+//            if ((buffer.remaining()) > 2) {
+//                length = 3;
+//            }
+//            else {
+//                length = buffer.remaining();
+//            }
+            length = Math.min(3, buffer.remaining());
+
+            switch (length) {
+                case 1:
+                    a = buffer.get();
+                    b = 0;
+                    stream.write(Base64Decoder.PEM_ARRAY[(a >>> 2) & 0x3F]);
+                    stream.write(Base64Decoder.PEM_ARRAY[((a << 4) & 0x30) + ((b >>> 4) & 0xf)]);
+                    stream.write('=');
+                    stream.write('=');
+                    break;
+
+                case 2:
+                    a = buffer.get();
+                    b = buffer.get();
+                    c = 0;
+                    stream.write(Base64Decoder.PEM_ARRAY[(a >>> 2) & 0x3F]);
+                    stream.write(Base64Decoder.PEM_ARRAY[((a << 4) & 0x30) + ((b >>> 4) & 0xf)]);
+                    stream.write(Base64Decoder.PEM_ARRAY[((b << 2) & 0x3c) + ((c >>> 6) & 0x3)]);
+                    stream.write('=');
+                    break;
+
+                default:
+                    a = buffer.get();
+                    b = buffer.get();
+                    c = buffer.get();
+                    stream.write(Base64Decoder.PEM_ARRAY[(a >>> 2) & 0x3F]);
+                    stream.write(Base64Decoder.PEM_ARRAY[((a << 4) & 0x30) + ((b >>> 4) & 0xf)]);
+                    stream.write(Base64Decoder.PEM_ARRAY[((b << 2) & 0x3c) + ((c >>> 6) & 0x3)]);
+                    stream.write(Base64Decoder.PEM_ARRAY[c & 0x3F]);
+                    break;
+            }
+        }
+    }
+}
@@ -1,56 +1,55 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io.enc;
-
-import java.io.IOException;
-
-/**
- * Thrown by {@code Decoder}s when encoded data can not be decoded.
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java#2 $
- */
-public class DecodeException extends IOException {
-
-    public DecodeException(final String pMessage) {
-        super(pMessage);
-    }
-
-    public DecodeException(final String pMessage, final Throwable pCause) {
-        super(pMessage);
-        initCause(pCause);
-    }
-
-    public DecodeException(final Throwable pCause) {
-        this(pCause.getMessage(), pCause);
-    }
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io.enc;
+
+import java.io.IOException;
+
+/**
+ * Thrown by {@code Decoder}s when encoded data can not be decoded.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java#2 $
+ */
+public class DecodeException extends IOException {
+
+    public DecodeException(final String pMessage) {
+        super(pMessage);
+    }
+
+    public DecodeException(final String pMessage, final Throwable pCause) {
+        super(pMessage);
+        initCause(pCause);
+    }
+
+    public DecodeException(final Throwable pCause) {
+        this(pCause.getMessage(), pCause);
+    }
 }
@@ -1,68 +1,69 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io.enc;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-/**
- * Interface for decoders.
- * A {@code Decoder} may be used with a {@code DecoderStream}, to perform
- * on-the-fly decoding from an {@code InputStream}.
- * <p/>
- * Important note: Decoder implementations are typically not synchronized.
- * <p/>
- * @see Encoder
- * @see DecoderStream
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Decoder.java#2 $
- */
-public interface Decoder {
-    
-    /**
-     * Decodes up to {@code buffer.length} bytes from the given input stream,
-     * into the given buffer.
-     *
-     * @param stream the input stream to decode data from
-     * @param buffer buffer to store the read data
-     *
-     * @return the total number of bytes read into the buffer, or {@code 0}
-     * if there is no more data because the end of the stream has been reached.
-     *
-     * @throws DecodeException if encoded data is corrupt.
-     * @throws IOException if an I/O error occurs.
-     * @throws java.io.EOFException if a premature end-of-file is encountered.
-     * @throws java.lang.NullPointerException if either argument is {@code null}.
-     */
-    int decode(InputStream stream, ByteBuffer buffer) throws IOException;
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io.enc;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+
+/**
+ * Interface for decoders.
+ * A {@code Decoder} may be used with a {@code DecoderStream}, to perform
+ * on-the-fly decoding from an {@code InputStream}.
+ * <p>
+ * Important note: Decoder implementations are typically not synchronized.
+ * </p>
+ *
+ * @see Encoder
+ * @see DecoderStream
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Decoder.java#2 $
+ */
+public interface Decoder {
+    
+    /**
+     * Decodes up to {@code buffer.length} bytes from the given input stream,
+     * into the given buffer.
+     *
+     * @param stream the input stream to decode data from
+     * @param buffer buffer to store the read data
+     *
+     * @return the total number of bytes read into the buffer, or {@code 0}
+     * if there is no more data because the end of the stream has been reached.
+     *
+     * @throws DecodeException if encoded data is corrupt.
+     * @throws IOException if an I/O error occurs.
+     * @throws java.io.EOFException if a premature end-of-file is encountered.
+     * @throws java.lang.NullPointerException if either argument is {@code null}.
+     */
+    int decode(InputStream stream, ByteBuffer buffer) throws IOException;
+}
@@ -1,200 +1,199 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io.enc;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-/**
- * An {@code InputStream} that provides on-the-fly decoding from an underlying
- * stream.
- * <p/>
- * @see EncoderStream
- * @see Decoder
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java#2 $
- */
-public final class DecoderStream extends FilterInputStream {
-    protected final ByteBuffer buffer;
-    protected final Decoder decoder;
-
-    /**
-     * Creates a new decoder stream and chains it to the
-     * input stream specified by the {@code pStream} argument.
-     * The stream will use a default decode buffer size.
-     *
-     * @param pStream the underlying input stream.
-     * @param pDecoder the decoder that will be used to decode the underlying stream
-     *
-     * @see java.io.FilterInputStream#in
-     */
-    public DecoderStream(final InputStream pStream, final Decoder pDecoder) {
-        // TODO: Let the decoder decide preferred buffer size 
-        this(pStream, pDecoder, 1024);
-    }
-
-    /**
-     * Creates a new decoder stream and chains it to the
-     * input stream specified by the {@code pStream} argument.
-     *
-     * @param pStream the underlying input stream.
-     * @param pDecoder the decoder that will be used to decode the underlying stream
-     * @param pBufferSize the size of the decode buffer
-     *
-     * @see java.io.FilterInputStream#in
-     */
-    public DecoderStream(final InputStream pStream, final Decoder pDecoder, final int pBufferSize) {
-        super(pStream);
-
-        decoder = pDecoder;
-        buffer = ByteBuffer.allocate(pBufferSize);
-        buffer.flip();
-    }
-
-    public int available() throws IOException {
-        return buffer.remaining();
-    }
-
-    public int read() throws IOException {
-        if (!buffer.hasRemaining()) {
-            if (fill() < 0) {
-                return -1;
-            }
-        }
-
-        return buffer.get() & 0xff;
-    }
-
-    public int read(final byte pBytes[], final int pOffset, final int pLength) throws IOException {
-        if (pBytes == null) {
-            throw new NullPointerException();
-        }
-        else if ((pOffset < 0) || (pOffset > pBytes.length) || (pLength < 0) ||
-                ((pOffset + pLength) > pBytes.length) || ((pOffset + pLength) < 0)) {
-            throw new IndexOutOfBoundsException("bytes.length=" + pBytes.length + " offset=" + pOffset + " length=" + pLength);
-        }
-        else if (pLength == 0) {
-            return 0;
-        }
-
-        // End of file?
-        if (!buffer.hasRemaining()) {
-            if (fill() < 0) {
-                return -1;
-            }
-        }
-
-        // Read until we have read pLength bytes, or have reached EOF
-        int count = 0;
-        int off = pOffset;
-
-        while (pLength > count) {
-            if (!buffer.hasRemaining()) {
-                if (fill() < 0) {
-                    break;
-                }
-            }
-
-            // Copy as many bytes as possible
-            int dstLen = Math.min(pLength - count, buffer.remaining());
-            buffer.get(pBytes, off, dstLen);
-
-            // Update offset (rest)
-            off += dstLen;
-
-            // Increase count
-            count += dstLen;
-        }
-
-        return count;
-    }
-
-    public long skip(final long pLength) throws IOException {
-        // End of file?
-        if (!buffer.hasRemaining()) {
-            if (fill() < 0) {
-                return 0; // Yes, 0, not -1
-            }
-        }
-
-        // Skip until we have skipped pLength bytes, or have reached EOF
-        long total = 0;
-
-        while (total < pLength) {
-            if (!buffer.hasRemaining()) {
-                if (fill() < 0) {
-                    break;
-                }
-            }
-
-            // NOTE: Skipped can never be more than avail, which is an int, so the cast is safe
-            int skipped = (int) Math.min(pLength - total, buffer.remaining());
-            buffer.position(buffer.position() + skipped);
-            total += skipped;
-        }
-
-        return total;
-    }
-
-    /**
-     * Fills the buffer, by decoding data from the underlying input stream.
-     *
-     * @return the number of bytes decoded, or {@code -1} if the end of the
-     * file is reached
-     *
-     * @throws IOException if an I/O error occurs
-     */
-    protected int fill() throws IOException {
-        buffer.clear();
-        int read = decoder.decode(in, buffer);
-
-        // TODO: Enforce this in test case, leave here to aid debugging
-        if (read > buffer.capacity()) {
-            throw new AssertionError(
-                    String.format(
-                            "Decode beyond buffer (%d): %d (using %s decoder)",
-                            buffer.capacity(), read, decoder.getClass().getName()
-                    )
-            );
-        }
-
-        buffer.flip();
-
-        if (read == 0) {
-            return -1;
-        }
-
-        return read;
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io.enc;
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+
+/**
+ * An {@code InputStream} that provides on-the-fly decoding from an underlying stream.
+ *
+ * @see EncoderStream
+ * @see Decoder
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java#2 $
+ */
+public final class DecoderStream extends FilterInputStream {
+    protected final ByteBuffer buffer;
+    protected final Decoder decoder;
+
+    /**
+     * Creates a new decoder stream and chains it to the
+     * input stream specified by the {@code pStream} argument.
+     * The stream will use a default decode buffer size.
+     *
+     * @param pStream the underlying input stream.
+     * @param pDecoder the decoder that will be used to decode the underlying stream
+     *
+     * @see java.io.FilterInputStream#in
+     */
+    public DecoderStream(final InputStream pStream, final Decoder pDecoder) {
+        // TODO: Let the decoder decide preferred buffer size 
+        this(pStream, pDecoder, 1024);
+    }
+
+    /**
+     * Creates a new decoder stream and chains it to the
+     * input stream specified by the {@code pStream} argument.
+     *
+     * @param pStream the underlying input stream.
+     * @param pDecoder the decoder that will be used to decode the underlying stream
+     * @param pBufferSize the size of the decode buffer
+     *
+     * @see java.io.FilterInputStream#in
+     */
+    public DecoderStream(final InputStream pStream, final Decoder pDecoder, final int pBufferSize) {
+        super(pStream);
+
+        decoder = pDecoder;
+        buffer = ByteBuffer.allocate(pBufferSize);
+        buffer.flip();
+    }
+
+    public int available() throws IOException {
+        return buffer.remaining();
+    }
+
+    public int read() throws IOException {
+        if (!buffer.hasRemaining()) {
+            if (fill() < 0) {
+                return -1;
+            }
+        }
+
+        return buffer.get() & 0xff;
+    }
+
+    public int read(final byte pBytes[], final int pOffset, final int pLength) throws IOException {
+        if (pBytes == null) {
+            throw new NullPointerException();
+        }
+        else if ((pOffset < 0) || (pOffset > pBytes.length) || (pLength < 0) ||
+                ((pOffset + pLength) > pBytes.length) || ((pOffset + pLength) < 0)) {
+            throw new IndexOutOfBoundsException("bytes.length=" + pBytes.length + " offset=" + pOffset + " length=" + pLength);
+        }
+        else if (pLength == 0) {
+            return 0;
+        }
+
+        // End of file?
+        if (!buffer.hasRemaining()) {
+            if (fill() < 0) {
+                return -1;
+            }
+        }
+
+        // Read until we have read pLength bytes, or have reached EOF
+        int count = 0;
+        int off = pOffset;
+
+        while (pLength > count) {
+            if (!buffer.hasRemaining()) {
+                if (fill() < 0) {
+                    break;
+                }
+            }
+
+            // Copy as many bytes as possible
+            int dstLen = Math.min(pLength - count, buffer.remaining());
+            buffer.get(pBytes, off, dstLen);
+
+            // Update offset (rest)
+            off += dstLen;
+
+            // Increase count
+            count += dstLen;
+        }
+
+        return count;
+    }
+
+    public long skip(final long pLength) throws IOException {
+        // End of file?
+        if (!buffer.hasRemaining()) {
+            if (fill() < 0) {
+                return 0; // Yes, 0, not -1
+            }
+        }
+
+        // Skip until we have skipped pLength bytes, or have reached EOF
+        long total = 0;
+
+        while (total < pLength) {
+            if (!buffer.hasRemaining()) {
+                if (fill() < 0) {
+                    break;
+                }
+            }
+
+            // NOTE: Skipped can never be more than avail, which is an int, so the cast is safe
+            int skipped = (int) Math.min(pLength - total, buffer.remaining());
+            buffer.position(buffer.position() + skipped);
+            total += skipped;
+        }
+
+        return total;
+    }
+
+    /**
+     * Fills the buffer, by decoding data from the underlying input stream.
+     *
+     * @return the number of bytes decoded, or {@code -1} if the end of the
+     * file is reached
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    protected int fill() throws IOException {
+        buffer.clear();
+        int read = decoder.decode(in, buffer);
+
+        // TODO: Enforce this in test case, leave here to aid debugging
+        if (read > buffer.capacity()) {
+            throw new AssertionError(
+                    String.format(
+                            "Decode beyond buffer (%d): %d (using %s decoder)",
+                            buffer.capacity(), read, decoder.getClass().getName()
+                    )
+            );
+        }
+
+        buffer.flip();
+
+        if (read == 0) {
+            return -1;
+        }
+
+        return read;
+    }
+}
@@ -1,65 +1,66 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io.enc;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-/**
- * Interface for encoders.
- * An {@code Encoder} may be used with an {@code EncoderStream}, to perform
- * on-the-fly encoding to an {@code OutputStream}.
- * <p/>
- * Important note: Encoder implementations are typically not synchronized.
- *
- * @see Decoder
- * @see EncoderStream
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Encoder.java#2 $
- */
-public interface Encoder {
-    
-    /**
-     * Encodes up to {@code buffer.remaining()} bytes into the given input stream,
-     * from the given buffer.
-     *
-     * @param stream the output stream to encode data to
-     * @param buffer buffer to read data from
-     *
-     * @throws java.io.IOException if an I/O error occurs
-     */
-    void encode(OutputStream stream, ByteBuffer buffer) throws IOException;
-
-    //TODO: int requiredBufferSize(): -1 == any, otherwise, use this buffer size
-    // void flush()?
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io.enc;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+
+/**
+ * Interface for encoders.
+ * An {@code Encoder} may be used with an {@code EncoderStream}, to perform
+ * on-the-fly encoding to an {@code OutputStream}.
+ * <p>
+ * Important note: Encoder implementations are typically not synchronized.
+ * </p>
+ *
+ * @see Decoder
+ * @see EncoderStream
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Encoder.java#2 $
+ */
+public interface Encoder {
+    
+    /**
+     * Encodes up to {@code buffer.remaining()} bytes into the given input stream,
+     * from the given buffer.
+     *
+     * @param stream the output stream to encode data to
+     * @param buffer buffer to read data from
+     *
+     * @throws java.io.IOException if an I/O error occurs
+     */
+    void encode(OutputStream stream, ByteBuffer buffer) throws IOException;
+
+    //TODO: int requiredBufferSize(): -1 == any, otherwise, use this buffer size
+    // void flush()?
+}
@@ -1,137 +1,136 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io.enc;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-/**
- * An {@code OutputStream} that provides on-the-fly encoding to an underlying
- * stream.
- * <p/>
- * @see DecoderStream
- * @see Encoder
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java#2 $
- */
-public final class EncoderStream extends FilterOutputStream {
-    // TODO: This class need a test case ASAP!!!
-
-    protected final Encoder encoder;
-    private final boolean flushOnWrite;
-
-    protected final ByteBuffer buffer;
-
-    /**
-     * Creates an output stream filter built on top of the specified
-     * underlying output stream.
-     *
-     * @param pStream the underlying output stream
-     * @param pEncoder the encoder to use
-     */
-    public EncoderStream(final OutputStream pStream, final Encoder pEncoder) {
-        this(pStream, pEncoder, false);
-    }
-
-    /**
-     * Creates an output stream filter built on top of the specified
-     * underlying output stream.
-     *
-     * @param pStream the underlying output stream
-     * @param pEncoder the encoder to use
-     * @param pFlushOnWrite if {@code true}, calls to the byte-array
-     * {@code write} methods will automatically flush the buffer.
-     */
-    public EncoderStream(final OutputStream pStream, final Encoder pEncoder, final boolean pFlushOnWrite) {
-        super(pStream);
-
-        encoder = pEncoder;
-        flushOnWrite = pFlushOnWrite;
-
-        buffer = ByteBuffer.allocate(1024);
-        buffer.flip();
-    }
-
-    public void close() throws IOException {
-        flush();
-        super.close();
-    }
-
-    public void flush() throws IOException {
-        encodeBuffer();
-        super.flush();
-    }
-
-    private void encodeBuffer() throws IOException {
-        if (buffer.position() != 0) {
-            buffer.flip();
-
-            // Make sure all remaining data in buffer is written to the stream
-            encoder.encode(out, buffer);
-
-            // Reset buffer
-            buffer.clear();
-        }
-    }
-
-    public final void write(final byte[] pBytes) throws IOException {
-        write(pBytes, 0, pBytes.length);
-    }
-
-    // TODO: Verify that this works for the general case (it probably won't)...
-    // TODO: We might need a way to explicitly flush the encoder, or specify
-    // that the encoder can't buffer. In that case, the encoder should probably
-    // tell the EncoderStream how large buffer it prefers... 
-    public void write(final byte[] pBytes, final int pOffset, final int pLength) throws IOException {
-        if (!flushOnWrite && pLength < buffer.remaining()) {
-            // Buffer data
-            buffer.put(pBytes, pOffset, pLength);
-        }
-        else {
-            // Encode data already in the buffer
-            encodeBuffer();
-
-            // Encode rest without buffering
-            encoder.encode(out, ByteBuffer.wrap(pBytes, pOffset, pLength));
-        }
-    }
-
-    public void write(final int pByte) throws IOException {
-        if (!buffer.hasRemaining()) {
-            encodeBuffer(); // Resets bufferPos to 0
-        }
-
-        buffer.put((byte) pByte);
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io.enc;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+
+/**
+ * An {@code OutputStream} that provides on-the-fly encoding to an underlying stream.
+ *
+ * @see DecoderStream
+ * @see Encoder
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java#2 $
+ */
+public final class EncoderStream extends FilterOutputStream {
+    // TODO: This class need a test case ASAP!!!
+
+    protected final Encoder encoder;
+    private final boolean flushOnWrite;
+
+    protected final ByteBuffer buffer;
+
+    /**
+     * Creates an output stream filter built on top of the specified
+     * underlying output stream.
+     *
+     * @param pStream the underlying output stream
+     * @param pEncoder the encoder to use
+     */
+    public EncoderStream(final OutputStream pStream, final Encoder pEncoder) {
+        this(pStream, pEncoder, false);
+    }
+
+    /**
+     * Creates an output stream filter built on top of the specified
+     * underlying output stream.
+     *
+     * @param pStream the underlying output stream
+     * @param pEncoder the encoder to use
+     * @param pFlushOnWrite if {@code true}, calls to the byte-array
+     * {@code write} methods will automatically flush the buffer.
+     */
+    public EncoderStream(final OutputStream pStream, final Encoder pEncoder, final boolean pFlushOnWrite) {
+        super(pStream);
+
+        encoder = pEncoder;
+        flushOnWrite = pFlushOnWrite;
+
+        buffer = ByteBuffer.allocate(1024);
+        buffer.flip();
+    }
+
+    public void close() throws IOException {
+        flush();
+        super.close();
+    }
+
+    public void flush() throws IOException {
+        encodeBuffer();
+        super.flush();
+    }
+
+    private void encodeBuffer() throws IOException {
+        if (buffer.position() != 0) {
+            buffer.flip();
+
+            // Make sure all remaining data in buffer is written to the stream
+            encoder.encode(out, buffer);
+
+            // Reset buffer
+            buffer.clear();
+        }
+    }
+
+    public final void write(final byte[] pBytes) throws IOException {
+        write(pBytes, 0, pBytes.length);
+    }
+
+    // TODO: Verify that this works for the general case (it probably won't)...
+    // TODO: We might need a way to explicitly flush the encoder, or specify
+    // that the encoder can't buffer. In that case, the encoder should probably
+    // tell the EncoderStream how large buffer it prefers... 
+    public void write(final byte[] pBytes, final int pOffset, final int pLength) throws IOException {
+        if (!flushOnWrite && pLength < buffer.remaining()) {
+            // Buffer data
+            buffer.put(pBytes, pOffset, pLength);
+        }
+        else {
+            // Encode data already in the buffer
+            encodeBuffer();
+
+            // Encode rest without buffering
+            encoder.encode(out, ByteBuffer.wrap(pBytes, pOffset, pLength));
+        }
+    }
+
+    public void write(final int pByte) throws IOException {
+        if (!buffer.hasRemaining()) {
+            encodeBuffer(); // Resets bufferPos to 0
+        }
+
+        buffer.put((byte) pByte);
+    }
+}
@@ -1,210 +1,194 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io.enc;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-/**
- * Decoder implementation for Apple PackBits run-length encoding.
- * <p/>
- * <small>From Wikipedia, the free encyclopedia</small><br/>
- * PackBits is a fast, simple compression scheme for run-length encoding of
- * data.
- * <p/>
- * Apple introduced the PackBits format with the release of MacPaint on the
- * Macintosh computer. This compression scheme is one of the types of
- * compression that can be used in TIFF-files.
- * <p/>
- * A PackBits data stream consists of packets of one byte of header followed by
- * data. The header is a signed byte; the data can be signed, unsigned, or
- * packed (such as MacPaint pixels).
- * <p/>
- * <table><tr><th>Header byte</th><th>Data</th></tr>
- * <tr><td>0 to 127</td>    <td>1 + <i>n</i> literal bytes of data</td></tr>
- * <tr><td>0 to -127</td>   <td>One byte of data, repeated 1 - <i>n</i> times in
- *                           the decompressed output</td></tr>
- * <tr><td>-128</td>        <td>No operation</td></tr></table>
- * <p/>
- * Note that interpreting 0 as positive or negative makes no difference in the
- * output. Runs of two bytes adjacent to non-runs are typically written as
- * literal data.
- * <p/>
- * See <a href="http://developer.apple.com/technotes/tn/tn1023.html">Understanding PackBits</a>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java#1 $
- */
-public final class PackBitsDecoder implements Decoder {
-    // TODO: Look at ICNSImageReader#unpackbits... What is this weirdness?
-
-    private final boolean disableNoOp;
-    private final byte[] sample;
-
-    private int leftOfRun;
-    private boolean splitRun;
-    private boolean reachedEOF;
-
-    /** Creates a {@code PackBitsDecoder}. */
-    public PackBitsDecoder() {
-        this(1, false);
-    }
-
-    /**
-     * Creates a {@code PackBitsDecoder}, with optional compatibility mode.
-     * <p/>
-     * As some implementations of PackBits-like encoders treat {@code -128} as length of
-     * a compressed run, instead of a no-op, it's possible to disable no-ops for compatibility.
-     * Should be used with caution, even though, most known encoders never write no-ops in the compressed streams.
-     *
-     * @param disableNoOp {@code true} if {@code -128} should be treated as a compressed run, and not a no-op
-     */
-    public PackBitsDecoder(final boolean disableNoOp) {
-        this(1, disableNoOp);
-    }
-
-    /**
-     * Creates a {@code PackBitsDecoder}, with optional compatibility mode.
-     * <p/>
-     * As some implementations of PackBits-like encoders treat {@code -128} as length of
-     * a compressed run, instead of a no-op, it's possible to disable no-ops for compatibility.
-     * Should be used with caution, even though, most known encoders never write no-ops in the compressed streams.
-     *
-     * @param disableNoOp {@code true} if {@code -128} should be treated as a compressed run, and not a no-op
-     */
-    public PackBitsDecoder(int sampleSize, final boolean disableNoOp) {
-        this.sample = new byte[sampleSize];
-        this.disableNoOp = disableNoOp;
-    }
-
-    /**
-     * Decodes bytes from the given input stream, to the given buffer.
-     *
-     * @param stream the stream to decode from
-     * @param buffer a byte array, minimum 128 (or 129 if no-op is disabled) bytes long
-     * @return The number of bytes decoded
-     *
-     * @throws java.io.IOException
-     */
-    public int decode(final InputStream stream, final ByteBuffer buffer) throws IOException {
-        if (reachedEOF) {
-            return -1;
-        }
-
-        // TODO: Don't decode more than single runs, because some writers add pad bytes inside the stream...
-        while (buffer.hasRemaining()) {
-            int n;
-            
-            if (splitRun) {
-                // Continue run
-                n = leftOfRun;
-                splitRun = false;
-            }
-            else {
-                // Start new run
-                int b = stream.read();
-                if (b < 0) {
-                    reachedEOF = true;
-                    break;
-                }
-                n = (byte) b;
-            }
-
-            // Split run at or before max
-            if (n >= 0 && n + 1 > buffer.remaining()) {
-                leftOfRun = n;
-                splitRun = true;
-                break;
-            }
-            else if (n < 0 && -n + 1 > buffer.remaining()) {
-                leftOfRun = n;
-                splitRun = true;
-                break;
-            }
-
-            try {
-                if (n >= 0) {
-                    // Copy next n + 1 bytes literally
-                    readFully(stream, buffer, sample.length * (n + 1));
-                }
-                // Allow -128 for compatibility, see above
-                else if (disableNoOp || n != -128) {
-                    // Replicate the next byte -n + 1 times
-                    for (int s = 0; s < sample.length; s++) {
-                        sample[s] = readByte(stream);
-                    }
-
-                    for (int i = -n + 1; i > 0; i--) {
-                        buffer.put(sample);
-                    }
-                }
-                // else NOOP (-128)
-            }
-            catch (IndexOutOfBoundsException e) {
-                throw new DecodeException("Error in PackBits decompression, data seems corrupt", e);
-            }
-        }
-
-        return buffer.position();
-    }
-
-    static byte readByte(final InputStream pStream) throws IOException {
-        int read = pStream.read();
-
-        if (read < 0) {
-            throw new EOFException("Unexpected end of PackBits stream");
-        }
-
-        return (byte) read;
-    }
-
-    static void readFully(final InputStream pStream, final ByteBuffer pBuffer, final int pLength) throws IOException {
-        if (pLength < 0) {
-            throw new IndexOutOfBoundsException(String.format("Negative length: %d", pLength));
-        }
-
-        int total = 0;
-
-        while (total < pLength) {
-            int count = pStream.read(pBuffer.array(), pBuffer.arrayOffset() + pBuffer.position() + total, pLength - total);
-
-            if (count < 0) {
-                throw new EOFException("Unexpected end of PackBits stream");
-            }
-
-            total += count;
-        }
-
-        pBuffer.position(pBuffer.position() + total);
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io.enc;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+
+/**
+ * Decoder implementation for Apple PackBits run-length encoding.
+ * <p>
+ * <small>From Wikipedia, the free encyclopedia</small>
+ * <br>
+ * PackBits is a fast, simple compression scheme for run-length encoding of
+ * data.
+ * </p>
+ * <p>
+ * Apple introduced the PackBits format with the release of MacPaint on the
+ * Macintosh computer. This compression scheme is one of the types of
+ * compression that can be used in TIFF-files.
+ * </p>
+ * <p>
+ * A PackBits data stream consists of packets of one byte of header followed by
+ * data. The header is a signed byte; the data can be signed, unsigned, or
+ * packed (such as MacPaint pixels).
+ * </p>
+ * <table>
+ *     <caption>PackBits</caption>
+ *     <tr><th>Header byte</th><th>Data</th></tr>
+ *     <tr><td>0 to 127</td>    <td>1 + <i>n</i> literal bytes of data</td></tr>
+ *     <tr><td>0 to -127</td>   <td>One byte of data, repeated 1 - <i>n</i> times in the decompressed output</td></tr>
+ *     <tr><td>-128</td>        <td>No operation</td></tr>
+ * </table>
+ * <p>
+ * Note that interpreting 0 as positive or negative makes no difference in the
+ * output. Runs of two bytes adjacent to non-runs are typically written as
+ * literal data.
+ * </p>
+ *
+ * @see <a href="http://developer.apple.com/technotes/tn/tn1023.html">Understanding PackBits</a>
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java#1 $
+ */
+public final class PackBitsDecoder implements Decoder {
+    // TODO: Look at ICNSImageReader#unpackbits... What is this weirdness?
+
+    private final boolean disableNoOp;
+    private final byte[] sample;
+
+    private boolean reachedEOF;
+
+    /** Creates a {@code PackBitsDecoder}. */
+    public PackBitsDecoder() {
+        this(1, false);
+    }
+
+    /**
+     * Creates a {@code PackBitsDecoder}, with optional compatibility mode.
+     * <p>
+     * As some implementations of PackBits-like encoders treat {@code -128} as length of
+     * a compressed run, instead of a no-op, it's possible to disable no-ops for compatibility.
+     * Should be used with caution, even though, most known encoders never write no-ops in the compressed streams.
+     * </p>
+     *
+     * @param disableNoOp {@code true} if {@code -128} should be treated as a compressed run, and not a no-op
+     */
+    public PackBitsDecoder(final boolean disableNoOp) {
+        this(1, disableNoOp);
+    }
+
+    /**
+     * Creates a {@code PackBitsDecoder}, with optional compatibility mode.
+     * <p>
+     * As some implementations of PackBits-like encoders treat {@code -128} as length of
+     * a compressed run, instead of a no-op, it's possible to disable no-ops for compatibility.
+     * Should be used with caution, even though, most known encoders never write no-ops in the compressed streams.
+     * </p>
+     *
+     * @param disableNoOp {@code true} if {@code -128} should be treated as a compressed run, and not a no-op
+     */
+    public PackBitsDecoder(int sampleSize, final boolean disableNoOp) {
+        this.sample = new byte[sampleSize];
+        this.disableNoOp = disableNoOp;
+    }
+
+    /**
+     * Decodes bytes from the given input stream, to the given buffer.
+     *
+     * @param stream the stream to decode from
+     * @param buffer a byte array, minimum 128 (or 129 if no-op is disabled) bytes long
+     * @return The number of bytes decoded
+     *
+     * @throws java.io.IOException if a problem occurs during decoding.
+     */
+    public int decode(final InputStream stream, final ByteBuffer buffer) throws IOException {
+        if (reachedEOF) {
+            return -1;
+        }
+
+        // NOTE: We don't decode more than single runs, because some writers add pad bytes inside the stream...
+        // Start new run
+        int b = stream.read();
+        if (b < 0) {
+            reachedEOF = true;
+            return 0;
+        }
+
+        int n = (byte) b;
+
+        try {
+            if (n >= 0) {
+                // Copy next n + 1 bytes literally
+                readFully(stream, buffer, sample.length * (n + 1));
+            }
+            // Allow -128 for compatibility, see above
+            else if (disableNoOp || n != -128) {
+                // Replicate the next byte -n + 1 times
+                for (int s = 0; s < sample.length; s++) {
+                    sample[s] = readByte(stream);
+                }
+
+                for (int i = -n + 1; i > 0; i--) {
+                    buffer.put(sample);
+                }
+            }
+            // else NOOP (-128)
+        }
+        catch (IndexOutOfBoundsException e) {
+            throw new DecodeException("Error in PackBits decompression, data seems corrupt", e);
+        }
+
+        return buffer.position();
+    }
+
+    static byte readByte(final InputStream pStream) throws IOException {
+        int read = pStream.read();
+
+        if (read < 0) {
+            throw new EOFException("Unexpected end of PackBits stream");
+        }
+
+        return (byte) read;
+    }
+
+    static void readFully(final InputStream pStream, final ByteBuffer pBuffer, final int pLength) throws IOException {
+        if (pLength < 0) {
+            throw new IndexOutOfBoundsException(String.format("Negative length: %d", pLength));
+        }
+
+        int total = 0;
+
+        while (total < pLength) {
+            int count = pStream.read(pBuffer.array(), pBuffer.arrayOffset() + pBuffer.position() + total, pLength - total);
+
+            if (count < 0) {
+                throw new EOFException("Unexpected end of PackBits stream");
+            }
+
+            total += count;
+        }
+
+        pBuffer.position(pBuffer.position() + total);
+    }
+}
@@ -1,132 +1,138 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io.enc;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-/**
- * Encoder implementation for Apple PackBits run-length encoding.
- * <p/>
- * From Wikipedia, the free encyclopedia<br/>
- * PackBits is a fast, simple compression scheme for run-length encoding of
- * data.
- * <p/>
- * Apple introduced the PackBits format with the release of MacPaint on the
- * Macintosh computer. This compression scheme is one of the types of
- * compression that can be used in TIFF-files.
- * <p/>
- * A PackBits data stream consists of packets of one byte of header followed by
- * data. The header is a signed byte; the data can be signed, unsigned, or
- * packed (such as MacPaint pixels).
- * <p/>
- * <table><tr><th>Header byte</th><th>Data</th></tr>
- * <tr><td>0 to 127</td>    <td>1 + <i>n</i> literal bytes of data</td></tr>
- * <tr><td>0 to -127</td>   <td>One byte of data, repeated 1 - <i>n</i> times in
- *                           the decompressed output</td></tr>
- * <tr><td>-128</td>        <td>No operation</td></tr></table>
- * <p/>
- * Note that interpreting 0 as positive or negative makes no difference in the
- * output. Runs of two bytes adjacent to non-runs are typically written as
- * literal data.
- * <p/>
- * See <a href="http://developer.apple.com/technotes/tn/tn1023.html">Understanding PackBits</a>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsEncoder.java#1 $
- */
-public final class PackBitsEncoder implements Encoder {
-
-    final private byte[] buffer = new byte[128];
-
-    /**
-     * Creates a {@code PackBitsEncoder}.
-     */
-    public PackBitsEncoder() {
-    }
-
-    public void encode(final OutputStream stream, final ByteBuffer buffer) throws IOException {
-        encode(stream, buffer.array(), buffer.arrayOffset() + buffer.position(), buffer.remaining());
-        buffer.position(buffer.remaining());
-    }
-
-    private void encode(OutputStream pStream, byte[] pBuffer, int pOffset, int pLength) throws IOException {
-        // NOTE: It's best to encode a 2 byte repeat
-        // run as a replicate run except when preceded and followed by a
-        // literal run, in which case it's best to merge the three into one
-        // literal run. Always encode 3 byte repeats as replicate runs.
-        // NOTE: Worst case: output = input + (input + 127) / 128
-
-        int offset = pOffset;
-        final int max = pOffset + pLength - 1;
-        final int maxMinus1 = max - 1;
-
-        while (offset <= max) {
-            // Compressed run
-            int run = 1;
-            byte replicate = pBuffer[offset];
-            while (run < 127 && offset < max && pBuffer[offset] == pBuffer[offset + 1]) {
-                offset++;
-                run++;
-            }
-
-            if (run > 1) {
-                offset++;
-                pStream.write(-(run - 1));
-                pStream.write(replicate);
-            }
-
-            // Literal run
-            run = 0;
-            while ((run < 128 && ((offset < max && pBuffer[offset] != pBuffer[offset + 1])
-                    || (offset < maxMinus1 && pBuffer[offset] != pBuffer[offset + 2])))) {
-                buffer[run++] = pBuffer[offset++];
-            }
-
-            // If last byte, include it in literal run, if space
-            if (offset == max && run > 0 && run < 128) {
-                buffer[run++] = pBuffer[offset++];
-            }
-
-            if (run > 0) {
-                pStream.write(run - 1);
-                pStream.write(buffer, 0, run);
-            }
-
-            // If last byte, and not space, start new literal run
-            if (offset == max && (run <= 0 || run >= 128)) {
-                pStream.write(0);
-                pStream.write(pBuffer[offset++]);
-            }
-        }
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io.enc;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+
+/**
+ * Encoder implementation for Apple PackBits run-length encoding.
+ * <p>
+ * From Wikipedia, the free encyclopedia
+ * <br>
+ * PackBits is a fast, simple compression scheme for run-length encoding of
+ * data.
+ * </p>
+ * <p>
+ * Apple introduced the PackBits format with the release of MacPaint on the
+ * Macintosh computer. This compression scheme is one of the types of
+ * compression that can be used in TIFF-files.
+ * </p>
+ * <p>
+ * A PackBits data stream consists of packets of one byte of header followed by
+ * data. The header is a signed byte; the data can be signed, unsigned, or
+ * packed (such as MacPaint pixels).
+ * </p>
+ * <table>
+ *     <caption>PackBits</caption>
+ *     <tr><th>Header byte</th><th>Data</th></tr>
+ *     <tr><td>0 to 127</td>    <td>1 + <i>n</i> literal bytes of data</td></tr>
+ *     <tr><td>0 to -127</td>   <td>One byte of data, repeated 1 - <i>n</i> times in     the decompressed output</td></tr>
+ *     <tr><td>-128</td>        <td>No operation</td></tr>
+ * </table>
+ * <p>
+ * Note that interpreting 0 as positive or negative makes no difference in the
+ * output. Runs of two bytes adjacent to non-runs are typically written as
+ * literal data.
+ * </p>
+ *
+ * @see <a href="http://developer.apple.com/technotes/tn/tn1023.html">Understanding PackBits</a>
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsEncoder.java#1 $
+ */
+public final class PackBitsEncoder implements Encoder {
+
+    final private byte[] buffer = new byte[128];
+
+    /**
+     * Creates a {@code PackBitsEncoder}.
+     */
+    public PackBitsEncoder() {
+    }
+
+    public void encode(final OutputStream stream, final ByteBuffer buffer) throws IOException {
+        encode(stream, buffer.array(), buffer.arrayOffset() + buffer.position(), buffer.remaining());
+        buffer.position(buffer.remaining());
+    }
+
+    private void encode(OutputStream pStream, byte[] pBuffer, int pOffset, int pLength) throws IOException {
+        // NOTE: It's best to encode a 2 byte repeat
+        // run as a replicate run except when preceded and followed by a
+        // literal run, in which case it's best to merge the three into one
+        // literal run. Always encode 3 byte repeats as replicate runs.
+        // NOTE: Worst case: output = input + (input + 127) / 128
+
+        int offset = pOffset;
+        final int max = pOffset + pLength - 1;
+        final int maxMinus1 = max - 1;
+
+        while (offset <= max) {
+            // Compressed run
+            int run = 1;
+            byte replicate = pBuffer[offset];
+            while (run < 127 && offset < max && pBuffer[offset] == pBuffer[offset + 1]) {
+                offset++;
+                run++;
+            }
+
+            if (run > 1) {
+                offset++;
+                pStream.write(-(run - 1));
+                pStream.write(replicate);
+            }
+
+            // Literal run
+            run = 0;
+            while ((run < 128 && ((offset < max && pBuffer[offset] != pBuffer[offset + 1])
+                    || (offset < maxMinus1 && pBuffer[offset] != pBuffer[offset + 2])))) {
+                buffer[run++] = pBuffer[offset++];
+            }
+
+            // If last byte, include it in literal run, if space
+            if (offset == max && run > 0 && run < 128) {
+                buffer[run++] = pBuffer[offset++];
+            }
+
+            if (run > 0) {
+                pStream.write(run - 1);
+                pStream.write(buffer, 0, run);
+            }
+
+            // If last byte, and not space, start new literal run
+            if (offset == max && (run <= 0 || run >= 128)) {
+                pStream.write(0);
+                pStream.write(pBuffer[offset++]);
+            }
+        }
+    }
+}
@@ -1,342 +1,344 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.io.ole2;
-
-import com.twelvemonkeys.io.SeekableInputStream;
-
-import java.io.DataInput;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.Collections;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * Represents an OLE 2 compound document entry.
- * This is similar to a file in a file system, or an entry in a ZIP or JAR file.
- *
- * @author <a href="mailto:harald.kuhr@gmail.no">Harald Kuhr</a>
- * @author last modified by $Author: haku $
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/Entry.java#4 $
- * @see com.twelvemonkeys.io.ole2.CompoundDocument
- */
-// TODO: Consider extending java.io.File...
-public final class Entry implements Comparable<Entry> {
-    String name;
-    byte type;
-    byte nodeColor;
-
-    int prevDId;
-    int nextDId;
-    int rootNodeDId;
-
-    long createdTimestamp;
-    long modifiedTimestamp;
-
-    int startSId;
-    int streamSize;
-
-    CompoundDocument document;
-    Entry parent;
-    SortedSet<Entry> children;
-
-    public final static int LENGTH = 128;
-
-    static final int EMPTY = 0;
-    static final int USER_STORAGE = 1;
-    static final int USER_STREAM = 2;
-    static final int LOCK_BYTES = 3;
-    static final int PROPERTY = 4;
-    static final int ROOT_STORAGE = 5;
-
-    private static final SortedSet<Entry> NO_CHILDREN = Collections.unmodifiableSortedSet(new TreeSet<Entry>());
-
-    private Entry() {
-    }
-
-    /**
-     * Reads an entry from the input.
-     *
-     * @param pInput the input data
-     * @return the {@code Entry} read from the input data
-     * @throws IOException if an i/o exception occurs during reading
-     */
-    static Entry readEntry(final DataInput pInput) throws IOException {
-        Entry p = new Entry();
-        p.read(pInput);
-        return p;
-    }
-
-    /**
-     * Reads this entry
-     *
-     * @param pInput the input data
-     * @throws IOException if an i/o exception occurs during reading
-     */
-    private void read(final DataInput pInput) throws IOException {
-        byte[] bytes = new byte[64];
-        pInput.readFully(bytes);
-
-        // NOTE: Length is in bytes, including the null-terminator...
-        int nameLength = pInput.readShort();
-        name = new String(bytes, 0, nameLength - 2, Charset.forName("UTF-16LE"));
-//        System.out.println("name: " + name);
-
-        type = pInput.readByte();
-//        System.out.println("type: " + type);
-
-        nodeColor = pInput.readByte();
-//        System.out.println("nodeColor: " + nodeColor);
-
-        prevDId = pInput.readInt();
-//        System.out.println("prevDId: " + prevDId);
-        nextDId = pInput.readInt();
-//        System.out.println("nextDId: " + nextDId);
-        rootNodeDId = pInput.readInt();
-//        System.out.println("rootNodeDId: " + rootNodeDId);
-
-        // UID (16) + user flags (4), ignored
-        if (pInput.skipBytes(20) != 20) {
-            throw new CorruptDocumentException();
-        }
-
-        createdTimestamp = CompoundDocument.toJavaTimeInMillis(pInput.readLong());
-        modifiedTimestamp = CompoundDocument.toJavaTimeInMillis(pInput.readLong());
-
-        startSId = pInput.readInt();
-//        System.out.println("startSId: " + startSId);
-        streamSize = pInput.readInt();
-//        System.out.println("streamSize: " + streamSize);
-
-        // Reserved
-        pInput.readInt();
-    }
-
-    /**
-     * If {@code true} this {@code Entry} is the root {@code Entry}.
-     *
-     * @return {@code true} if this is the root {@code Entry}
-     */
-    public boolean isRoot() {
-        return type == ROOT_STORAGE;
-    }
-
-    /**
-     * If {@code true} this {@code Entry} is a directory
-     * {@code Entry}.
-     *
-     * @return {@code true} if this is a directory {@code Entry}
-     */
-    public boolean isDirectory() {
-        return type == USER_STORAGE;
-    }
-
-    /**
-     * If {@code true} this {@code Entry} is a file (document)
-     * {@code Entry}.
-     *
-     * @return {@code true} if this is a document {@code Entry}
-     */
-    public boolean isFile() {
-        return type == USER_STREAM;
-    }
-
-    /**
-     * Returns the name of this {@code Entry}
-     *
-     * @return the name of this {@code Entry}
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Returns the {@code InputStream} for this {@code Entry}
-     *
-     * @return an {@code InputStream} containing the data for this
-     *         {@code Entry} or {@code null} if this is a directory {@code Entry}
-     * @throws java.io.IOException if an I/O exception occurs
-     * @see #length()
-     */
-    public SeekableInputStream getInputStream() throws IOException {
-        if (!isFile()) {
-            return null;
-        }
-
-        return document.getInputStreamForSId(startSId, streamSize);
-    }
-
-    /**
-     * Returns the length of this entry
-     *
-     * @return the length of the stream for this entry, or {@code 0} if this is
-     *         a directory {@code Entry}
-     * @see #getInputStream()
-     */
-    public long length() {
-        if (!isFile()) {
-            return 0L;
-        }
-
-        return streamSize;
-    }
-
-    /**
-     * Returns the time that this entry was created.
-     * The time is converted from its internal representation to standard Java
-     * representation, milliseconds since the epoch
-     * (00:00:00 GMT, January 1, 1970).
-     * <p/>
-     * Note that most applications leaves this value empty ({@code 0L}).
-     *
-     * @return  A {@code long} value representing the time this entry was
-     *          created, measured in milliseconds since the epoch
-     *          (00:00:00 GMT, January 1, 1970), or {@code 0L} if no
-     *          creation time stamp exists for this entry.
-     */
-    public long created() {
-        return createdTimestamp;
-    }
-
-    /**
-     * Returns the time that this entry was last modified.
-     * The time is converted from its internal representation to standard Java
-     * representation, milliseconds since the epoch
-     * (00:00:00 GMT, January 1, 1970).
-     * <p/>
-     * Note that many applications leaves this value empty ({@code 0L}).
-     *
-     * @return  A {@code long} value representing the time this entry was
-     *          last modified, measured in milliseconds since the epoch
-     *          (00:00:00 GMT, January 1, 1970), or {@code 0L} if no
-     *          modification time stamp exists for this entry.
-     */
-    public long lastModified() {
-        return modifiedTimestamp;
-    }
-
-    /**
-     * Return the parent of this {@code Entry}
-     *
-     * @return the parent of this {@code Entry}, or {@code null} if this is
-     *         the root {@code Entry}
-     */
-    public Entry getParentEntry() {
-        return parent;
-    }
-
-    /**
-     * Returns the child of this {@code Entry} with the given name.
-     *
-     * @param pName the name of the child {@code Entry}
-     * @return the child {@code Entry} or {@code null} if thee is no such
-     *         child
-     * @throws java.io.IOException if an I/O exception occurs
-     */
-    public Entry getChildEntry(final String pName) throws IOException {
-        if (isFile() || rootNodeDId == -1) {
-            return null;
-        }
-
-        Entry dummy = new Entry();
-        dummy.name = pName;
-        dummy.parent = this;
-
-        SortedSet child = getChildEntries().tailSet(dummy);
-        return (Entry) child.first();
-    }
-
-    /**
-     * Returns the children of this {@code Entry}.
-     *
-     * @return a {@code SortedSet} of {@code Entry} objects
-     * @throws java.io.IOException if an I/O exception occurs
-     */
-    public SortedSet<Entry> getChildEntries() throws IOException {
-        if (children == null) {
-            if (isFile() || rootNodeDId == -1) {
-                children = NO_CHILDREN;
-            }
-            else {
-                // Start at root node in R/B tree, and read to the left and right,
-                // re-build tree, according to the docs
-                children = Collections.unmodifiableSortedSet(document.getEntries(rootNodeDId, this));
-            }
-        }
-
-        return children;
-    }
-
-    @Override
-    public String toString() {
-        return "\"" + name + "\""
-                + " (" + (isFile() ? "Document" : (isDirectory() ? "Directory" : "Root"))
-                + (parent != null ? ", parent: \"" + parent.getName() + "\"" : "")
-                + (isFile() ? "" : ", children: " + (children != null ? String.valueOf(children.size()) : "(unknown)"))
-                + ", SId=" + startSId + ", length=" + streamSize + ")";
-    }
-
-    @Override
-    public boolean equals(final Object pOther) {
-        if (pOther == this) {
-            return true;
-        }
-        if (!(pOther instanceof Entry)) {
-            return false;
-        }
-
-        Entry other = (Entry) pOther;
-        return name.equals(other.name) && (parent == other.parent
-                || (parent != null && parent.equals(other.parent)));
-    }
-
-    @Override
-    public int hashCode() {
-        return name.hashCode() ^ startSId;
-    }
-
-    public int compareTo(final Entry pOther) {
-        if (this == pOther) {
-            return 0;
-        }
-
-        // NOTE: This is the sorting algorthm defined by the Compound Document:
-        //  - first sort by name length
-        //  - if lengths are equal, sort by comparing strings, case sensitive 
-
-        int diff = name.length() - pOther.name.length();
-        if (diff != 0) {
-            return diff;
-        }
-
-        return name.compareTo(pOther.name);
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.io.ole2;
+
+import com.twelvemonkeys.io.SeekableInputStream;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Collections;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+/**
+ * Represents an OLE 2 compound document entry.
+ * This is similar to a file in a file system, or an entry in a ZIP or JAR file.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.no">Harald Kuhr</a>
+ * @author last modified by $Author: haku $
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/Entry.java#4 $
+ * @see com.twelvemonkeys.io.ole2.CompoundDocument
+ */
+// TODO: Consider extending java.io.File...
+public final class Entry implements Comparable<Entry> {
+    String name;
+    byte type;
+    byte nodeColor;
+
+    int prevDId;
+    int nextDId;
+    int rootNodeDId;
+
+    long createdTimestamp;
+    long modifiedTimestamp;
+
+    int startSId;
+    int streamSize;
+
+    CompoundDocument document;
+    Entry parent;
+    SortedSet<Entry> children;
+
+    public final static int LENGTH = 128;
+
+    static final int EMPTY = 0;
+    static final int USER_STORAGE = 1;
+    static final int USER_STREAM = 2;
+    static final int LOCK_BYTES = 3;
+    static final int PROPERTY = 4;
+    static final int ROOT_STORAGE = 5;
+
+    private static final SortedSet<Entry> NO_CHILDREN = Collections.unmodifiableSortedSet(new TreeSet<Entry>());
+
+    private Entry() {
+    }
+
+    /**
+     * Reads an entry from the input.
+     *
+     * @param pInput the input data
+     * @return the {@code Entry} read from the input data
+     * @throws IOException if an i/o exception occurs during reading
+     */
+    static Entry readEntry(final DataInput pInput) throws IOException {
+        Entry p = new Entry();
+        p.read(pInput);
+        return p;
+    }
+
+    /**
+     * Reads this entry
+     *
+     * @param pInput the input data
+     * @throws IOException if an i/o exception occurs during reading
+     */
+    private void read(final DataInput pInput) throws IOException {
+        byte[] bytes = new byte[64];
+        pInput.readFully(bytes);
+
+        // NOTE: Length is in bytes, including the null-terminator...
+        int nameLength = pInput.readShort();
+        name = new String(bytes, 0, nameLength - 2, Charset.forName("UTF-16LE"));
+//        System.out.println("name: " + name);
+
+        type = pInput.readByte();
+//        System.out.println("type: " + type);
+
+        nodeColor = pInput.readByte();
+//        System.out.println("nodeColor: " + nodeColor);
+
+        prevDId = pInput.readInt();
+//        System.out.println("prevDId: " + prevDId);
+        nextDId = pInput.readInt();
+//        System.out.println("nextDId: " + nextDId);
+        rootNodeDId = pInput.readInt();
+//        System.out.println("rootNodeDId: " + rootNodeDId);
+
+        // UID (16) + user flags (4), ignored
+        if (pInput.skipBytes(20) != 20) {
+            throw new CorruptDocumentException();
+        }
+
+        createdTimestamp = CompoundDocument.toJavaTimeInMillis(pInput.readLong());
+        modifiedTimestamp = CompoundDocument.toJavaTimeInMillis(pInput.readLong());
+
+        startSId = pInput.readInt();
+//        System.out.println("startSId: " + startSId);
+        streamSize = pInput.readInt();
+//        System.out.println("streamSize: " + streamSize);
+
+        // Reserved
+        pInput.readInt();
+    }
+
+    /**
+     * If {@code true} this {@code Entry} is the root {@code Entry}.
+     *
+     * @return {@code true} if this is the root {@code Entry}
+     */
+    public boolean isRoot() {
+        return type == ROOT_STORAGE;
+    }
+
+    /**
+     * If {@code true} this {@code Entry} is a directory
+     * {@code Entry}.
+     *
+     * @return {@code true} if this is a directory {@code Entry}
+     */
+    public boolean isDirectory() {
+        return type == USER_STORAGE;
+    }
+
+    /**
+     * If {@code true} this {@code Entry} is a file (document)
+     * {@code Entry}.
+     *
+     * @return {@code true} if this is a document {@code Entry}
+     */
+    public boolean isFile() {
+        return type == USER_STREAM;
+    }
+
+    /**
+     * Returns the name of this {@code Entry}
+     *
+     * @return the name of this {@code Entry}
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Returns the {@code InputStream} for this {@code Entry}
+     *
+     * @return an {@code InputStream} containing the data for this
+     *         {@code Entry} or {@code null} if this is a directory {@code Entry}
+     * @throws java.io.IOException if an I/O exception occurs
+     * @see #length()
+     */
+    public SeekableInputStream getInputStream() throws IOException {
+        if (!isFile()) {
+            return null;
+        }
+
+        return document.getInputStreamForSId(startSId, streamSize);
+    }
+
+    /**
+     * Returns the length of this entry
+     *
+     * @return the length of the stream for this entry, or {@code 0} if this is
+     *         a directory {@code Entry}
+     * @see #getInputStream()
+     */
+    public long length() {
+        if (!isFile()) {
+            return 0L;
+        }
+
+        return streamSize;
+    }
+
+    /**
+     * Returns the time that this entry was created.
+     * The time is converted from its internal representation to standard Java
+     * representation, milliseconds since the epoch
+     * (00:00:00 GMT, January 1, 1970).
+     * <p>
+     * Note that most applications leaves this value empty ({@code 0L}).
+     * </p>
+     *
+     * @return  A {@code long} value representing the time this entry was
+     *          created, measured in milliseconds since the epoch
+     *          (00:00:00 GMT, January 1, 1970), or {@code 0L} if no
+     *          creation time stamp exists for this entry.
+     */
+    public long created() {
+        return createdTimestamp;
+    }
+
+    /**
+     * Returns the time that this entry was last modified.
+     * The time is converted from its internal representation to standard Java
+     * representation, milliseconds since the epoch
+     * (00:00:00 GMT, January 1, 1970).
+     * <p>
+     * Note that many applications leaves this value empty ({@code 0L}).
+     * </p>
+     *
+     * @return  A {@code long} value representing the time this entry was
+     *          last modified, measured in milliseconds since the epoch
+     *          (00:00:00 GMT, January 1, 1970), or {@code 0L} if no
+     *          modification time stamp exists for this entry.
+     */
+    public long lastModified() {
+        return modifiedTimestamp;
+    }
+
+    /**
+     * Return the parent of this {@code Entry}
+     *
+     * @return the parent of this {@code Entry}, or {@code null} if this is
+     *         the root {@code Entry}
+     */
+    public Entry getParentEntry() {
+        return parent;
+    }
+
+    /**
+     * Returns the child of this {@code Entry} with the given name.
+     *
+     * @param pName the name of the child {@code Entry}
+     * @return the child {@code Entry} or {@code null} if thee is no such
+     *         child
+     * @throws java.io.IOException if an I/O exception occurs
+     */
+    public Entry getChildEntry(final String pName) throws IOException {
+        if (isFile() || rootNodeDId == -1) {
+            return null;
+        }
+
+        Entry dummy = new Entry();
+        dummy.name = pName;
+        dummy.parent = this;
+
+        SortedSet child = getChildEntries().tailSet(dummy);
+        return (Entry) child.first();
+    }
+
+    /**
+     * Returns the children of this {@code Entry}.
+     *
+     * @return a {@code SortedSet} of {@code Entry} objects
+     * @throws java.io.IOException if an I/O exception occurs
+     */
+    public SortedSet<Entry> getChildEntries() throws IOException {
+        if (children == null) {
+            if (isFile() || rootNodeDId == -1) {
+                children = NO_CHILDREN;
+            }
+            else {
+                // Start at root node in R/B tree, and read to the left and right,
+                // re-build tree, according to the docs
+                children = Collections.unmodifiableSortedSet(document.getEntries(rootNodeDId, this));
+            }
+        }
+
+        return children;
+    }
+
+    @Override
+    public String toString() {
+        return "\"" + name + "\""
+                + " (" + (isFile() ? "Document" : (isDirectory() ? "Directory" : "Root"))
+                + (parent != null ? ", parent: \"" + parent.getName() + "\"" : "")
+                + (isFile() ? "" : ", children: " + (children != null ? String.valueOf(children.size()) : "(unknown)"))
+                + ", SId=" + startSId + ", length=" + streamSize + ")";
+    }
+
+    @Override
+    public boolean equals(final Object pOther) {
+        if (pOther == this) {
+            return true;
+        }
+        if (!(pOther instanceof Entry)) {
+            return false;
+        }
+
+        Entry other = (Entry) pOther;
+        return name.equals(other.name) && (parent == other.parent
+                || (parent != null && parent.equals(other.parent)));
+    }
+
+    @Override
+    public int hashCode() {
+        return name.hashCode() ^ startSId;
+    }
+
+    public int compareTo(final Entry pOther) {
+        if (this == pOther) {
+            return 0;
+        }
+
+        // NOTE: This is the sorting algorthm defined by the Compound Document:
+        //  - first sort by name length
+        //  - if lengths are equal, sort by comparing strings, case sensitive 
+
+        int diff = name.length() - pOther.name.length();
+        if (diff != 0) {
+            return diff;
+        }
+
+        return name.compareTo(pOther.name);
+    }
+}
@@ -1,314 +1,313 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.net;
-
-import com.twelvemonkeys.lang.StringUtil;
-import com.twelvemonkeys.lang.SystemUtil;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * Contains mappings from file extension to mime-types and from mime-type to file-types.
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/MIMEUtil.java#5 $
- *
- * @see <A href="http://www.iana.org/assignments/media-types/">MIME Media Types</A>
- */
-public final class MIMEUtil {
-    // TODO: Piggy-back on the mappings form the JRE? (1.6 comes with javax.activation)
-    // TODO: Piggy-back on mappings from javax.activation?
-    // See: http://java.sun.com/j2ee/sdk_1.3/techdocs/api/javax/activation/MimetypesFileTypeMap.html
-    // See: http://java.sun.com/javase/6/docs/api/javax/activation/MimetypesFileTypeMap.html
-    // TODO: Use the format (and lookup) specified by the above URLs
-    // TODO: Allow 3rd party to add mappings? Will need application context support to do it safe.. :-P
-
-    private static Map<String, List<String>> sExtToMIME = new HashMap<String, List<String>>();
-    private static Map<String, List<String>> sUnmodifiableExtToMIME = Collections.unmodifiableMap(sExtToMIME);
-
-    private static Map<String, List<String>> sMIMEToExt = new HashMap<String, List<String>>();
-    private static Map<String, List<String>> sUnmodifiableMIMEToExt = Collections.unmodifiableMap(sMIMEToExt);
-
-    static {
-        // Load mapping for MIMEUtil
-        try {
-            Properties mappings = SystemUtil.loadProperties(MIMEUtil.class);
-
-            for (Map.Entry entry : mappings.entrySet()) {
-                // Convert and break up extensions and mimeTypes
-                String extStr = StringUtil.toLowerCase((String) entry.getKey());
-                List<String> extensions =
-                        Collections.unmodifiableList(Arrays.asList(StringUtil.toStringArray(extStr, ";, ")));
-
-                String typeStr = StringUtil.toLowerCase((String) entry.getValue());
-                List<String> mimeTypes =
-                        Collections.unmodifiableList(Arrays.asList(StringUtil.toStringArray(typeStr, ";, ")));
-
-                // TODO: Handle duplicates in MIME to extension mapping, like
-                // xhtml=application/xhtml+xml;application/xml
-                // xml=text/xml;application/xml
-
-                // Populate normal and reverse MIME-mappings
-                for (String extension : extensions) {
-                    sExtToMIME.put(extension, mimeTypes);
-                }
-
-                for (String mimeType : mimeTypes) {
-                    sMIMEToExt.put(mimeType, extensions);
-                }
-            }
-        }
-        catch (IOException e) {
-            System.err.println("Could not read properties for MIMEUtil: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    // Disallow construction
-    private MIMEUtil() {
-    }
-
-    /**
-     * Returns the default MIME type for the given file extension.
-     *
-     * @param pFileExt the file extension
-     *
-     * @return a {@code String} containing the MIME type, or {@code null} if
-     * there are no known MIME types for the given file extension.
-     */
-    public static String getMIMEType(final String pFileExt) {
-        List<String> types = sExtToMIME.get(StringUtil.toLowerCase(pFileExt));
-        return (types == null || types.isEmpty()) ? null : types.get(0);
-    }
-
-    /**
-     * Returns all MIME types for the given file extension.
-     *
-     * @param pFileExt the file extension
-     *
-     * @return a {@link List} of {@code String}s containing the MIME types, or an empty
-     * list, if there are no known MIME types for the given file extension.
-     */
-    public static List<String> getMIMETypes(final String pFileExt) {
-        List<String> types = sExtToMIME.get(StringUtil.toLowerCase(pFileExt));
-        return maskNull(types);
-    }
-
-    /**
-     * Returns an unmodifiabale {@link Map} view of the extension to
-     * MIME mapping, to use as the default mapping in client applications.
-     *
-     * @return an unmodifiabale {@code Map} view of the extension to
-     * MIME mapping.
-     */
-    public static Map<String, List<String>> getMIMETypeMappings() {
-        return sUnmodifiableExtToMIME;
-    }
-
-    /**
-     * Returns the default file extension for the given MIME type.
-     * Specifying a wildcard type will return {@code null}.
-     *
-     * @param pMIME the MIME type
-     *
-     * @return a {@code String} containing the file extension, or {@code null}
-     * if there are no known file extensions for the given MIME type.
-     */
-    public static String getExtension(final String pMIME) {
-        String mime = bareMIME(StringUtil.toLowerCase(pMIME));
-        List<String> extensions = sMIMEToExt.get(mime);
-        return (extensions == null || extensions.isEmpty()) ? null : extensions.get(0);
-    }
-
-    /**
-     * Returns all file extension for the given MIME type.
-     * The default extension will be the first in the list.
-     * Note that no specific order is given for wildcard types (image/*, *&#47;* etc).
-     *
-     * @param pMIME the MIME type
-     *
-     * @return a {@link List} of {@code String}s containing the MIME types, or an empty
-     * list, if there are no known file extensions for the given MIME type.
-     */
-    public static List<String> getExtensions(final String pMIME) {
-        String mime = bareMIME(StringUtil.toLowerCase(pMIME));
-        if (mime.endsWith("/*")) {
-            return getExtensionForWildcard(mime);
-        }
-        List<String> extensions = sMIMEToExt.get(mime);
-        return maskNull(extensions);
-    }
-
-    // Gets all extensions for a wildcard MIME type
-    private static List<String> getExtensionForWildcard(final String pMIME) {
-        final String family = pMIME.substring(0, pMIME.length() - 1);
-        Set<String> extensions = new LinkedHashSet<String>();
-        for (Map.Entry<String, List<String>> mimeToExt : sMIMEToExt.entrySet()) {
-            if ("*/".equals(family) || mimeToExt.getKey().startsWith(family)) {
-                extensions.addAll(mimeToExt.getValue());
-            }
-        }
-        return Collections.unmodifiableList(new ArrayList<String>(extensions));
-    }
-
-    /**
-     * Returns an unmodifiabale {@link Map} view of the MIME to
-     * extension mapping, to use as the default mapping in client applications.
-     *
-     * @return an unmodifiabale {@code Map} view of the MIME to
-     * extension mapping.
-     */
-    public static Map<String, List<String>> getExtensionMappings() {
-        return sUnmodifiableMIMEToExt;
-    }
-
-    /**
-     * Tests wehter the type is a subtype of the type family.
-     *
-     * @param pTypeFamily the MIME type family ({@code image/*, *&#47;*}, etc)
-     * @param pType the MIME type
-     * @return {@code true} if {@code pType} is a subtype of {@code pTypeFamily}, otherwise {@code false}
-     */
-    // TODO: Rename? isSubtype?
-    // TODO: Make public
-    static boolean includes(final String pTypeFamily, final String pType) {
-        // TODO: Handle null in a well-defined way
-        // - Is null family same as */*?
-        // - Is null subtype of any family? Subtype of no family?
-
-        String type = bareMIME(pType);
-        return type.equals(pTypeFamily)
-                || "*/*".equals(pTypeFamily)
-                || pTypeFamily.endsWith("/*") && pTypeFamily.startsWith(type.substring(0, type.indexOf('/')));
-    }
-
-    /**
-     * Removes any charset or extra info from the mime-type string (anything after a semicolon, {@code ;}, inclusive).
-     *
-     * @param pMIME the mime-type string
-     * @return the bare mime-type
-     */
-    public static String bareMIME(final String pMIME) {
-        int idx;
-        if (pMIME != null && (idx = pMIME.indexOf(';')) >= 0) {
-            return pMIME.substring(0, idx);
-        }
-        return pMIME;
-    }
-
-    // Returns the list or empty list if list is null
-    private static List<String> maskNull(List<String> pTypes) {
-        return (pTypes == null) ? Collections.<String>emptyList() : pTypes;
-    }
-
-    /**
-     * For debugging. Prints all known MIME types and file extensions.
-     *
-     * @param pArgs command line arguments
-     */
-    public static void main(String[] pArgs) {
-        if (pArgs.length > 1) {
-            String type = pArgs[0];
-            String family = pArgs[1];
-            boolean incuded = includes(family, type);
-            System.out.println(
-                    "Mime type family " + family
-                    + (incuded ? " includes " : " does not include ")
-                    + "type " + type
-            );
-        }
-        if (pArgs.length > 0) {
-            String str = pArgs[0];
-
-            if (str.indexOf('/') >= 0) {
-                // MIME
-                String extension = getExtension(str);
-                System.out.println("Default extension for MIME type '" + str + "' is "
-                        + (extension != null ? ": '" + extension + "'" : "unknown") + ".");
-                System.out.println("All possible: " + getExtensions(str));
-            }
-            else {
-                // EXT
-                String mimeType = getMIMEType(str);
-                System.out.println("Default MIME type for extension '" + str + "' is "
-                        + (mimeType != null ? ": '" + mimeType + "'" : "unknown") + ".");
-                System.out.println("All possible: " + getMIMETypes(str));
-            }
-
-            return;
-        }
-
-        Set set = sMIMEToExt.keySet();
-        String[] mimeTypes = new String[set.size()];
-        int i = 0;
-        for (Iterator iterator = set.iterator(); iterator.hasNext(); i++) {
-            String mime = (String) iterator.next();
-            mimeTypes[i] = mime;
-        }
-        Arrays.sort(mimeTypes);
-
-        System.out.println("Known MIME types (" + mimeTypes.length + "):");
-        for (int j = 0; j < mimeTypes.length; j++) {
-            String mimeType = mimeTypes[j];
-
-            if (j != 0) {
-                System.out.print(", ");
-            }
-
-            System.out.print(mimeType);
-        }
-
-        System.out.println("\n");
-
-        set = sExtToMIME.keySet();
-        String[] extensions = new String[set.size()];
-        i = 0;
-        for (Iterator iterator = set.iterator(); iterator.hasNext(); i++) {
-            String ext = (String) iterator.next();
-            extensions[i] = ext;
-        }
-        Arrays.sort(extensions);
-
-        System.out.println("Known file types (" + extensions.length + "):");
-        for (int j = 0; j < extensions.length; j++) {
-            String extension = extensions[j];
-
-            if (j != 0) {
-                System.out.print(", ");
-            }
-
-            System.out.print(extension);
-        }
-        System.out.println();
-    }
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.net;
+
+import com.twelvemonkeys.lang.StringUtil;
+import com.twelvemonkeys.lang.SystemUtil;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * Contains mappings from file extension to mime-types and from mime-type to file-types.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/MIMEUtil.java#5 $
+ *
+ * @see <A href="http://www.iana.org/assignments/media-types/">MIME Media Types</A>
+ */
+public final class MIMEUtil {
+    // TODO: Piggy-back on the mappings form the JRE? (1.6 comes with javax.activation)
+    // TODO: Piggy-back on mappings from javax.activation?
+    // See: http://java.sun.com/j2ee/sdk_1.3/techdocs/api/javax/activation/MimetypesFileTypeMap.html
+    // See: http://java.sun.com/javase/6/docs/api/javax/activation/MimetypesFileTypeMap.html
+    // TODO: Use the format (and lookup) specified by the above URLs
+    // TODO: Allow 3rd party to add mappings? Will need application context support to do it safe.. :-P
+
+    private static Map<String, List<String>> sExtToMIME = new HashMap<String, List<String>>();
+    private static Map<String, List<String>> sUnmodifiableExtToMIME = Collections.unmodifiableMap(sExtToMIME);
+
+    private static Map<String, List<String>> sMIMEToExt = new HashMap<String, List<String>>();
+    private static Map<String, List<String>> sUnmodifiableMIMEToExt = Collections.unmodifiableMap(sMIMEToExt);
+
+    static {
+        // Load mapping for MIMEUtil
+        try {
+            Properties mappings = SystemUtil.loadProperties(MIMEUtil.class);
+
+            for (Map.Entry entry : mappings.entrySet()) {
+                // Convert and break up extensions and mimeTypes
+                String extStr = StringUtil.toLowerCase((String) entry.getKey());
+                List<String> extensions =
+                        Collections.unmodifiableList(Arrays.asList(StringUtil.toStringArray(extStr, ";, ")));
+
+                String typeStr = StringUtil.toLowerCase((String) entry.getValue());
+                List<String> mimeTypes =
+                        Collections.unmodifiableList(Arrays.asList(StringUtil.toStringArray(typeStr, ";, ")));
+
+                // TODO: Handle duplicates in MIME to extension mapping, like
+                // xhtml=application/xhtml+xml;application/xml
+                // xml=text/xml;application/xml
+
+                // Populate normal and reverse MIME-mappings
+                for (String extension : extensions) {
+                    sExtToMIME.put(extension, mimeTypes);
+                }
+
+                for (String mimeType : mimeTypes) {
+                    sMIMEToExt.put(mimeType, extensions);
+                }
+            }
+        }
+        catch (IOException e) {
+            System.err.println("Could not read properties for MIMEUtil: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    // Disallow construction
+    private MIMEUtil() {
+    }
+
+    /**
+     * Returns the default MIME type for the given file extension.
+     *
+     * @param pFileExt the file extension
+     *
+     * @return a {@code String} containing the MIME type, or {@code null} if
+     * there are no known MIME types for the given file extension.
+     */
+    public static String getMIMEType(final String pFileExt) {
+        List<String> types = sExtToMIME.get(StringUtil.toLowerCase(pFileExt));
+        return (types == null || types.isEmpty()) ? null : types.get(0);
+    }
+
+    /**
+     * Returns all MIME types for the given file extension.
+     *
+     * @param pFileExt the file extension
+     *
+     * @return a {@link List} of {@code String}s containing the MIME types, or an empty
+     * list, if there are no known MIME types for the given file extension.
+     */
+    public static List<String> getMIMETypes(final String pFileExt) {
+        List<String> types = sExtToMIME.get(StringUtil.toLowerCase(pFileExt));
+        return maskNull(types);
+    }
+
+    /**
+     * Returns an unmodifiabale {@link Map} view of the extension to
+     * MIME mapping, to use as the default mapping in client applications.
+     *
+     * @return an unmodifiabale {@code Map} view of the extension to
+     * MIME mapping.
+     */
+    public static Map<String, List<String>> getMIMETypeMappings() {
+        return sUnmodifiableExtToMIME;
+    }
+
+    /**
+     * Returns the default file extension for the given MIME type.
+     * Specifying a wildcard type will return {@code null}.
+     *
+     * @param pMIME the MIME type
+     *
+     * @return a {@code String} containing the file extension, or {@code null}
+     * if there are no known file extensions for the given MIME type.
+     */
+    public static String getExtension(final String pMIME) {
+        String mime = bareMIME(StringUtil.toLowerCase(pMIME));
+        List<String> extensions = sMIMEToExt.get(mime);
+        return (extensions == null || extensions.isEmpty()) ? null : extensions.get(0);
+    }
+
+    /**
+     * Returns all file extension for the given MIME type.
+     * The default extension will be the first in the list.
+     * Note that no specific order is given for wildcard types (image/*, *&#47;* etc).
+     *
+     * @param pMIME the MIME type
+     *
+     * @return a {@link List} of {@code String}s containing the MIME types, or an empty
+     * list, if there are no known file extensions for the given MIME type.
+     */
+    public static List<String> getExtensions(final String pMIME) {
+        String mime = bareMIME(StringUtil.toLowerCase(pMIME));
+        if (mime.endsWith("/*")) {
+            return getExtensionForWildcard(mime);
+        }
+        List<String> extensions = sMIMEToExt.get(mime);
+        return maskNull(extensions);
+    }
+
+    // Gets all extensions for a wildcard MIME type
+    private static List<String> getExtensionForWildcard(final String pMIME) {
+        final String family = pMIME.substring(0, pMIME.length() - 1);
+        Set<String> extensions = new LinkedHashSet<String>();
+        for (Map.Entry<String, List<String>> mimeToExt : sMIMEToExt.entrySet()) {
+            if ("*/".equals(family) || mimeToExt.getKey().startsWith(family)) {
+                extensions.addAll(mimeToExt.getValue());
+            }
+        }
+        return Collections.unmodifiableList(new ArrayList<String>(extensions));
+    }
+
+    /**
+     * Returns an unmodifiabale {@link Map} view of the MIME to
+     * extension mapping, to use as the default mapping in client applications.
+     *
+     * @return an unmodifiabale {@code Map} view of the MIME to
+     * extension mapping.
+     */
+    public static Map<String, List<String>> getExtensionMappings() {
+        return sUnmodifiableMIMEToExt;
+    }
+
+    /**
+     * Tests wehter the type is a subtype of the type family.
+     *
+     * @param pTypeFamily the MIME type family ({@code image/*, *&#47;*}, etc)
+     * @param pType the MIME type
+     * @return {@code true} if {@code pType} is a subtype of {@code pTypeFamily}, otherwise {@code false}
+     */
+    // TODO: Rename? isSubtype?
+    // TODO: Make public
+    static boolean includes(final String pTypeFamily, final String pType) {
+        // TODO: Handle null in a well-defined way
+        // - Is null family same as */*?
+        // - Is null subtype of any family? Subtype of no family?
+
+        String type = bareMIME(pType);
+        return type.equals(pTypeFamily)
+                || "*/*".equals(pTypeFamily)
+                || pTypeFamily.endsWith("/*") && pTypeFamily.startsWith(type.substring(0, type.indexOf('/')));
+    }
+
+    /**
+     * Removes any charset or extra info from the mime-type string (anything after a semicolon, {@code ;}, inclusive).
+     *
+     * @param pMIME the mime-type string
+     * @return the bare mime-type
+     */
+    public static String bareMIME(final String pMIME) {
+        int idx;
+        if (pMIME != null && (idx = pMIME.indexOf(';')) >= 0) {
+            return pMIME.substring(0, idx);
+        }
+        return pMIME;
+    }
+
+    // Returns the list or empty list if list is null
+    private static List<String> maskNull(List<String> pTypes) {
+        return (pTypes == null) ? Collections.<String>emptyList() : pTypes;
+    }
+
+    /**
+     * For debugging. Prints all known MIME types and file extensions.
+     *
+     * @param pArgs command line arguments
+     */
+    public static void main(String[] pArgs) {
+        if (pArgs.length > 1) {
+            String type = pArgs[0];
+            String family = pArgs[1];
+            boolean incuded = includes(family, type);
+            System.out.println(
+                    "Mime type family " + family
+                    + (incuded ? " includes " : " does not include ")
+                    + "type " + type
+            );
+        }
+        if (pArgs.length > 0) {
+            String str = pArgs[0];
+
+            if (str.indexOf('/') >= 0) {
+                // MIME
+                String extension = getExtension(str);
+                System.out.println("Default extension for MIME type '" + str + "' is "
+                        + (extension != null ? ": '" + extension + "'" : "unknown") + ".");
+                System.out.println("All possible: " + getExtensions(str));
+            }
+            else {
+                // EXT
+                String mimeType = getMIMEType(str);
+                System.out.println("Default MIME type for extension '" + str + "' is "
+                        + (mimeType != null ? ": '" + mimeType + "'" : "unknown") + ".");
+                System.out.println("All possible: " + getMIMETypes(str));
+            }
+
+            return;
+        }
+
+        Set set = sMIMEToExt.keySet();
+        String[] mimeTypes = new String[set.size()];
+        int i = 0;
+        for (Iterator iterator = set.iterator(); iterator.hasNext(); i++) {
+            String mime = (String) iterator.next();
+            mimeTypes[i] = mime;
+        }
+        Arrays.sort(mimeTypes);
+
+        System.out.println("Known MIME types (" + mimeTypes.length + "):");
+        for (int j = 0; j < mimeTypes.length; j++) {
+            String mimeType = mimeTypes[j];
+
+            if (j != 0) {
+                System.out.print(", ");
+            }
+
+            System.out.print(mimeType);
+        }
+
+        System.out.println("\n");
+
+        set = sExtToMIME.keySet();
+        String[] extensions = new String[set.size()];
+        i = 0;
+        for (Iterator iterator = set.iterator(); iterator.hasNext(); i++) {
+            String ext = (String) iterator.next();
+            extensions[i] = ext;
+        }
+        Arrays.sort(extensions);
+
+        System.out.println("Known file types (" + extensions.length + "):");
+        for (int j = 0; j < extensions.length; j++) {
+            String extension = extensions[j];
+
+            if (j != 0) {
+                System.out.print(", ");
+            }
+
+            System.out.print(extension);
+        }
+        System.out.println();
+    }
 }
@@ -102,8 +102,9 @@ public final class DOMSerializer {
    /**
     * Specifies wether the serializer should use indentation and optimize for
     * readability.
-     * <p/>
-     * Note: This is a hint, and may be ignored by DOM implemenations. 
+     * <p>
+     * Note: This is a hint, and may be ignored by DOM implementations.
+     * </p>
     *
     * @param pPrettyPrint {@code true} to enable pretty printing
     */
@@ -389,9 +389,10 @@ public class XMLSerializer {
    private void writeDocument(final PrintWriter pOut, final Node pNode, final SerializationContext pContext) {
        // Document fragments might not have child nodes...
        if (pNode.hasChildNodes()) {
-            NodeList nodes = pNode.getChildNodes();
-            for (int i = 0; i < nodes.getLength(); i++) {
-                writeNodeRecursive(pOut, nodes.item(i), pContext);
+            Node child = pNode.getFirstChild();
+            while (child != null) {
+                writeNodeRecursive(pOut, child, pContext);
+                child = child.getNextSibling();
            }
        }
    }
@@ -448,9 +449,10 @@ public class XMLSerializer {
                pOut.println();
            }

-            NodeList children = pNode.getChildNodes();
-            for (int i = 0; i < children.getLength(); i++) {
-                writeNodeRecursive(pOut, children.item(i), pContext.push());
+            Node child = pNode.getFirstChild();
+            while (child != null) {
+                writeNodeRecursive(pOut, child, pContext.push());
+                child = child.getNextSibling();
            }

            if (!pContext.preserveSpace) {
@@ -72,64 +72,64 @@ public class CompoundDocumentTest {

    @Test
    public void testRoot() throws IOException {
-        CompoundDocument document = createTestDocument();
+        try (CompoundDocument document = createTestDocument()) {
+            Entry root = document.getRootEntry();

-        Entry root = document.getRootEntry();
-
-        assertNotNull(root);
-        assertEquals("Root Entry", root.getName());
-        assertTrue(root.isRoot());
-        assertFalse(root.isFile());
-        assertFalse(root.isDirectory());
-        assertEquals(0, root.length());
-        assertNull(root.getInputStream());
+            assertNotNull(root);
+            assertEquals("Root Entry", root.getName());
+            assertTrue(root.isRoot());
+            assertFalse(root.isFile());
+            assertFalse(root.isDirectory());
+            assertEquals(0, root.length());
+            assertNull(root.getInputStream());
+        }
    }

    @Test
    public void testContents() throws IOException {
-        CompoundDocument document = createTestDocument();
+        try (CompoundDocument document = createTestDocument()) {
+            Entry root = document.getRootEntry();

-        Entry root = document.getRootEntry();
+            assertNotNull(root);

-        assertNotNull(root);
+            SortedSet<Entry> children = new TreeSet<Entry>(root.getChildEntries());
+            assertEquals(25, children.size());

-        SortedSet<Entry> children = new TreeSet<Entry>(root.getChildEntries());
-        assertEquals(25, children.size());
-
-        // Weirdness in the file format, name is *written backwards* 1-24 + Catalog
-        for (String name : "1,2,3,4,5,6,7,8,9,01,02,11,12,21,22,31,32,41,42,51,61,71,81,91,Catalog".split(",")) {
-            assertEquals(name, children.first().getName());
-            children.remove(children.first());
+            // Weirdness in the file format, name is *written backwards* 1-24 + Catalog
+            for (String name : "1,2,3,4,5,6,7,8,9,01,02,11,12,21,22,31,32,41,42,51,61,71,81,91,Catalog".split(",")) {
+                assertEquals(name, children.first().getName());
+                children.remove(children.first());
+            }
        }
    }

    @Test(expected = UnsupportedOperationException.class)
    public void testChildEntriesUnmodifiable() throws IOException {
-        CompoundDocument document = createTestDocument();
+        try (CompoundDocument document = createTestDocument()) {
+            Entry root = document.getRootEntry();

-        Entry root = document.getRootEntry();
+            assertNotNull(root);

-        assertNotNull(root);
+            SortedSet<Entry> children = root.getChildEntries();

-        SortedSet<Entry> children = root.getChildEntries();
-
-        // Should not be allowed, as it modifies the internal structure
-        children.remove(children.first());
+            // Should not be allowed, as it modifies the internal structure
+            children.remove(children.first());
+        }
    }

    @Test
    public void testReadThumbsCatalogFile() throws IOException {
-        CompoundDocument document = createTestDocument();
+        try (CompoundDocument document = createTestDocument()) {
+            Entry root = document.getRootEntry();

-        Entry root = document.getRootEntry();
+            assertNotNull(root);
+            assertEquals(25, root.getChildEntries().size());

-        assertNotNull(root);
-        assertEquals(25, root.getChildEntries().size());
+            Entry catalog = root.getChildEntry("Catalog");

-        Entry catalog = root.getChildEntry("Catalog");
-
-        assertNotNull(catalog);
-        assertNotNull("Input stream may not be null", catalog.getInputStream());
+            assertNotNull(catalog);
+            assertNotNull("Input stream may not be null", catalog.getInputStream());
+        }
    }

    @Test
@@ -51,35 +51,7 @@ import static org.junit.Assert.*;
 * @author last modified by $Author: haraldk$
 * @version $Id: CompoundDocument_StreamTestCase.java,v 1.0 13.10.11 12:01 haraldk Exp$
 */
-//@Ignore("Need proper in-memory creation of CompoundDocuments")
 public class CompoundDocument_StreamTest extends InputStreamAbstractTest {
-    private static final String SAMPLE_DATA = "/Thumbs-camera.db";
-
-    protected final CompoundDocument createTestDocument() throws IOException {
-        URL input = getClass().getResource(SAMPLE_DATA);
-
-        assertNotNull("Missing test resource!", input);
-        assertEquals("Test resource not a file:// resource", "file", input.getProtocol());
-
-        try {
-            return new CompoundDocument(new File(input.toURI()));
-        }
-        catch (URISyntaxException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    private SeekableInputStream createRealInputStream() {
-        try {
-            Entry first = createTestDocument().getRootEntry().getChildEntries().first();
-            assertNotNull(first);
-            return first.getInputStream();
-        }
-        catch (IOException e) {
-            throw new AssertionError(e);
-        }
-    }
-
    @Override
    protected InputStream makeInputStream(byte[] data) {
        try {
@@ -182,15 +154,13 @@ public class CompoundDocument_StreamTest extends InputStreamAbstractTest {
        return pad;
    }

-//    @Ignore
    @Test
-    public void testDev() throws IOException {
+    public void testStreamRead() throws IOException {
        InputStream stream = makeInputStream(makeOrderedArray(32));

        int read;
        int count = 0;
        while ((read = stream.read()) >= 0) {
-//            System.out.printf("read %02d: 0x%02x%n", count, read & 0xFF);
            assertEquals(count, read);
            count++;
        }
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.twelvemonkeys.common</groupId>
        <artifactId>common</artifactId>
-        <version>3.4</version>
+        <version>3.4.4-SNAPSHOT</version>
    </parent>
    <artifactId>common-lang</artifactId>
    <packaging>jar</packaging>
@@ -1,204 +1,203 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.lang;
-
-import java.util.Date;
-import java.util.TimeZone;
-
-/**
- * A utility class with useful date manipulation methods and constants.
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/DateUtil.java#1 $
- */
-public final class DateUtil {
-
-    /** One second: 1000 milliseconds. */
-    public static final long SECOND = 1000l;
-
-    /** One minute: 60 seconds (60 000 milliseconds). */
-    public static final long MINUTE = 60l * SECOND;
-
-    /**
-     * One hour: 60 minutes (3 600 000 milliseconds).
-     * 60 minutes = 3 600 seconds = 3 600 000 milliseconds
-     */
-    public static final long HOUR = 60l * MINUTE;
-
-    /**
-     * One day: 24 hours (86 400 000 milliseconds).
-     * 24 hours = 1 440 minutes = 86 400 seconds = 86 400 000 milliseconds.
-     */
-    public static final long DAY = 24l * HOUR;
-
-    /**
-     * One calendar year: 365.2425 days (31556952000 milliseconds).
-     * 365.2425 days = 8765.82 hours = 525949.2 minutes = 31556952 seconds
-     * = 31556952000 milliseconds.
-     */
-    public static final long CALENDAR_YEAR = 3652425l * 24l * 60l * 6l;
-
-    private DateUtil() {
-    }
-
-    /**
-     * Returns the time between the given start time and now (as defined by
-     * {@link System#currentTimeMillis()}).
-     *
-     * @param pStart the start time
-     *
-     * @return the time between the given start time and now.
-     */
-    public static long delta(long pStart) {
-        return System.currentTimeMillis() - pStart;
-    }
-
-    /**
-     * Returns the time between the given start time and now (as defined by
-     * {@link System#currentTimeMillis()}).
-     *
-     * @param pStart the start time
-     *
-     * @return the time between the given start time and now.
-     */
-    public static long delta(Date pStart) {
-        return System.currentTimeMillis() - pStart.getTime();
-    }
-
-    /**
-     * Gets the current time, rounded down to the closest second.
-     * Equivalent to invoking
-     * {@code roundToSecond(System.currentTimeMillis())}.
-     *
-     * @return the current time, rounded to the closest second.
-     */
-    public static long currentTimeSecond() {
-        return roundToSecond(System.currentTimeMillis());
-    }
-
-    /**
-     * Gets the current time, rounded down to the closest minute.
-     * Equivalent to invoking
-     * {@code roundToMinute(System.currentTimeMillis())}.
-     *
-     * @return the current time, rounded to the closest minute.
-     */
-    public static long currentTimeMinute() {
-        return roundToMinute(System.currentTimeMillis());
-    }
-
-    /**
-     * Gets the current time, rounded down to the closest hour.
-     * Equivalent to invoking
-     * {@code roundToHour(System.currentTimeMillis())}.
-     *
-     * @return the current time, rounded to the closest hour.
-     */
-    public static long currentTimeHour() {
-        return roundToHour(System.currentTimeMillis());
-    }
-
-    /**
-     * Gets the current time, rounded down to the closest day.
-     * Equivalent to invoking
-     * {@code roundToDay(System.currentTimeMillis())}.
-     *
-     * @return the current time, rounded to the closest day.
-     */
-    public static long currentTimeDay() {
-        return roundToDay(System.currentTimeMillis());
-    }
-
-    /**
-     * Rounds the given time down to the closest second.
-     *
-     * @param pTime time
-     * @return the time rounded to the closest second.
-     */
-    public static long roundToSecond(final long pTime) {
-        return (pTime / SECOND) * SECOND;
-    }
-
-    /**
-     * Rounds the given time down to the closest minute.
-     *
-     * @param pTime time
-     * @return the time rounded to the closest minute.
-     */
-    public static long roundToMinute(final long pTime) {
-        return (pTime / MINUTE) * MINUTE;
-    }
-
-    /**
-     * Rounds the given time down to the closest hour, using the default timezone.
-     *
-     * @param pTime time
-     * @return the time rounded to the closest hour.
-     */
-    public static long roundToHour(final long pTime) {
-        return roundToHour(pTime, TimeZone.getDefault());
-    }
-
-    /**
-     * Rounds the given time down to the closest hour, using the given timezone.
-     *
-     * @param pTime time
-     * @param pTimeZone the timezone to use when rounding
-     * @return the time rounded to the closest hour.
-     */
-    public static long roundToHour(final long pTime, final TimeZone pTimeZone) {
-        int offset = pTimeZone.getOffset(pTime);
-        return ((pTime / HOUR) * HOUR) - offset;
-    }
-
-    /**
-     * Rounds the given time down to the closest day, using the default timezone.
-     *
-     * @param pTime time
-     * @return the time rounded to the closest day.
-     */
-    public static long roundToDay(final long pTime) {
-        return roundToDay(pTime, TimeZone.getDefault());
-    }
-
-    /**
-     * Rounds the given time down to the closest day, using the given timezone.
-     *
-     * @param pTime time
-     * @param pTimeZone the timezone to use when rounding
-     * @return the time rounded to the closest day.
-     */
-    public static long roundToDay(final long pTime, final TimeZone pTimeZone) {
-        int offset = pTimeZone.getOffset(pTime);
-        return (((pTime  + offset) / DAY) * DAY) - offset;
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.lang;
+
+import java.util.Date;
+import java.util.TimeZone;
+
+/**
+ * A utility class with useful date manipulation methods and constants.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/DateUtil.java#1 $
+ */
+public final class DateUtil {
+
+    /** One second: 1000 milliseconds. */
+    public static final long SECOND = 1000l;
+
+    /** One minute: 60 seconds (60 000 milliseconds). */
+    public static final long MINUTE = 60l * SECOND;
+
+    /**
+     * One hour: 60 minutes (3 600 000 milliseconds).
+     * 60 minutes = 3 600 seconds = 3 600 000 milliseconds
+     */
+    public static final long HOUR = 60l * MINUTE;
+
+    /**
+     * One day: 24 hours (86 400 000 milliseconds).
+     * 24 hours = 1 440 minutes = 86 400 seconds = 86 400 000 milliseconds.
+     */
+    public static final long DAY = 24l * HOUR;
+
+    /**
+     * One calendar year: 365.2425 days (31556952000 milliseconds).
+     * 365.2425 days = 8765.82 hours = 525949.2 minutes = 31556952 seconds
+     * = 31556952000 milliseconds.
+     */
+    public static final long CALENDAR_YEAR = 3652425l * 24l * 60l * 6l;
+
+    private DateUtil() {
+    }
+
+    /**
+     * Returns the time between the given start time and now (as defined by
+     * {@link System#currentTimeMillis()}).
+     *
+     * @param pStart the start time
+     *
+     * @return the time between the given start time and now.
+     */
+    public static long delta(long pStart) {
+        return System.currentTimeMillis() - pStart;
+    }
+
+    /**
+     * Returns the time between the given start time and now (as defined by
+     * {@link System#currentTimeMillis()}).
+     *
+     * @param pStart the start time
+     *
+     * @return the time between the given start time and now.
+     */
+    public static long delta(Date pStart) {
+        return System.currentTimeMillis() - pStart.getTime();
+    }
+
+    /**
+     * Gets the current time, rounded down to the closest second.
+     * Equivalent to invoking
+     * {@code roundToSecond(System.currentTimeMillis())}.
+     *
+     * @return the current time, rounded to the closest second.
+     */
+    public static long currentTimeSecond() {
+        return roundToSecond(System.currentTimeMillis());
+    }
+
+    /**
+     * Gets the current time, rounded down to the closest minute.
+     * Equivalent to invoking
+     * {@code roundToMinute(System.currentTimeMillis())}.
+     *
+     * @return the current time, rounded to the closest minute.
+     */
+    public static long currentTimeMinute() {
+        return roundToMinute(System.currentTimeMillis());
+    }
+
+    /**
+     * Gets the current time, rounded down to the closest hour.
+     * Equivalent to invoking
+     * {@code roundToHour(System.currentTimeMillis())}.
+     *
+     * @return the current time, rounded to the closest hour.
+     */
+    public static long currentTimeHour() {
+        return roundToHour(System.currentTimeMillis());
+    }
+
+    /**
+     * Gets the current time, rounded down to the closest day.
+     * Equivalent to invoking
+     * {@code roundToDay(System.currentTimeMillis())}.
+     *
+     * @return the current time, rounded to the closest day.
+     */
+    public static long currentTimeDay() {
+        return roundToDay(System.currentTimeMillis());
+    }
+
+    /**
+     * Rounds the given time down to the closest second.
+     *
+     * @param pTime time
+     * @return the time rounded to the closest second.
+     */
+    public static long roundToSecond(final long pTime) {
+        return (pTime / SECOND) * SECOND;
+    }
+
+    /**
+     * Rounds the given time down to the closest minute.
+     *
+     * @param pTime time
+     * @return the time rounded to the closest minute.
+     */
+    public static long roundToMinute(final long pTime) {
+        return (pTime / MINUTE) * MINUTE;
+    }
+
+    /**
+     * Rounds the given time down to the closest hour, using the default timezone.
+     *
+     * @param pTime time
+     * @return the time rounded to the closest hour.
+     */
+    public static long roundToHour(final long pTime) {
+        return roundToHour(pTime, TimeZone.getDefault());
+    }
+
+    /**
+     * Rounds the given time down to the closest hour, using the given timezone.
+     *
+     * @param pTime time
+     * @param pTimeZone the timezone to use when rounding
+     * @return the time rounded to the closest hour.
+     */
+    public static long roundToHour(final long pTime, final TimeZone pTimeZone) {
+        int offset = pTimeZone.getOffset(pTime);
+        return ((pTime / HOUR) * HOUR) - offset;
+    }
+
+    /**
+     * Rounds the given time down to the closest day, using the default timezone.
+     *
+     * @param pTime time
+     * @return the time rounded to the closest day.
+     */
+    public static long roundToDay(final long pTime) {
+        return roundToDay(pTime, TimeZone.getDefault());
+    }
+
+    /**
+     * Rounds the given time down to the closest day, using the given timezone.
+     *
+     * @param pTime time
+     * @param pTimeZone the timezone to use when rounding
+     * @return the time rounded to the closest day.
+     */
+    public static long roundToDay(final long pTime, final TimeZone pTimeZone) {
+        int offset = pTimeZone.getOffset(pTime);
+        return (((pTime  + offset) / DAY) * DAY) - offset;
+    }
+}
@@ -199,9 +199,10 @@ public final class Platform {

    /**
     * Enumeration of common System {@code Architecture}s.
-     * <p/>
+     * <p>
     * For {@link #Unknown unknown architectures}, {@code toString()} will return
     * the the same value as {@code System.getProperty("os.arch")}.
+     * </p>
     *
     * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
     * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/Platform.java#1 $
@@ -228,9 +229,10 @@ public final class Platform {

    /**
     * Enumeration of common {@code OperatingSystem}s.
-     * <p/>
+     * <p>
     * For {@link #Unknown unknown operating systems}, {@code getName()} will return
     * the the same value as {@code System.getProperty("os.name")}.
+     * </p>
     *
     * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
     * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/Platform.java#1 $
@@ -1,139 +1,140 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.lang;
-
-/**
- * Util class for various reflection-based operations.
- * <p/>
- * <em>NOTE: This class is not considered part of the public API and may be
- * changed without notice</em>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/ReflectUtil.java#1 $
- */
-public final class ReflectUtil {
-
-    /** Don't allow instances */
-    private ReflectUtil() {}
-
-    /**
-     * Returns the primitive type for the given wrapper type.
-     *
-     * @param pType the wrapper type
-     *
-     * @return the primitive type
-     *
-     * @throws IllegalArgumentException if {@code pType} is not a primitive
-     * wrapper
-     */
-    public static Class unwrapType(Class pType) {
-        if (pType == Boolean.class) {
-            return Boolean.TYPE;
-        }
-        else if (pType == Byte.class) {
-            return Byte.TYPE;
-        }
-        else if (pType == Character.class) {
-            return Character.TYPE;
-        }
-        else if (pType == Double.class) {
-            return Double.TYPE;
-        }
-        else if (pType == Float.class) {
-            return Float.TYPE;
-        }
-        else if (pType == Integer.class) {
-            return Integer.TYPE;
-        }
-        else if (pType == Long.class) {
-            return Long.TYPE;
-        }
-        else if (pType == Short.class) {
-            return Short.TYPE;
-        }
-
-        throw new IllegalArgumentException("Not a primitive wrapper: " + pType);
-    }
-
-    /**
-     * Returns the wrapper type for the given primitive type.
-     *
-     * @param pType the primitive tpye
-     *
-     * @return the wrapper type
-     *
-     * @throws IllegalArgumentException if {@code pType} is not a primitive
-     * type
-     */
-    public static Class wrapType(Class pType) {
-        if (pType == Boolean.TYPE) {
-            return Boolean.class;
-        }
-        else if (pType == Byte.TYPE) {
-            return Byte.class;
-        }
-        else if (pType == Character.TYPE) {
-            return Character.class;
-        }
-        else if (pType == Double.TYPE) {
-            return Double.class;
-        }
-        else if (pType == Float.TYPE) {
-            return Float.class;
-        }
-        else if (pType == Integer.TYPE) {
-            return Integer.class;
-        }
-        else if (pType == Long.TYPE) {
-            return Long.class;
-        }
-        else if (pType == Short.TYPE) {
-            return Short.class;
-        }
-
-        throw new IllegalArgumentException("Not a primitive type: " + pType);
-    }
-
-    /**
-     * Returns {@code true} if the given type is a primitive wrapper.
-     *
-     * @param pType
-     *
-     * @return {@code true} if the given type is a primitive wrapper, otherwise
-     * {@code false}
-     */
-    public static boolean isPrimitiveWrapper(Class pType) {
-        return pType == Boolean.class || pType == Byte.class
-                || pType == Character.class || pType == Double.class
-                || pType == Float.class || pType == Integer.class
-                || pType == Long.class || pType == Short.class;
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.lang;
+
+/**
+ * Util class for various reflection-based operations.
+ * <p>
+ * <em>NOTE: This class is not considered part of the public API and may be
+ * changed without notice</em>
+ * </p>
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/ReflectUtil.java#1 $
+ */
+public final class ReflectUtil {
+
+    /** Don't allow instances */
+    private ReflectUtil() {}
+
+    /**
+     * Returns the primitive type for the given wrapper type.
+     *
+     * @param pType the wrapper type
+     *
+     * @return the primitive type
+     *
+     * @throws IllegalArgumentException if {@code pType} is not a primitive
+     * wrapper
+     */
+    public static Class unwrapType(Class pType) {
+        if (pType == Boolean.class) {
+            return Boolean.TYPE;
+        }
+        else if (pType == Byte.class) {
+            return Byte.TYPE;
+        }
+        else if (pType == Character.class) {
+            return Character.TYPE;
+        }
+        else if (pType == Double.class) {
+            return Double.TYPE;
+        }
+        else if (pType == Float.class) {
+            return Float.TYPE;
+        }
+        else if (pType == Integer.class) {
+            return Integer.TYPE;
+        }
+        else if (pType == Long.class) {
+            return Long.TYPE;
+        }
+        else if (pType == Short.class) {
+            return Short.TYPE;
+        }
+
+        throw new IllegalArgumentException("Not a primitive wrapper: " + pType);
+    }
+
+    /**
+     * Returns the wrapper type for the given primitive type.
+     *
+     * @param pType the primitive tpye
+     *
+     * @return the wrapper type
+     *
+     * @throws IllegalArgumentException if {@code pType} is not a primitive
+     * type
+     */
+    public static Class wrapType(Class pType) {
+        if (pType == Boolean.TYPE) {
+            return Boolean.class;
+        }
+        else if (pType == Byte.TYPE) {
+            return Byte.class;
+        }
+        else if (pType == Character.TYPE) {
+            return Character.class;
+        }
+        else if (pType == Double.TYPE) {
+            return Double.class;
+        }
+        else if (pType == Float.TYPE) {
+            return Float.class;
+        }
+        else if (pType == Integer.TYPE) {
+            return Integer.class;
+        }
+        else if (pType == Long.TYPE) {
+            return Long.class;
+        }
+        else if (pType == Short.TYPE) {
+            return Short.class;
+        }
+
+        throw new IllegalArgumentException("Not a primitive type: " + pType);
+    }
+
+    /**
+     * Returns {@code true} if the given type is a primitive wrapper.
+     *
+     * @param pType
+     *
+     * @return {@code true} if the given type is a primitive wrapper, otherwise
+     * {@code false}
+     */
+    public static boolean isPrimitiveWrapper(Class pType) {
+        return pType == Boolean.class || pType == Byte.class
+                || pType == Character.class || pType == Double.class
+                || pType == Float.class || pType == Integer.class
+                || pType == Long.class || pType == Short.class;
+    }
+}
@@ -36,10 +36,11 @@ import java.util.Map;

 /**
 * Kind of like {@code org.apache.commons.lang.Validate}. Just smarter. ;-)
- * <p/>
+ * <p>
 * Uses type parameterized return values, thus making it possible to check
 * constructor arguments before
 * they are passed on to {@code super} or {@code this} type constructors.
+ * </p>
 *
 * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
 * @author last modified by $Author: haku $
@@ -1,402 +1,404 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.util;
-
-import java.io.Serializable;
-import java.util.*;
-
-/**
- * AbstractDecoratedMap
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractDecoratedMap.java#2 $
- */
-// TODO: The generics in this class looks suspicious..
-abstract class AbstractDecoratedMap<K, V> extends AbstractMap<K, V> implements Map<K, V>, Serializable, Cloneable {
-    protected Map<K, Entry<K, V>> entries;
-    protected transient volatile int modCount;
-
-    private transient volatile Set<Entry<K, V>> entrySet = null;
-    private transient volatile Set<K> keySet = null;
-    private transient volatile Collection<V> values = null;
-
-    /**
-     * Creates a {@code Map} backed by a {@code HashMap}.
-     */
-    public AbstractDecoratedMap() {
-        this(new HashMap<K, Entry<K, V>>(), null);
-    }
-
-    /**
-     * Creates a {@code Map} backed by a {@code HashMap}, containing all
-     * key/value mappings from the given {@code Map}.
-     * <p/>
-     * <small>This is constructor is here to comply with the reccomendations for
-     * "standard" constructors in the {@code Map} interface.</small>
-     *
-     * @see #AbstractDecoratedMap(java.util.Map, java.util.Map)
-     *
-     * @param pContents the map whose mappings are to be placed in this map.
-     * May be {@code null}.
-     */
-    public AbstractDecoratedMap(Map<? extends K, ? extends V> pContents) {
-        this(new HashMap<K, Entry<K, V>>(), pContents);
-    }
-
-    /**
-     * Creates a {@code Map} backed by the given backing-{@code Map},
-     * containing all key/value mappings from the given contents-{@code Map}.
-     * <p/>
-     * NOTE: The backing map is structuraly cahnged, and it should NOT be
-     * accessed directly, after the wrapped map is created.
-     *
-     * @param pBacking the backing map of this map. Must be either empty, or
-     * the same map as {@code pContents}.
-     * @param pContents the map whose mappings are to be placed in this map.
-     * May be {@code null}.
-     *
-     * @throws IllegalArgumentException if {@code pBacking} is {@code null}
-     *         or if {@code pBacking} differs from {@code pContent} and is not empty.
-     */
-    public AbstractDecoratedMap(Map<K, Entry<K, V>> pBacking, Map<? extends K, ? extends V> pContents) {
-        if (pBacking == null) {
-            throw new IllegalArgumentException("backing == null");
-        }
-
-        Entry<? extends K, ? extends V>[] entries = null;
-        if (pBacking == pContents) {
-            // NOTE: Special treatment to avoid ClassCastExceptions
-            Set<? extends Entry<? extends K, ? extends V>> es = pContents.entrySet();
-            //noinspection unchecked
-            entries = new Entry[es.size()];
-            entries = es.toArray(entries);
-            pContents = null;
-            pBacking.clear();
-        }
-        else if (!pBacking.isEmpty()) {
-            throw new IllegalArgumentException("backing must be empty");
-        }
-
-        this.entries = pBacking;
-        init();
-
-        if (pContents != null) {
-            putAll(pContents);
-        }
-        else if (entries != null) {
-            // Reinsert entries, this time wrapped
-            for (Entry<? extends K, ? extends V> entry : entries) {
-                put(entry.getKey(), entry.getValue());
-            }
-        }
-    }
-
-    /**
-     * Default implementation, does nothing.
-     */
-    protected void init() {
-    }
-
-    public int size() {
-        return entries.size();
-    }
-
-    public void clear() {
-        entries.clear();
-        modCount++;
-        init();
-    }
-
-    public boolean isEmpty() {
-        return entries.isEmpty();
-    }
-
-    public boolean containsKey(Object pKey) {
-        return entries.containsKey(pKey);
-    }
-
-    /**
-     * Returns {@code true} if this map maps one or more keys to the
-     * specified pValue.  More formally, returns {@code true} if and only if
-     * this map contains at least one mapping to a pValue {@code v} such that
-     * {@code (pValue==null ? v==null : pValue.equals(v))}.
-     * <p/>
-     * This implementation requires time linear in the map size for this
-     * operation.
-     *
-     * @param pValue pValue whose presence in this map is to be tested.
-     * @return {@code true} if this map maps one or more keys to the
-     *         specified pValue.
-     */
-    public boolean containsValue(Object pValue) {
-        for (V value : values()) {
-            if (value == pValue || (value != null && value.equals(pValue))) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public Collection<V> values() {
-        Collection<V> values = this.values;
-        return values != null ? values : (this.values = new Values());
-    }
-
-    public Set<Entry<K, V>> entrySet() {
-        Set<Entry<K, V>> es = entrySet;
-        return es != null ? es : (entrySet = new EntrySet());
-    }
-
-    public Set<K> keySet() {
-        Set<K> ks = keySet;
-        return ks != null ? ks : (keySet = new KeySet());
-    }
-
-    /**
-     * Returns a shallow copy of this {@code AbstractMap} instance: the keys
-     * and values themselves are not cloned.
-     *
-     * @return a shallow copy of this map.
-     */
-    protected Object clone() throws CloneNotSupportedException {
-        AbstractDecoratedMap map = (AbstractDecoratedMap) super.clone();
-
-        map.values = null;
-        map.entrySet = null;
-        map.keySet = null;
-
-        // TODO: Implement: Need to clone the backing map...
-
-        return map;
-    }
-
-    // Subclass overrides these to alter behavior of views' iterator() method
-    protected abstract Iterator<K> newKeyIterator();
-
-    protected abstract Iterator<V> newValueIterator();
-
-    protected abstract Iterator<Entry<K, V>> newEntryIterator();
-
-    // TODO: Implement these (get/put/remove)?
-    public abstract V get(Object pKey);
-
-    public abstract V remove(Object pKey);
-
-    public abstract V put(K pKey, V pValue);
-
-    /*protected*/ Entry<K, V> createEntry(K pKey, V pValue) {
-        return new BasicEntry<K, V>(pKey, pValue);
-    }
-
-    /*protected*/  Entry<K, V> getEntry(K pKey) {
-        return entries.get(pKey);
-    }
-
-    /**
-     * Removes the given entry from the Map.
-     *
-     * @param pEntry the entry to be removed
-     *
-     * @return the removed entry, or {@code null} if nothing was removed.
-     */
-    protected Entry<K, V> removeEntry(Entry<K, V> pEntry) {
-        if (pEntry == null) {
-            return null;
-        }
-
-        // Find candidate entry for this key
-        Entry<K, V> candidate = getEntry(pEntry.getKey());
-        if (candidate == pEntry || (candidate != null && candidate.equals(pEntry))) {
-            // Remove
-            remove(pEntry.getKey());
-            return pEntry;
-        }
-        return null;
-    }
-
-    protected class Values extends AbstractCollection<V> {
-        public Iterator<V> iterator() {
-            return newValueIterator();
-        }
-
-        public int size() {
-            return AbstractDecoratedMap.this.size();
-        }
-
-        public boolean contains(Object o) {
-            return containsValue(o);
-        }
-
-        public void clear() {
-            AbstractDecoratedMap.this.clear();
-        }
-    }
-
-    protected class EntrySet extends AbstractSet<Entry<K, V>> {
-        public Iterator<Entry<K, V>> iterator() {
-            return newEntryIterator();
-        }
-
-        public boolean contains(Object o) {
-            if (!(o instanceof Entry))
-                return false;
-            Entry e = (Entry) o;
-
-            //noinspection SuspiciousMethodCalls
-            Entry<K, V> candidate = entries.get(e.getKey());
-            return candidate != null && candidate.equals(e);
-        }
-
-        public boolean remove(Object o) {
-            if (!(o instanceof Entry)) {
-                return false;
-            }
-
-            /*
-            // NOTE: Extra cautions is taken, to only remove the entry if it
-            // equals the entry in the map
-            Object key = ((Entry) o).getKey();
-            Entry entry = (Entry) entries.get(key);
-
-            // Same entry?
-            if (entry != null && entry.equals(o)) {
-                return AbstractWrappedMap.this.remove(key) != null;
-            }
-
-            return false;
-            */
-
-            //noinspection unchecked
-            return AbstractDecoratedMap.this.removeEntry((Entry) o) != null;
-        }
-
-        public int size() {
-            return AbstractDecoratedMap.this.size();
-        }
-
-        public void clear() {
-            AbstractDecoratedMap.this.clear();
-        }
-    }
-
-    protected class KeySet extends AbstractSet<K> {
-        public Iterator<K> iterator() {
-            return newKeyIterator();
-        }
-        public int size() {
-            return AbstractDecoratedMap.this.size();
-        }
-        public boolean contains(Object o) {
-            return containsKey(o);
-        }
-        public boolean remove(Object o) {
-            return AbstractDecoratedMap.this.remove(o) != null;
-        }
-        public void clear() {
-            AbstractDecoratedMap.this.clear();
-        }
-    }
-
-    /**
-     * A simple Map.Entry implementaton.
-     */
-    static class BasicEntry<K, V> implements Entry<K, V>, Serializable {
-        K mKey;
-        V mValue;
-
-        BasicEntry(K pKey, V pValue) {
-            mKey = pKey;
-            mValue = pValue;
-        }
-
-        /**
-         * Default implementation does nothing.
-         *
-         * @param pMap the map that is accessed
-         */
-        protected void recordAccess(Map<K, V> pMap) {
-        }
-
-        /**
-         * Default implementation does nothing.
-         * @param pMap the map that is removed from
-         */
-        protected void recordRemoval(Map<K, V> pMap) {
-        }
-
-        public V getValue() {
-            return mValue;
-        }
-
-        public V setValue(V pValue) {
-            V oldValue = mValue;
-            mValue = pValue;
-            return oldValue;
-        }
-
-        public K getKey() {
-            return mKey;
-        }
-
-        public boolean equals(Object pOther) {
-            if (!(pOther instanceof Map.Entry)) {
-                return false;
-            }
-
-            Map.Entry entry = (Map.Entry) pOther;
-
-            Object k1 = mKey;
-            Object k2 = entry.getKey();
-
-            if (k1 == k2 || (k1 != null && k1.equals(k2))) {
-                Object v1 = mValue;
-                Object v2 = entry.getValue();
-
-                if (v1 == v2 || (v1 != null && v1.equals(v2))) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        public int hashCode() {
-            return (mKey == null ? 0 : mKey.hashCode()) ^
-                   (mValue == null ? 0 : mValue.hashCode());
-        }
-
-        public String toString() {
-            return getKey() + "=" + getValue();
-        }
-    }
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.util;
+
+import java.io.Serializable;
+import java.util.*;
+
+/**
+ * AbstractDecoratedMap
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractDecoratedMap.java#2 $
+ */
+// TODO: The generics in this class looks suspicious..
+abstract class AbstractDecoratedMap<K, V> extends AbstractMap<K, V> implements Map<K, V>, Serializable, Cloneable {
+    protected Map<K, Entry<K, V>> entries;
+    protected transient volatile int modCount;
+
+    private transient volatile Set<Entry<K, V>> entrySet = null;
+    private transient volatile Set<K> keySet = null;
+    private transient volatile Collection<V> values = null;
+
+    /**
+     * Creates a {@code Map} backed by a {@code HashMap}.
+     */
+    public AbstractDecoratedMap() {
+        this(new HashMap<K, Entry<K, V>>(), null);
+    }
+
+    /**
+     * Creates a {@code Map} backed by a {@code HashMap}, containing all
+     * key/value mappings from the given {@code Map}.
+     * <p>
+     * <small>This is constructor is here to comply with the reccomendations for
+     * "standard" constructors in the {@code Map} interface.</small>
+     * </p>
+     *
+     * @see #AbstractDecoratedMap(java.util.Map, java.util.Map)
+     *
+     * @param pContents the map whose mappings are to be placed in this map.
+     * May be {@code null}.
+     */
+    public AbstractDecoratedMap(Map<? extends K, ? extends V> pContents) {
+        this(new HashMap<K, Entry<K, V>>(), pContents);
+    }
+
+    /**
+     * Creates a {@code Map} backed by the given backing-{@code Map},
+     * containing all key/value mappings from the given contents-{@code Map}.
+     * <p>
+     * NOTE: The backing map is structuraly cahnged, and it should NOT be
+     * accessed directly, after the wrapped map is created.
+     * </p>
+     *
+     * @param pBacking the backing map of this map. Must be either empty, or
+     * the same map as {@code pContents}.
+     * @param pContents the map whose mappings are to be placed in this map.
+     * May be {@code null}.
+     *
+     * @throws IllegalArgumentException if {@code pBacking} is {@code null}
+     *         or if {@code pBacking} differs from {@code pContent} and is not empty.
+     */
+    public AbstractDecoratedMap(Map<K, Entry<K, V>> pBacking, Map<? extends K, ? extends V> pContents) {
+        if (pBacking == null) {
+            throw new IllegalArgumentException("backing == null");
+        }
+
+        Entry<? extends K, ? extends V>[] entries = null;
+        if (pBacking == pContents) {
+            // NOTE: Special treatment to avoid ClassCastExceptions
+            Set<? extends Entry<? extends K, ? extends V>> es = pContents.entrySet();
+            //noinspection unchecked
+            entries = new Entry[es.size()];
+            entries = es.toArray(entries);
+            pContents = null;
+            pBacking.clear();
+        }
+        else if (!pBacking.isEmpty()) {
+            throw new IllegalArgumentException("backing must be empty");
+        }
+
+        this.entries = pBacking;
+        init();
+
+        if (pContents != null) {
+            putAll(pContents);
+        }
+        else if (entries != null) {
+            // Reinsert entries, this time wrapped
+            for (Entry<? extends K, ? extends V> entry : entries) {
+                put(entry.getKey(), entry.getValue());
+            }
+        }
+    }
+
+    /**
+     * Default implementation, does nothing.
+     */
+    protected void init() {
+    }
+
+    public int size() {
+        return entries.size();
+    }
+
+    public void clear() {
+        entries.clear();
+        modCount++;
+        init();
+    }
+
+    public boolean isEmpty() {
+        return entries.isEmpty();
+    }
+
+    public boolean containsKey(Object pKey) {
+        return entries.containsKey(pKey);
+    }
+
+    /**
+     * Returns {@code true} if this map maps one or more keys to the
+     * specified pValue.  More formally, returns {@code true} if and only if
+     * this map contains at least one mapping to a pValue {@code v} such that
+     * {@code (pValue==null ? v==null : pValue.equals(v))}.
+     * <p>
+     * This implementation requires time linear in the map size for this
+     * operation.
+     * </p>
+     *
+     * @param pValue pValue whose presence in this map is to be tested.
+     * @return {@code true} if this map maps one or more keys to the
+     *         specified pValue.
+     */
+    public boolean containsValue(Object pValue) {
+        for (V value : values()) {
+            if (value == pValue || (value != null && value.equals(pValue))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public Collection<V> values() {
+        Collection<V> values = this.values;
+        return values != null ? values : (this.values = new Values());
+    }
+
+    public Set<Entry<K, V>> entrySet() {
+        Set<Entry<K, V>> es = entrySet;
+        return es != null ? es : (entrySet = new EntrySet());
+    }
+
+    public Set<K> keySet() {
+        Set<K> ks = keySet;
+        return ks != null ? ks : (keySet = new KeySet());
+    }
+
+    /**
+     * Returns a shallow copy of this {@code AbstractMap} instance: the keys
+     * and values themselves are not cloned.
+     *
+     * @return a shallow copy of this map.
+     */
+    protected Object clone() throws CloneNotSupportedException {
+        AbstractDecoratedMap map = (AbstractDecoratedMap) super.clone();
+
+        map.values = null;
+        map.entrySet = null;
+        map.keySet = null;
+
+        // TODO: Implement: Need to clone the backing map...
+
+        return map;
+    }
+
+    // Subclass overrides these to alter behavior of views' iterator() method
+    protected abstract Iterator<K> newKeyIterator();
+
+    protected abstract Iterator<V> newValueIterator();
+
+    protected abstract Iterator<Entry<K, V>> newEntryIterator();
+
+    // TODO: Implement these (get/put/remove)?
+    public abstract V get(Object pKey);
+
+    public abstract V remove(Object pKey);
+
+    public abstract V put(K pKey, V pValue);
+
+    /*protected*/ Entry<K, V> createEntry(K pKey, V pValue) {
+        return new BasicEntry<K, V>(pKey, pValue);
+    }
+
+    /*protected*/  Entry<K, V> getEntry(K pKey) {
+        return entries.get(pKey);
+    }
+
+    /**
+     * Removes the given entry from the Map.
+     *
+     * @param pEntry the entry to be removed
+     *
+     * @return the removed entry, or {@code null} if nothing was removed.
+     */
+    protected Entry<K, V> removeEntry(Entry<K, V> pEntry) {
+        if (pEntry == null) {
+            return null;
+        }
+
+        // Find candidate entry for this key
+        Entry<K, V> candidate = getEntry(pEntry.getKey());
+        if (candidate == pEntry || (candidate != null && candidate.equals(pEntry))) {
+            // Remove
+            remove(pEntry.getKey());
+            return pEntry;
+        }
+        return null;
+    }
+
+    protected class Values extends AbstractCollection<V> {
+        public Iterator<V> iterator() {
+            return newValueIterator();
+        }
+
+        public int size() {
+            return AbstractDecoratedMap.this.size();
+        }
+
+        public boolean contains(Object o) {
+            return containsValue(o);
+        }
+
+        public void clear() {
+            AbstractDecoratedMap.this.clear();
+        }
+    }
+
+    protected class EntrySet extends AbstractSet<Entry<K, V>> {
+        public Iterator<Entry<K, V>> iterator() {
+            return newEntryIterator();
+        }
+
+        public boolean contains(Object o) {
+            if (!(o instanceof Entry))
+                return false;
+            Entry e = (Entry) o;
+
+            //noinspection SuspiciousMethodCalls
+            Entry<K, V> candidate = entries.get(e.getKey());
+            return candidate != null && candidate.equals(e);
+        }
+
+        public boolean remove(Object o) {
+            if (!(o instanceof Entry)) {
+                return false;
+            }
+
+            /*
+            // NOTE: Extra cautions is taken, to only remove the entry if it
+            // equals the entry in the map
+            Object key = ((Entry) o).getKey();
+            Entry entry = (Entry) entries.get(key);
+
+            // Same entry?
+            if (entry != null && entry.equals(o)) {
+                return AbstractWrappedMap.this.remove(key) != null;
+            }
+
+            return false;
+            */
+
+            //noinspection unchecked
+            return AbstractDecoratedMap.this.removeEntry((Entry) o) != null;
+        }
+
+        public int size() {
+            return AbstractDecoratedMap.this.size();
+        }
+
+        public void clear() {
+            AbstractDecoratedMap.this.clear();
+        }
+    }
+
+    protected class KeySet extends AbstractSet<K> {
+        public Iterator<K> iterator() {
+            return newKeyIterator();
+        }
+        public int size() {
+            return AbstractDecoratedMap.this.size();
+        }
+        public boolean contains(Object o) {
+            return containsKey(o);
+        }
+        public boolean remove(Object o) {
+            return AbstractDecoratedMap.this.remove(o) != null;
+        }
+        public void clear() {
+            AbstractDecoratedMap.this.clear();
+        }
+    }
+
+    /**
+     * A simple Map.Entry implementaton.
+     */
+    static class BasicEntry<K, V> implements Entry<K, V>, Serializable {
+        K mKey;
+        V mValue;
+
+        BasicEntry(K pKey, V pValue) {
+            mKey = pKey;
+            mValue = pValue;
+        }
+
+        /**
+         * Default implementation does nothing.
+         *
+         * @param pMap the map that is accessed
+         */
+        protected void recordAccess(Map<K, V> pMap) {
+        }
+
+        /**
+         * Default implementation does nothing.
+         * @param pMap the map that is removed from
+         */
+        protected void recordRemoval(Map<K, V> pMap) {
+        }
+
+        public V getValue() {
+            return mValue;
+        }
+
+        public V setValue(V pValue) {
+            V oldValue = mValue;
+            mValue = pValue;
+            return oldValue;
+        }
+
+        public K getKey() {
+            return mKey;
+        }
+
+        public boolean equals(Object pOther) {
+            if (!(pOther instanceof Map.Entry)) {
+                return false;
+            }
+
+            Map.Entry entry = (Map.Entry) pOther;
+
+            Object k1 = mKey;
+            Object k2 = entry.getKey();
+
+            if (k1 == k2 || (k1 != null && k1.equals(k2))) {
+                Object v1 = mValue;
+                Object v2 = entry.getValue();
+
+                if (v1 == v2 || (v1 != null && v1.equals(v2))) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public int hashCode() {
+            return (mKey == null ? 0 : mKey.hashCode()) ^
+                   (mValue == null ? 0 : mValue.hashCode());
+        }
+
+        public String toString() {
+            return getKey() + "=" + getValue();
+        }
+    }
 }
@@ -1,89 +1,88 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.util;
-
-/**
- * Abstract base class for {@code TokenIterator}s to extend.
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java#1 $
- */
-public abstract class AbstractTokenIterator implements TokenIterator {
-
-    /**
-     * Not supported.
-     *
-     * @throws UnsupportedOperationException {@code remove} is not supported by
-     * this Iterator.
-     */
-    public void remove() {
-        // TODO: This is not difficult:
-        // - Convert String to StringBuilder in constructor
-        // - delete(pos, next.lenght())
-        // - Add toString() method
-        // BUT: Would it ever be useful? :-)
-
-        throw new UnsupportedOperationException("remove");
-    }
-
-    public final boolean hasMoreTokens() {
-        return hasNext();
-    }
-  
-    /**
-     * Returns the next element in the iteration as a {@code String}.
-     * This implementation simply returns {@code (String) next()}.
-     *
-     * @return the next element in the iteration.
-     * @exception java.util.NoSuchElementException iteration has no more elements.
-     * @see #next()
-     */
-    public final String nextToken() {
-        return next();
-    }
-
-    /**
-     * This implementation simply returns {@code hasNext()}.
-     * @see #hasNext()
-     */
-    public final boolean hasMoreElements() {
-        return hasNext();
-    }
-
-    /**
-     * This implementation simply returns {@code next()}.
-     * @see #next()
-     */
-    public final String nextElement() {
-        return next();
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.util;
+
+/**
+ * Abstract base class for {@code TokenIterator}s to extend.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java#1 $
+ */
+public abstract class AbstractTokenIterator implements TokenIterator {
+
+    /**
+     * Not supported.
+     *
+     * @throws UnsupportedOperationException {@code remove} is not supported by
+     * this Iterator.
+     */
+    public void remove() {
+        // TODO: This is not difficult:
+        // - Convert String to StringBuilder in constructor
+        // - delete(pos, next.lenght())
+        // - Add toString() method
+        // BUT: Would it ever be useful? :-)
+
+        throw new UnsupportedOperationException("remove");
+    }
+
+    public final boolean hasMoreTokens() {
+        return hasNext();
+    }
+  
+    /**
+     * Returns the next element in the iteration as a {@code String}.
+     * This implementation simply returns {@code (String) next()}.
+     *
+     * @return the next element in the iteration.
+     * @exception java.util.NoSuchElementException iteration has no more elements.
+     * @see #next()
+     */
+    public final String nextToken() {
+        return next();
+    }
+
+    /**
+     * This implementation simply returns {@code hasNext()}.
+     * @see #hasNext()
+     */
+    public final boolean hasMoreElements() {
+        return hasNext();
+    }
+
+    /**
+     * This implementation simply returns {@code next()}.
+     * @see #next()
+     */
+    public final String nextElement() {
+        return next();
+    }
+}
@@ -1,247 +1,248 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.util;
-
-import java.beans.IndexedPropertyDescriptor;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
-
-/**
- * A {@code Map} adapter for a Java Bean.
- * <p/>
- * Ruthlessly stolen from
- * <a href="http://binkley.blogspot.com/2006/08/mapping-java-bean.html>Binkley's Blog</a>
- */
-public final class BeanMap extends AbstractMap<String, Object> implements Serializable, Cloneable {
-    private final Object bean;
-    private transient Set<PropertyDescriptor> descriptors;
-
-    public BeanMap(Object pBean) throws IntrospectionException {
-        if (pBean == null) {
-            throw new IllegalArgumentException("bean == null");
-        }
-
-        bean = pBean;
-        descriptors = initDescriptors(pBean);
-    }
-
-    private static Set<PropertyDescriptor> initDescriptors(Object pBean) throws IntrospectionException {
-        final Set<PropertyDescriptor> descriptors = new HashSet<PropertyDescriptor>();
-
-        PropertyDescriptor[] propertyDescriptors = Introspector.getBeanInfo(pBean.getClass()).getPropertyDescriptors();
-        for (PropertyDescriptor descriptor : propertyDescriptors) {
-            // Skip Object.getClass(), as you probably never want it
-            if ("class".equals(descriptor.getName()) && descriptor.getPropertyType() == Class.class) {
-                continue;
-            }
-
-            // Only support simple setter/getters.
-            if (!(descriptor instanceof IndexedPropertyDescriptor)) {
-                descriptors.add(descriptor);
-            }
-        }
-
-        return Collections.unmodifiableSet(descriptors);
-    }
-
-    public Set<Entry<String, Object>> entrySet() {
-        return new BeanSet();
-    }
-
-    public Object get(final Object pKey) {
-        return super.get(pKey);
-    }
-
-    public Object put(final String pKey, final Object pValue) {
-        checkKey(pKey);
-
-        for (Entry<String, Object> entry : entrySet()) {
-            if (entry.getKey().equals(pKey)) {
-                return entry.setValue(pValue);
-            }
-        }
-
-        return null;
-    }
-
-    public Object remove(final Object pKey) {
-        return super.remove(checkKey(pKey));
-    }
-
-    public int size() {
-        return descriptors.size();
-    }
-
-    private String checkKey(final Object pKey) {
-        if (pKey == null) {
-            throw new IllegalArgumentException("key == null");
-        }
-        // NB - the cast forces CCE if key is the wrong type.
-        final String name = (String) pKey;
-
-        if (!containsKey(name)) {
-            throw new IllegalArgumentException("Bad key: " + pKey);
-        }
-
-        return name;
-    }
-
-    private Object readResolve() throws IntrospectionException {
-        // Initialize the property descriptors
-        descriptors = initDescriptors(bean);
-        return this;
-    }
-
-    private class BeanSet extends AbstractSet<Entry<String, Object>> {
-        public Iterator<Entry<String, Object>> iterator() {
-            return new BeanIterator(descriptors.iterator());
-        }
-
-        public int size() {
-            return descriptors.size();
-        }
-    }
-
-    private class BeanIterator implements Iterator<Entry<String, Object>> {
-        private final Iterator<PropertyDescriptor> mIterator;
-
-        public BeanIterator(final Iterator<PropertyDescriptor> pIterator) {
-            mIterator = pIterator;
-        }
-
-        public boolean hasNext() {
-            return mIterator.hasNext();
-        }
-
-        public BeanEntry next() {
-            return new BeanEntry(mIterator.next());
-        }
-
-        public void remove() {
-            mIterator.remove();
-        }
-    }
-
-    private class BeanEntry implements Entry<String, Object> {
-        private final PropertyDescriptor mDescriptor;
-
-        public BeanEntry(final PropertyDescriptor pDescriptor) {
-            this.mDescriptor = pDescriptor;
-        }
-
-        public String getKey() {
-            return mDescriptor.getName();
-        }
-
-        public Object getValue() {
-            return unwrap(new Wrapped() {
-                public Object run() throws IllegalAccessException, InvocationTargetException {
-                    final Method method = mDescriptor.getReadMethod();
-                    // A write-only bean.
-                    if (method == null) {
-                        throw new UnsupportedOperationException("No getter: " + mDescriptor.getName());
-                    }
-
-                    return method.invoke(bean);
-                }
-            });
-        }
-
-        public Object setValue(final Object pValue) {
-            return unwrap(new Wrapped() {
-                public Object run() throws IllegalAccessException, InvocationTargetException {
-                    final Method method = mDescriptor.getWriteMethod();
-                    // A read-only bean.
-                    if (method == null) {
-                        throw new UnsupportedOperationException("No write method for property: " + mDescriptor.getName());
-                    }
-
-                    final Object old = getValue();
-                    method.invoke(bean, pValue);
-                    return old;
-                }
-            });
-        }
-
-        public boolean equals(Object pOther) {
-            if (!(pOther instanceof Map.Entry)) {
-                return false;
-            }
-
-            Map.Entry entry = (Map.Entry) pOther;
-
-            Object k1 = getKey();
-            Object k2 = entry.getKey();
-
-            if (k1 == k2 || (k1 != null && k1.equals(k2))) {
-                Object v1 = getValue();
-                Object v2 = entry.getValue();
-
-                if (v1 == v2 || (v1 != null && v1.equals(v2))) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        public int hashCode() {
-            return (getKey() == null ? 0 : getKey().hashCode()) ^
-                   (getValue() == null ? 0 : getValue().hashCode());
-        }
-
-        public String toString() {
-            return getKey() + "=" + getValue();
-        }
-    }
-
-    private static interface Wrapped {
-        Object run() throws IllegalAccessException, InvocationTargetException;
-    }
-
-    private static Object unwrap(final Wrapped wrapped) {
-        try {
-            return wrapped.run();
-        }
-        catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-        catch (final InvocationTargetException e) {
-            // Javadocs for setValue indicate cast is ok.
-            throw (RuntimeException) e.getCause();
-        }
-    }
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.util;
+
+import java.beans.IndexedPropertyDescriptor;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+
+/**
+ * A {@code Map} adapter for a Java Bean.
+ * <p>
+ * Ruthlessly stolen from
+ * <a href="http://binkley.blogspot.com/2006/08/mapping-java-bean.html">Binkley's Blog</a>
+ * </p>
+ */
+public final class BeanMap extends AbstractMap<String, Object> implements Serializable, Cloneable {
+    private final Object bean;
+    private transient Set<PropertyDescriptor> descriptors;
+
+    public BeanMap(Object pBean) throws IntrospectionException {
+        if (pBean == null) {
+            throw new IllegalArgumentException("bean == null");
+        }
+
+        bean = pBean;
+        descriptors = initDescriptors(pBean);
+    }
+
+    private static Set<PropertyDescriptor> initDescriptors(Object pBean) throws IntrospectionException {
+        final Set<PropertyDescriptor> descriptors = new HashSet<PropertyDescriptor>();
+
+        PropertyDescriptor[] propertyDescriptors = Introspector.getBeanInfo(pBean.getClass()).getPropertyDescriptors();
+        for (PropertyDescriptor descriptor : propertyDescriptors) {
+            // Skip Object.getClass(), as you probably never want it
+            if ("class".equals(descriptor.getName()) && descriptor.getPropertyType() == Class.class) {
+                continue;
+            }
+
+            // Only support simple setter/getters.
+            if (!(descriptor instanceof IndexedPropertyDescriptor)) {
+                descriptors.add(descriptor);
+            }
+        }
+
+        return Collections.unmodifiableSet(descriptors);
+    }
+
+    public Set<Entry<String, Object>> entrySet() {
+        return new BeanSet();
+    }
+
+    public Object get(final Object pKey) {
+        return super.get(pKey);
+    }
+
+    public Object put(final String pKey, final Object pValue) {
+        checkKey(pKey);
+
+        for (Entry<String, Object> entry : entrySet()) {
+            if (entry.getKey().equals(pKey)) {
+                return entry.setValue(pValue);
+            }
+        }
+
+        return null;
+    }
+
+    public Object remove(final Object pKey) {
+        return super.remove(checkKey(pKey));
+    }
+
+    public int size() {
+        return descriptors.size();
+    }
+
+    private String checkKey(final Object pKey) {
+        if (pKey == null) {
+            throw new IllegalArgumentException("key == null");
+        }
+        // NB - the cast forces CCE if key is the wrong type.
+        final String name = (String) pKey;
+
+        if (!containsKey(name)) {
+            throw new IllegalArgumentException("Bad key: " + pKey);
+        }
+
+        return name;
+    }
+
+    private Object readResolve() throws IntrospectionException {
+        // Initialize the property descriptors
+        descriptors = initDescriptors(bean);
+        return this;
+    }
+
+    private class BeanSet extends AbstractSet<Entry<String, Object>> {
+        public Iterator<Entry<String, Object>> iterator() {
+            return new BeanIterator(descriptors.iterator());
+        }
+
+        public int size() {
+            return descriptors.size();
+        }
+    }
+
+    private class BeanIterator implements Iterator<Entry<String, Object>> {
+        private final Iterator<PropertyDescriptor> mIterator;
+
+        public BeanIterator(final Iterator<PropertyDescriptor> pIterator) {
+            mIterator = pIterator;
+        }
+
+        public boolean hasNext() {
+            return mIterator.hasNext();
+        }
+
+        public BeanEntry next() {
+            return new BeanEntry(mIterator.next());
+        }
+
+        public void remove() {
+            mIterator.remove();
+        }
+    }
+
+    private class BeanEntry implements Entry<String, Object> {
+        private final PropertyDescriptor mDescriptor;
+
+        public BeanEntry(final PropertyDescriptor pDescriptor) {
+            this.mDescriptor = pDescriptor;
+        }
+
+        public String getKey() {
+            return mDescriptor.getName();
+        }
+
+        public Object getValue() {
+            return unwrap(new Wrapped() {
+                public Object run() throws IllegalAccessException, InvocationTargetException {
+                    final Method method = mDescriptor.getReadMethod();
+                    // A write-only bean.
+                    if (method == null) {
+                        throw new UnsupportedOperationException("No getter: " + mDescriptor.getName());
+                    }
+
+                    return method.invoke(bean);
+                }
+            });
+        }
+
+        public Object setValue(final Object pValue) {
+            return unwrap(new Wrapped() {
+                public Object run() throws IllegalAccessException, InvocationTargetException {
+                    final Method method = mDescriptor.getWriteMethod();
+                    // A read-only bean.
+                    if (method == null) {
+                        throw new UnsupportedOperationException("No write method for property: " + mDescriptor.getName());
+                    }
+
+                    final Object old = getValue();
+                    method.invoke(bean, pValue);
+                    return old;
+                }
+            });
+        }
+
+        public boolean equals(Object pOther) {
+            if (!(pOther instanceof Map.Entry)) {
+                return false;
+            }
+
+            Map.Entry entry = (Map.Entry) pOther;
+
+            Object k1 = getKey();
+            Object k2 = entry.getKey();
+
+            if (k1 == k2 || (k1 != null && k1.equals(k2))) {
+                Object v1 = getValue();
+                Object v2 = entry.getValue();
+
+                if (v1 == v2 || (v1 != null && v1.equals(v2))) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public int hashCode() {
+            return (getKey() == null ? 0 : getKey().hashCode()) ^
+                   (getValue() == null ? 0 : getValue().hashCode());
+        }
+
+        public String toString() {
+            return getKey() + "=" + getValue();
+        }
+    }
+
+    private static interface Wrapped {
+        Object run() throws IllegalAccessException, InvocationTargetException;
+    }
+
+    private static Object unwrap(final Wrapped wrapped) {
+        try {
+            return wrapped.run();
+        }
+        catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        catch (final InvocationTargetException e) {
+            // Javadocs for setValue indicate cast is ok.
+            throw (RuntimeException) e.getCause();
+        }
+    }
 }
@@ -1,153 +1,152 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.util;
-
-/**
- * DuplicateHandler
- * <p/>
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/DuplicateHandler.java#2 $
- */
-public interface DuplicateHandler<T> {
-
-    /**
-     * Resolves duplicates according to a certain strategy.
-     *
-     * @param pOld the old value
-     * @param pNew the new value
-     *
-     * @return the resolved value.
-     *
-     * @throws IllegalArgumentException is the arguments cannot be resolved for
-     * some reason.
-     */
-    public T resolve(T pOld, T pNew);
-
-    /**
-     * Will use the first (old) value. Any new values will be discarded.
-     *
-     * @see CollectionUtil#invert(java.util.Map, java.util.Map, DuplicateHandler)
-     */
-    public final static DuplicateHandler<?> USE_FIRST_VALUE = new DuplicateHandler() {
-        /**
-         * Returns {@code pOld}.
-         *
-         * @param pOld the old value
-         * @param pNew the new value
-         *
-         * @return {@code pOld}
-         */
-        public Object resolve(Object pOld, Object pNew) {
-            return pOld;
-        }
-    };
-
-    /**
-     * Will use the last (new) value. Any old values will be discarded
-     * (overwritten).
-     *
-     * @see CollectionUtil#invert(java.util.Map, java.util.Map, DuplicateHandler)
-     */
-    public final static DuplicateHandler<?> USE_LAST_VALUE = new DuplicateHandler() {
-        /**
-         * Returns {@code pNew}.
-         *
-         * @param pOld the old value
-         * @param pNew the new value
-         *
-         * @return {@code pNew}
-         */
-        public Object resolve(Object pOld, Object pNew) {
-            return pNew;
-        }
-    };
-
-    /**
-     * Converts duplicats to an {@code Object} array.
-     *
-     * @see CollectionUtil#invert(java.util.Map, java.util.Map, DuplicateHandler)
-     */
-    public final static DuplicateHandler<?> DUPLICATES_AS_ARRAY = new DuplicateHandler() {
-        /**
-         * Returns an {@code Object} array, containing {@code pNew} as its
-         * last element.
-         *
-         * @param pOld the old value
-         * @param pNew the new value
-         *
-         * @return an {@code Object} array, containing {@code pNew} as its
-         * last element.
-         */
-        public Object resolve(Object pOld, Object pNew) {
-            Object[] result;
-
-            if (pOld instanceof Object[]) {
-                Object[] old = ((Object[]) pOld);
-                result = new Object[old.length + 1];
-                System.arraycopy(old, 0, result, 0, old.length);
-                result[old.length] = pNew;
-            }
-            else {
-                result = new Object[] {pOld, pNew};
-            }
-
-            return result;
-        }
-    };
-
-    /**
-     * Converts duplicates to a comma-separated {@code String}.
-     * Note that all values should allready be {@code String}s if using this
-     * handler.
-     *
-     * @see CollectionUtil#invert(java.util.Map, java.util.Map, DuplicateHandler)
-     */
-    public final static DuplicateHandler<String> DUPLICATES_AS_CSV = new DuplicateHandler<String>() {
-        /**
-         * Returns a comma-separated {@code String}, with the string
-         * representation of {@code pNew} as the last element.
-         *
-         * @param pOld the old value
-         * @param pNew the new value
-         *
-         * @return a comma-separated {@code String}, with the string
-         * representation of {@code pNew} as the last element.
-         */
-        public String resolve(String pOld, String pNew) {
-            StringBuilder result = new StringBuilder(String.valueOf(pOld));
-            result.append(',');
-            result.append(pNew);
-
-            return result.toString();
-        }
-    };
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.util;
+
+/**
+ * DuplicateHandler
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/DuplicateHandler.java#2 $
+ */
+public interface DuplicateHandler<T> {
+
+    /**
+     * Resolves duplicates according to a certain strategy.
+     *
+     * @param pOld the old value
+     * @param pNew the new value
+     *
+     * @return the resolved value.
+     *
+     * @throws IllegalArgumentException is the arguments cannot be resolved for
+     * some reason.
+     */
+    public T resolve(T pOld, T pNew);
+
+    /**
+     * Will use the first (old) value. Any new values will be discarded.
+     *
+     * @see CollectionUtil#invert(java.util.Map, java.util.Map, DuplicateHandler)
+     */
+    public final static DuplicateHandler<?> USE_FIRST_VALUE = new DuplicateHandler() {
+        /**
+         * Returns {@code pOld}.
+         *
+         * @param pOld the old value
+         * @param pNew the new value
+         *
+         * @return {@code pOld}
+         */
+        public Object resolve(Object pOld, Object pNew) {
+            return pOld;
+        }
+    };
+
+    /**
+     * Will use the last (new) value. Any old values will be discarded
+     * (overwritten).
+     *
+     * @see CollectionUtil#invert(java.util.Map, java.util.Map, DuplicateHandler)
+     */
+    public final static DuplicateHandler<?> USE_LAST_VALUE = new DuplicateHandler() {
+        /**
+         * Returns {@code pNew}.
+         *
+         * @param pOld the old value
+         * @param pNew the new value
+         *
+         * @return {@code pNew}
+         */
+        public Object resolve(Object pOld, Object pNew) {
+            return pNew;
+        }
+    };
+
+    /**
+     * Converts duplicats to an {@code Object} array.
+     *
+     * @see CollectionUtil#invert(java.util.Map, java.util.Map, DuplicateHandler)
+     */
+    public final static DuplicateHandler<?> DUPLICATES_AS_ARRAY = new DuplicateHandler() {
+        /**
+         * Returns an {@code Object} array, containing {@code pNew} as its
+         * last element.
+         *
+         * @param pOld the old value
+         * @param pNew the new value
+         *
+         * @return an {@code Object} array, containing {@code pNew} as its
+         * last element.
+         */
+        public Object resolve(Object pOld, Object pNew) {
+            Object[] result;
+
+            if (pOld instanceof Object[]) {
+                Object[] old = ((Object[]) pOld);
+                result = new Object[old.length + 1];
+                System.arraycopy(old, 0, result, 0, old.length);
+                result[old.length] = pNew;
+            }
+            else {
+                result = new Object[] {pOld, pNew};
+            }
+
+            return result;
+        }
+    };
+
+    /**
+     * Converts duplicates to a comma-separated {@code String}.
+     * Note that all values should allready be {@code String}s if using this
+     * handler.
+     *
+     * @see CollectionUtil#invert(java.util.Map, java.util.Map, DuplicateHandler)
+     */
+    public final static DuplicateHandler<String> DUPLICATES_AS_CSV = new DuplicateHandler<String>() {
+        /**
+         * Returns a comma-separated {@code String}, with the string
+         * representation of {@code pNew} as the last element.
+         *
+         * @param pOld the old value
+         * @param pNew the new value
+         *
+         * @return a comma-separated {@code String}, with the string
+         * representation of {@code pNew} as the last element.
+         */
+        public String resolve(String pOld, String pNew) {
+            StringBuilder result = new StringBuilder(String.valueOf(pOld));
+            result.append(',');
+            result.append(pNew);
+
+            return result.toString();
+        }
+    };
+}
@@ -1,153 +1,154 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.util;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-/**
- * Wraps (decorates) an {@code Iterator} with extra functionality, to allow
- * element filtering. Each
- * element is filtered against the given {@code Filter}, and only elements
- * that are {@code accept}ed are returned by the {@code next} method.
- * <p/>
- * The optional {@code remove} operation is implemented, but may throw
- * {@code UnsupportedOperationException} if the underlying iterator does not
- * support the remove operation.
- *
- * @see FilterIterator.Filter
- * 
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haku $
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FilterIterator.java#1 $
- */
-public class FilterIterator<E> implements Iterator<E> {
-
-    protected final Filter<E> filter;
-    protected final Iterator<E> iterator;
-
-    private E next = null;
-    private E current = null;
-
-    /**
-     * Creates a {@code FilterIterator} that wraps the {@code Iterator}. Each
-     * element is filtered against the given {@code Filter}, and only elements
-     * that are {@code accept}ed are returned by the {@code next} method.
-     *
-     * @param pIterator the iterator to filter
-     * @param pFilter the filter
-     * @see FilterIterator.Filter
-     */
-    public FilterIterator(final Iterator<E> pIterator, final Filter<E> pFilter) {
-        if (pIterator == null) {
-            throw new IllegalArgumentException("iterator == null");
-        }
-        if (pFilter == null) {
-            throw new IllegalArgumentException("filter == null");
-        }
-
-        iterator = pIterator;
-        filter = pFilter;
-    }
-
-    /**
-     * Returns {@code true} if the iteration has more elements. (In other
-     * words, returns {@code true} if {@code next} would return an element
-     * rather than throwing an exception.)
-     *
-     * @return {@code true} if the iterator has more elements.
-     * @see FilterIterator.Filter#accept
-     */
-    public boolean hasNext() {
-        while (next == null && iterator.hasNext()) {
-            E element = iterator.next();
-
-            if (filter.accept(element)) {
-                next = element;
-                break;
-            }
-        }
-
-        return next != null;
-    }
-
-    /**
-     * Returns the next element in the iteration.
-     *
-     * @return the next element in the iteration.
-     * @see FilterIterator.Filter#accept
-     */
-    public E next() {
-        if (hasNext()) {
-            current = next;
-
-            // Make sure we advance next time
-            next = null;
-            return current;
-        }
-        else {
-            throw new NoSuchElementException("Iteration has no more elements.");
-        }
-    }
-
-    /**
-     * Removes from the underlying collection the last element returned by the
-     * iterator (optional operation).  This method can be called only once per
-     * call to {@code next}.  The behavior of an iterator is unspecified if
-     * the underlying collection is modified while the iteration is in
-     * progress in any way other than by calling this method.
-     */
-    public void remove() {
-        if (current != null) {
-            iterator.remove();
-        }
-        else {
-            throw new IllegalStateException("Iteration has no current element.");
-        }
-    }
-
-    /**
-     * Used to tests whether or not an element fulfills certain criteria, and
-     * hence should be accepted by the FilterIterator instance.
-     */
-    public static interface Filter<E> {
-
-        /**
-         * Tests whether or not the element fulfills certain criteria, and hence
-         * should be accepted.
-         *
-         * @param pElement the element to test
-         * @return {@code true} if the object is accepted, otherwise
-         *         {@code false}
-         */
-        public boolean accept(E pElement);
-    }
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.util;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * Wraps (decorates) an {@code Iterator} with extra functionality, to allow
+ * element filtering. Each
+ * element is filtered against the given {@code Filter}, and only elements
+ * that are {@code accept}ed are returned by the {@code next} method.
+ * <p>
+ * The optional {@code remove} operation is implemented, but may throw
+ * {@code UnsupportedOperationException} if the underlying iterator does not
+ * support the remove operation.
+ * </p>
+ *
+ * @see FilterIterator.Filter
+ * 
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haku $
+ * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FilterIterator.java#1 $
+ */
+public class FilterIterator<E> implements Iterator<E> {
+
+    protected final Filter<E> filter;
+    protected final Iterator<E> iterator;
+
+    private E next = null;
+    private E current = null;
+
+    /**
+     * Creates a {@code FilterIterator} that wraps the {@code Iterator}. Each
+     * element is filtered against the given {@code Filter}, and only elements
+     * that are {@code accept}ed are returned by the {@code next} method.
+     *
+     * @param pIterator the iterator to filter
+     * @param pFilter the filter
+     * @see FilterIterator.Filter
+     */
+    public FilterIterator(final Iterator<E> pIterator, final Filter<E> pFilter) {
+        if (pIterator == null) {
+            throw new IllegalArgumentException("iterator == null");
+        }
+        if (pFilter == null) {
+            throw new IllegalArgumentException("filter == null");
+        }
+
+        iterator = pIterator;
+        filter = pFilter;
+    }
+
+    /**
+     * Returns {@code true} if the iteration has more elements. (In other
+     * words, returns {@code true} if {@code next} would return an element
+     * rather than throwing an exception.)
+     *
+     * @return {@code true} if the iterator has more elements.
+     * @see FilterIterator.Filter#accept
+     */
+    public boolean hasNext() {
+        while (next == null && iterator.hasNext()) {
+            E element = iterator.next();
+
+            if (filter.accept(element)) {
+                next = element;
+                break;
+            }
+        }
+
+        return next != null;
+    }
+
+    /**
+     * Returns the next element in the iteration.
+     *
+     * @return the next element in the iteration.
+     * @see FilterIterator.Filter#accept
+     */
+    public E next() {
+        if (hasNext()) {
+            current = next;
+
+            // Make sure we advance next time
+            next = null;
+            return current;
+        }
+        else {
+            throw new NoSuchElementException("Iteration has no more elements.");
+        }
+    }
+
+    /**
+     * Removes from the underlying collection the last element returned by the
+     * iterator (optional operation).  This method can be called only once per
+     * call to {@code next}.  The behavior of an iterator is unspecified if
+     * the underlying collection is modified while the iteration is in
+     * progress in any way other than by calling this method.
+     */
+    public void remove() {
+        if (current != null) {
+            iterator.remove();
+        }
+        else {
+            throw new IllegalStateException("Iteration has no current element.");
+        }
+    }
+
+    /**
+     * Used to tests whether or not an element fulfills certain criteria, and
+     * hence should be accepted by the FilterIterator instance.
+     */
+    public static interface Filter<E> {
+
+        /**
+         * Tests whether or not the element fulfills certain criteria, and hence
+         * should be accepted.
+         *
+         * @param pElement the element to test
+         * @return {@code true} if the object is accepted, otherwise
+         *         {@code false}
+         */
+        public boolean accept(E pElement);
+    }
 }
@@ -1,178 +1,180 @@
-/*
- * Copyright (c) 2008, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.util;
-
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * A {@code Map} decorator that makes the mappings in the backing map
- * case insensitive
- * (this is implemented by converting all keys to uppercase),
- *  if the keys used are {@code Strings}. If the keys
- * used are not {@code String}s, it wil work as a normal
- * {@code java.util.Map}.
- * <p/>
- *
- * @see java.util.Map
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- */
-public class IgnoreCaseMap<V> extends AbstractDecoratedMap<String, V> implements Serializable, Cloneable {
-
-    /**
-     * Constructs a new empty {@code Map}.
-     * The backing map will be a {@link java.util.HashMap}
-     */
-    public IgnoreCaseMap() {
-        super();
-    }
-
-    /**
-     * Constructs a new {@code Map} with the same key-value mappings as the
-     * given {@code Map}.
-     * The backing map will be a {@link java.util.HashMap}
-     * <p/>
-     * NOTE: As the keys in the given map parameter will be converted to
-     * uppercase (if they are strings), any duplicate key/value pair where
-     * {@code key instanceof String && key.equalsIgnoreCase(otherKey)}
-     * is true, will be lost.
-     *
-     * @param pMap the map whose mappings are to be placed in this map.
-     */
-    public IgnoreCaseMap(Map<String, ? extends V> pMap) {
-        super(pMap);
-    }
-
-    /**
-     * Constructs a new {@code Map} with the same key-value mappings as the
-     * given {@code Map}.
-     * <p/>
-     * NOTE: The backing map is structuraly cahnged, and it should NOT be
-     * accessed directly, after the wrapped map is created.
-     * <p/>
-     * NOTE: As the keys in the given map parameter will be converted to
-     * uppercase (if they are strings), any duplicate key/value pair where
-     * {@code key instanceof String && key.equalsIgnoreCase(otherKey)}
-     * is true, will be lost.
-     *
-     * @param pBacking the backing map of this map. Must be either empty, or
-     * the same map as {@code pContents}.
-     * @param pContents the map whose mappings are to be placed in this map.
-     * May be {@code null}
-     *
-     * @throws IllegalArgumentException if {@code pBacking} is {@code null}
-     * @throws IllegalArgumentException if {@code pBacking} differs from
-     * {@code pContent} and is not empty.
-     */
-    public IgnoreCaseMap(Map pBacking, Map<String, ? extends V> pContents) {
-        super(pBacking, pContents);
-    }
-
-    /**
-     * Maps the specified key to the specified value in this map.
-     * Note: If the key used is a string, the key will not be case-sensitive.
-     *
-     * @param pKey   the map key.
-     * @param pValue the value.
-     * @return the previous value of the specified key in this map,
-     *         or null if it did not have one.
-     */
-    public V put(String pKey, V pValue) {
-        String key = (String) toUpper(pKey);
-        return unwrap(entries.put(key, new BasicEntry<String, V>(key, pValue)));
-    }
-
-    private V unwrap(Entry<String, V> pEntry) {
-        return pEntry != null ? pEntry.getValue() : null;
-    }
-
-    /**
-     * Returns the value to which the specified key is mapped in this
-     * map.
-     * Note: If the key used is a string, the key will not be case-sensitive.
-     *
-     * @param pKey a key in the map
-     * @return the value to which the key is mapped in this map; null if
-     *         the key is not mapped to any value in this map.
-     */
-    public V get(Object pKey) {
-        return unwrap(entries.get(toUpper(pKey)));
-    }
-
-    /**
-     * Removes the key (and its corresponding value) from this map. This
-     * method does nothing if the key is not in the map.
-     * Note: If the key used is a string, the key will not be case-sensitive.
-     *
-     * @param pKey the key that needs to be removed.
-     * @return the value to which the key had been mapped in this map,
-     *         or null if the key did not have a mapping.
-     */
-    public V remove(Object pKey) {
-        return unwrap(entries.remove(toUpper(pKey)));
-    }
-
-    /**
-     * Tests if the specified object is a key in this map.
-     * Note: If the key used is a string, the key will not be case-sensitive.
-     *
-     * @param pKey possible key.
-     * @return true if and only if the specified object is a key in this
-     *         map, as determined by the equals method; false otherwise.
-     */
-    public boolean containsKey(Object pKey) {
-        return entries.containsKey(toUpper(pKey));
-    }
-
-    /**
-     * Converts the parameter to uppercase, if it's a String.
-     */
-    protected static Object toUpper(final Object pObject) {
-        if (pObject instanceof String) {
-            return ((String) pObject).toUpperCase();
-        }
-        return pObject;
-    }
-
-    protected Iterator<Entry<String, V>> newEntryIterator() {
-        return (Iterator) entries.entrySet().iterator();
-    }
-
-    protected Iterator<String> newKeyIterator() {
-        return entries.keySet().iterator();
-    }
-
-    protected Iterator<V> newValueIterator() {
-        return (Iterator<V>) entries.values().iterator();
-    }
-}
+/*
+ * Copyright (c) 2008, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.util;
+
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * A {@code Map} decorator that makes the mappings in the backing map
+ * case insensitive
+ * (this is implemented by converting all keys to uppercase),
+ *  if the keys used are {@code Strings}. If the keys
+ * used are not {@code String}s, it wil work as a normal
+ * {@code java.util.Map}.
+ *
+ * @see java.util.Map
+ *
+ * @author <
Author	SHA1	Message	Date
Harald Kuhr	26d3de45a7	[maven-release-plugin] prepare for next development iteration	2020-01-09 19:40:24 +01:00
Harald Kuhr	13507ce303	[maven-release-plugin] prepare release twelvemonkeys-3.4.3	2020-01-09 19:40:16 +01:00
Harald Kuhr	a8508dc234	Stick to the git user, when using ssh (cherry picked from commit `b6aec25f00`)	2020-01-09 19:28:35 +01:00
Harald Kuhr	b3cf467f0b	log4j removal (cherry picked from commit `ae213dcf5e`)	2020-01-09 19:25:48 +01:00
Harald Kuhr	b0e6fbed9f	#510 : Fixes possible hang situation (cherry picked from commit `5501c0e709`)	2020-01-09 19:25:48 +01:00
Harald Kuhr	c087addb76	#501 : Fix for TYPE_USHORT_555/565_RGB, ColorModel now 16 bits (cherry picked from commit `42e17f2063`)	2020-01-09 19:25:48 +01:00
Harald Kuhr	250c58cc2e	#289 , #493 : Finally implemented subsampling for < 8 bit samples (cherry picked from commit `0c2433dc9f`)	2020-01-09 19:25:48 +01:00
Oliver Schmidtmer	c33b3a76f4	Test correction for ViewBox based svg sizes (cherry picked from commit `810b7197ab`)	2020-01-09 19:24:58 +01:00
Oliver Schmidtmer	f14e6823bd	When rescaling SVGs use the ViewBox, if defined, for default sizes (cherry picked from commit `24a0786d64`)	2020-01-09 19:24:58 +01:00
Harald Kuhr	cae72336a2	[maven-release-plugin] prepare for next development iteration	2019-08-12 21:05:55 +02:00
Harald Kuhr	c5bf0a6f0b	[maven-release-plugin] prepare release twelvemonkeys-3.4.2	2019-08-12 21:03:23 +02:00
Harald Kuhr	691b7560db	Switched Maven SCM to use ssh. (cherry picked from commit `c1834dc78d`)	2019-08-12 20:42:24 +02:00
Harald Kuhr	e1025f9540	Fixed JavaDoc errors to enable Java 8 build. (cherry picked from commit `9e23413456`)	2019-08-10 00:58:08 +02:00
Harald Kuhr	fa09099da0	Fixed encoding issues in readme. (cherry picked from commit `7d2c692663`)	2019-08-09 21:04:41 +02:00
Harald Kuhr	140b074ac6	#398 : Better exception message when BufferedImage size > Integer.MAX (cherry picked from commit `9ce1a86cae`)	2019-08-09 21:04:41 +02:00
Harald Kuhr	59c6c18cbb	#477 : Better tests to for cyclic loops in IFDs. (cherry picked from commit `b0b5de5fa4`)	2019-08-09 21:04:41 +02:00
Harald Kuhr	c48e17dabf	#474 : Fix java.awt.color.CMMException: Can not access specified profile (cherry picked from commit `64178bd636`)	2019-08-09 21:04:41 +02:00
Harald Kuhr	22a842eb78	449# Missing test to verify that we ignore bogus 0 byte counts. (cherry picked from commit `7985cdd4a7`)	2019-08-09 21:04:41 +02:00
Harald Kuhr	bdd7f5b228	#492 : Now correctly parses multiple strings for ASCII fields. (cherry picked from commit `8247861095`)	2019-08-09 21:04:40 +02:00
Harald Kuhr	0e41d4a5f7	#477 : Avoid cyclic loops in IFDs. (cherry picked from commit `8480c929c1`)	2019-08-09 21:04:40 +02:00
Harald Kuhr	653360e054	Moving travis build to trusty, to fix JDK8 build (cherry picked from commit `e6f437f55b`)	2019-08-09 21:04:40 +02:00
Harald Kuhr	4f193d543c	#488 : Fix for AIOOBE in getEmbeddedICCProfile when ICC profile is empty (cherry picked from commit `ee049d9465`)	2019-08-09 21:04:40 +02:00
Harald Kuhr	1d0cc43476	#489 Fix for Unexpected End of PackBits Stream for padded streams. (cherry picked from commit `f6aa810f8b`)	2019-08-09 21:04:40 +02:00
Harald Kuhr	9791a251ed	#469 Fix for OOME while reading Exif with corrupted IFDs/counts (cherry picked from commit `e8d1b999a2`)	2019-08-09 21:04:40 +02:00
Harald Kuhr	0bc30f4d18	JPEG Exif parsing optimization. (cherry picked from commit `d7fbd6594e`)	2019-08-09 21:04:40 +02:00
Harald Kuhr	022fc03fbb	XMLSerializer speedup. (cherry picked from commit `caef9b6a9e`)	2019-08-09 21:04:39 +02:00
Harald Kuhr	8b66842859	#475 : Fix support for writing TIFF > 2 GB (cherry picked from commit `7fad4d5cd8`)	2019-08-09 21:04:39 +02:00
Harald Kuhr	5251f4665e	#473 : Fix for ColorMap (Indexed) TIFF with non-alpha ExtraSamples. (cherry picked from commit `3e4b14f984`)	2019-08-09 21:04:39 +02:00
Paul Verest	b98b81b877	colorize code snippets in README using GFM ```java,` ``xml (cherry picked from commit `51b0734462`)	2019-08-09 21:03:01 +02:00
Harald Kuhr	774b494fec	Updated commons-fileupload dependency to safe version, even if in scope provided, just in case. (cherry picked from commit `8e3cd5aedb`)	2019-08-09 21:03:00 +02:00
Oliver Schmidtmer	90ef605b0c	Fix for #455 : Ignore profiles PhotometricInterpretation MinIsWhite with 1bit/pixel (cherry picked from commit `cbaa0dc688`)	2019-08-09 21:03:00 +02:00
Harald Kuhr	b40eea0fc4	Fix test case for #446 in case of "Gerenic CMYK" profile not being available. (cherry picked from commit `61bac97933`)	2019-08-09 21:03:00 +02:00
Harald Kuhr	9ac2013965	Better assertion failed messages. (cherry picked from commit `3e9be32279`)	2019-08-09 21:03:00 +02:00
Harald Kuhr	4740a39cd2	Test case for #446 . (cherry picked from commit `a0955875d8`)	2019-08-09 21:03:00 +02:00
Harald Kuhr	7ebcc437c3	Various Java 9 and beyond fixes: - ExtraSamplesColorModel now overrides getComponentSize for correct size - TIFFImageReader/WriterSpi now recognizes the JEP 262 TIFF plugin - CCITTFaxEncoderStreamTest now directly creates writer (not JDK one) (cherry picked from commit `7e0de14783`)	2019-08-09 21:02:30 +02:00
Harald Kuhr	70c16dfdd9	Various Java 9 and beyond fixes. (cherry picked from commit `de34d4642e`)	2019-08-09 21:02:30 +02:00
Harald Kuhr	c9e2e21727	Equals method for DiscreteAlphaIndexColorModel, needed for Java 10. (cherry picked from commit `b86bad2bf9`)	2019-08-09 21:02:30 +02:00
Harald Kuhr	230ac33283	#442 SVG BaseURI issue fix (cherry picked from commit `cc5af0134c`)	2019-08-09 21:02:30 +02:00
Bernhard Fey	66e0acb668	Added test file for non-alpha extra channel Added test file for CMYK TIFF with non-alpha extra channel (cherry picked from commit `edcac25f5e`)	2019-08-09 21:02:30 +02:00
Bernhard Fey	7d8858c177	Modified new create[ImageTypeSpecifier] method according to suggestions by @haraldk Renamed "create" method to "createImageTypeSpecifier". Added exception thrown for unsupported planarConfiguration values. (cherry picked from commit `5a5c1f996b`)	2019-08-09 21:02:30 +02:00
Bernhard Fey	faab9517dd	Fix for non-RGB images with extra sample Added "create" method to TIFFImageReader that centralizes the use of "createBanded" and "createInterleaved" as well as the "extra samples" special case and fixes non-RGB images with non-alpha extra samples (cherry picked from commit `f9b8cae0ea`)	2019-08-09 21:02:30 +02:00
Harald Kuhr	2433777b6d	Updated readme (cherry picked from commit `62538c3db9`)	2019-08-09 21:02:13 +02:00
Harald Kuhr	3980c937cf	Fixed release date. (cherry picked from commit `48aa504be4`)	2019-08-09 21:02:13 +02:00
Harald Kuhr	468ffb891d	Updated versions from 3.4 to 3.4.1. (cherry picked from commit `ed2eb7642a`)	2019-08-09 21:02:13 +02:00
Harald Kuhr	e27e8a7ccb	#408 Added servlet JAR to dependency example. (cherry picked from commit `24ec5ae34d`)	2019-08-09 21:02:03 +02:00
Harald Kuhr	f2dba604da	#311 Updated some more license headers that was left out in the initial change. (cherry picked from commit `a7b374e51a`)	2019-08-09 21:01:29 +02:00
Harald Kuhr	04f27a1694	#438 CompoundDocument file descriptor fix	2018-09-08 16:21:01 +02:00
Harald Kuhr	2630a6a795	[maven-release-plugin] prepare for next development iteration	2018-09-07 19:48:17 +02:00
Harald Kuhr	ab2f1f7e91	[maven-release-plugin] prepare release twelvemonkeys-3.4.1	2018-09-07 19:48:10 +02:00
Harald Kuhr	7110e89bda	Prepare next release	2018-09-07 19:42:06 +02:00
Harald Kuhr	a06cbfd6f4	#437 Catching exception from static init, prints a warning and moves on. (cherry picked from commit `d8d0131`)	2018-08-30 15:04:55 +02:00
Harald Kuhr	3b68d676f3	#439 : Unclear exception message when passing image metadata as stream metadata (cherry picked from commit `6018093`)	2018-08-30 15:04:52 +02:00