X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fjpeg%2FInternalExifLibrary.java;fp=tim%2Fprune%2Fjpeg%2FInternalExifLibrary.java;h=377155fd2f862fc1a30f040fda7a16c52273b505;hp=c8b17089990bc405ada9492ab06bdc3937674200;hb=92dad5df664287acb51728e9ea599f150765d34a;hpb=81843c3d8d0771bf00d0f26034a13aa515465c78

diff --git a/tim/prune/jpeg/InternalExifLibrary.java b/tim/prune/jpeg/InternalExifLibrary.java
index c8b1708..377155f 100644
--- a/tim/prune/jpeg/InternalExifLibrary.java
+++ b/tim/prune/jpeg/InternalExifLibrary.java
@@ -1,15 +1,15 @@
 package tim.prune.jpeg;
 
 import java.io.File;
+
 import tim.prune.jpeg.drew.ExifReader;
-import tim.prune.jpeg.drew.JpegException;
+import tim.prune.jpeg.drew.ExifException;
 
 /**
- * Class to act as a gateway into the internal exif library functions.
+ * Class to act as an entry point to the internal exif library functions.
  * This should be the only class with dependence on the jpeg.drew package.
- * Should not be included if external library will be used (eg Debian).
  */
-public class InternalExifLibrary implements ExifLibrary
+public class InternalExifLibrary
 {
 	/**
 	 * Use the _internal_ exif library to get the data from the given file
@@ -20,23 +20,9 @@ public class InternalExifLibrary implements ExifLibrary
 	{
 		JpegData data = null;
 		try {
-			data = new ExifReader(inFile).extract();
+			data = ExifReader.readMetadata(inFile);
 		}
-		catch (JpegException jpe) {} // data remains null
+		catch (ExifException jpe) {} // data remains null
 		return data;
 	}
-
-	/**
-	 * Check whether the exifreader class can be correctly resolved
-	 * @return true if it looks ok
-	 */
-	public boolean looksOK()
-	{
-		try {
-			String test = ExifReader.class.getName();
-			if (test != null) return true;
-		}
-		catch (LinkageError le) {}
-		return false;
-	}
 }