X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FImage.java;h=4518577d640b684bee939381e02b9aa745b2d3a2;hb=919bbc354cd2555eb0955be0ef2dcf338047d022;hp=f2b94991417ff922dba3a8c00713fe7202912657;hpb=a6a73de36765b85947ac885529da82d3e7189269;p=fanfix.git

diff --git a/src/be/nikiroo/utils/Image.java b/src/be/nikiroo/utils/Image.java
deleted file mode 100644
index f2b9499..0000000
--- a/src/be/nikiroo/utils/Image.java
+++ /dev/null
@@ -1,176 +0,0 @@
-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;
-
-import be.nikiroo.utils.streams.MarkableFileInputStream;
-
-/**
- * This class represents an image data.
- * 
- * @author niki
- */
-public class Image implements Closeable {
-	static private File tempRoot;
-	static private TempFiles tmpRepository;
-	static private long count = 0;
-	static private Object lock = new Object();
-
-	private File data;
-
-	/**
-	 * Do not use -- for serialisation purposes only.
-	 */
-	@SuppressWarnings("unused")
-	private Image() {
-	}
-
-	/**
-	 * Create a new {@link Image} with the given data.
-	 * 
-	 * @param data
-	 *            the data
-	 */
-	public Image(byte[] data) {
-		ByteArrayInputStream in = new ByteArrayInputStream(data);
-		try {
-			this.data = getTemporaryFile();
-			IOUtils.write(in, this.data);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		} finally {
-			try {
-				in.close();
-			} catch (IOException e) {
-				throw new RuntimeException(e);
-			}
-		}
-	}
-
-	/**
-	 * Create a new {@link Image} from a stream.
-	 * 
-	 * @param in
-	 *            the stream
-	 * 
-	 * @throws IOException
-	 *             in case of I/O error
-	 */
-	public Image(InputStream in) throws IOException {
-		data = getTemporaryFile();
-		IOUtils.write(in, data);
-	}
-
-	/**
-	 * 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.
-	 * <p>
-	 * Note: take care that the {@link InputStream} <b>must not</b> live past
-	 * the {@link Image} life time!
-	 * 
-	 * @return the stream
-	 * 
-	 * @throws IOException
-	 *             in case of I/O error
-	 */
-	public InputStream newInputStream() throws IOException {
-		return new MarkableFileInputStream(new FileInputStream(data));
-	}
-
-	/**
-	 * <b>Read</b> the actual image data, as a byte array.
-	 * <p>
-	 * Note: if possible, prefer the {@link Image#newInputStream()} method, as
-	 * it can be more efficient.
-	 * 
-	 * @return the image data
-	 */
-	public byte[] getData() {
-		try {
-			InputStream in = newInputStream();
-			try {
-				return IOUtils.toByteArray(in);
-			} finally {
-				in.close();
-			}
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	/**
-	 * Closing the {@link Image} will delete the associated temporary file on
-	 * disk.
-	 * <p>
-	 * Note that even if you don't, the program will still <b>try</b> to delete
-	 * all the temporary files at JVM termination.
-	 */
-	@Override
-	public void close() throws IOException {
-		data.delete();
-		synchronized (lock) {
-			count--;
-			if (count <= 0) {
-				count = 0;
-				tmpRepository.close();
-				tmpRepository = null;
-			}
-		}
-	}
-
-	@Override
-	protected void finalize() throws Throwable {
-		try {
-			close();
-		} finally {
-			super.finalize();
-		}
-	}
-
-	/**
-	 * Return a newly created temporary file to work on.
-	 * 
-	 * @return the file
-	 * 
-	 * @throws IOException
-	 *             in case of I/O error
-	 */
-	private File getTemporaryFile() throws IOException {
-		synchronized (lock) {
-			if (tmpRepository == null) {
-				tmpRepository = new TempFiles(tempRoot, "images");
-				count = 0;
-			}
-
-			count++;
-
-			return tmpRepository.createTempFile("image");
-		}
-	}
-
-	/**
-	 * Change the temporary root directory used by the program.
-	 * <p>
-	 * Caution: the directory will be <b>owned</b> by the system, all its files
-	 * now belong to us (and will most probably be deleted).
-	 * <p>
-	 * Note: it may take some time until the new temporary root is used, we
-	 * first need to make sure the previous one is not used anymore (i.e., we
-	 * must reach a point where no unclosed {@link Image} remains in memory) to
-	 * switch the temporary root.
-	 * 
-	 * @param root
-	 *            the new temporary root, which will be <b>owned</b> by the
-	 *            system
-	 */
-	public static void setTemporaryFilesRoot(File root) {
-		tempRoot = root;
-	}
-}