code cleanup, fix for ReplaceInputStream

[nikiroo-utils.git] / src / be / nikiroo / utils / Image.java

diff --git a/src/be/nikiroo/utils/Image.java b/src/be/nikiroo/utils/Image.java
index ace43dedc59d52b596442575ac75fefae2ef99a7..58b1f5aeac05f71370365ac9c3a562f70f722797 100644 (file)
--- a/src/be/nikiroo/utils/Image.java
+++ b/src/be/nikiroo/utils/Image.java
@@ -3,7 +3,6 @@ package be.nikiroo.utils;
 import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -51,19 +50,6 @@ public class Image implements Closeable {
                }
        }
 
-       /**
-        * Create a new {@link Image} from its Base64 representation.
-        * 
-        * @param base64
-        *            the {@link Image} in Base64 format
-        * 
-        * @throws IOException
-        *             in case of I/O error
-        */
-       public Image(String base64) throws IOException {
-               this(Base64.decode(base64));
-       }
-
        /**
         * Create a new {@link Image} from a stream.
         * 
@@ -79,7 +65,8 @@ public class Image implements Closeable {
        }
 
        /**
-        * Generate an {@link InputStream} for this {@link Image}.
+        * Generate an {@link InputStream} that you can {@link InputStream#reset()}
+        * for this {@link Image}.
         * <p>
         * This {@link InputStream} will (always) be a new one, and <b>you</b> are
         * responsible for it.
@@ -93,7 +80,7 @@ public class Image implements Closeable {
         *             in case of I/O error
         */
        public InputStream newInputStream() throws IOException {
-               return new MarkableFileInputStream(new FileInputStream(data));
+               return new MarkableFileInputStream(data);
        }
 
        /**
@@ -117,23 +104,6 @@ public class Image implements Closeable {
                }
        }
 
-       /**
-        * Convert the given {@link Image} object into a Base64 representation of
-        * the same {@link Image} object.
-        * <p>
-        * Note: if possible, prefer the {@link Image#newInputStream()} method, as
-        * it can be more efficient.
-        * 
-        * @return the Base64 representation
-        */
-       public String toBase64() {
-               try {
-                       return StringUtils.base64(getData(), false);
-               } catch (IOException e) {
-                       throw new RuntimeException(e);
-               }
-       }
-
        /**
         * Closing the {@link Image} will delete the associated temporary file on
         * disk.