diff --git a/.classpath b/.classpath
deleted file mode 100644
index b29c137..0000000
--- a/.classpath
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.project b/.project
deleted file mode 100644
index b2c7999..0000000
--- a/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
- Zallery
-
-
- ZUtil
-
-
-
- org.eclipse.wst.jsdt.core.javascriptValidator
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
-
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.wst.common.project.facet.core.nature
- org.eclipse.jdt.core.javanature
- org.eclipse.wst.jsdt.core.jsNature
-
-
diff --git a/build.xml b/build.xml
deleted file mode 100755
index d033c56..0000000
--- a/build.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/zall/bean/Image.java b/src/zall/bean/Image.java
index 12bd980..61aafa5 100644
--- a/src/zall/bean/Image.java
+++ b/src/zall/bean/Image.java
@@ -2,6 +2,7 @@ package zall.bean;
import java.awt.image.BufferedImage;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.sql.PreparedStatement;
import java.sql.SQLException;
@@ -83,10 +84,10 @@ public class Image extends Media {
}
/**
- * Returns the file for the image, and generates a thumbnail if the specified size is missing
- *
* @param size is the size of the image
+ * @return the path to the image file, and generates a thumbnail if the specified size is missing
*/
+ @Override
public File getFile(Size size) throws IOException {
if (fileName != null) {
switch (size) {
@@ -116,9 +117,9 @@ public class Image extends Media {
ImageIO.write(image, IMAGE_FORMAT, file);
}
else if (!orgFile.exists())
- logger.severe("Original image file missing: \"" + file.getAbsolutePath() + "\"");
+ logger.severe("Original image file missing: '" + file.getAbsolutePath() + "'");
else if (orgFile.canRead())
- logger.severe("Can not read original image file: \"" + file.getAbsolutePath() + "\"");
+ logger.severe("Can not read original image file: '" + file.getAbsolutePath() + "'");
}
return file;
}
diff --git a/src/zall/bean/Media.java b/src/zall/bean/Media.java
index 3b044b1..eab0f62 100644
--- a/src/zall/bean/Media.java
+++ b/src/zall/bean/Media.java
@@ -1,5 +1,7 @@
package zall.bean;
+import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.sql.SQLException;
import java.sql.Timestamp;
@@ -128,5 +130,10 @@ public abstract class Media extends DBBean implements Comparable {
*/
public abstract String getFileExtension(Size size);
+ public File getFile(Size size) throws IOException {
+ return ResourceManager.getFile(this, size);
+ }
+
+
public abstract Type getType();
}
diff --git a/src/zall/manager/ResourceManager.java b/src/zall/manager/ResourceManager.java
index 34d9da7..a320dd8 100644
--- a/src/zall/manager/ResourceManager.java
+++ b/src/zall/manager/ResourceManager.java
@@ -44,7 +44,7 @@ public class ResourceManager {
private static final Logger logger = LogUtil.getLogger();
/**
- * @param media is the media to find on the filesystem
+ * @param media is the media to find on the filesystem.
* @param size specifies the size of the media.
* @return a File object that points to the physical file on the disk, or null.
*/
@@ -77,7 +77,7 @@ public class ResourceManager {
}
// Add the filename
- File mediaFile = new File(folder, media.getFileName());
+ File mediaFile = new File(folder, media.getFileName() + "." + media.getFileExtension(size));
logger.finest("File path: " + mediaFile.getAbsolutePath());
return mediaFile;
diff --git a/src/zall/page/ContentServlet.java b/src/zall/page/ContentServlet.java
index 44acd63..9cd660c 100755
--- a/src/zall/page/ContentServlet.java
+++ b/src/zall/page/ContentServlet.java
@@ -56,7 +56,7 @@ public class ContentServlet extends ZalleryServlet {
if (request.getParameter("size") != null)
size = Media.Size.valueOf(request.getParameter("size").toUpperCase());
- File file = ResourceManager.getFile(media, size);
+ File file = media.getFile(size);
String extension = media.getFileExtension(size);
if (request.getParameter("download") != null)