[Openutils-svn] SF.net SVN: openutils:[1906] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media

[<fg...@us...>]

Revision: 1906
          http://openutils.svn.sourceforge.net/openutils/?rev=1906&view=rev
Author:   fgiust
Date:     2010-02-13 13:09:35 +0000 (Sat, 13 Feb 2010)

Log Message:
-----------
MEDIA-14 Better image naming

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java	2010-02-12 15:16:59 UTC (rev 1905)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/DialogFileImage.java	2010-02-13 13:09:35 UTC (rev 1906)
@@ -237,6 +237,8 @@
     {
         return MediaConfigurationManager.getInstance().getURIMappingPrefix()
             + this.getStorageNode().getHandle()
-            + "/resolutions/thumbnail/data.jpg";
+            + "/resolutions/thumbnail/"
+            + this.getStorageNode().getName()
+            + ".jpg";
     }
 }

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java	2010-02-12 15:16:59 UTC (rev 1905)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/ImageTypeHandler.java	2010-02-13 13:09:35 UTC (rev 1906)
@@ -58,7 +58,9 @@
         }
         return MediaConfigurationManager.getInstance().getURIMappingPrefix()
             + media.getHandle()
-            + "/resolutions/thumbnail/data."
+            + "/resolutions/thumbnail/"
+            + media.getName()
+            + "."
             + ImageUtils.getExtension(media, "thumbnail");
     }
 
@@ -74,7 +76,9 @@
         }
         return MediaConfigurationManager.getInstance().getURIMappingPrefix()
             + media.getHandle()
-            + "/resolutions/preview/data."
+            + "/resolutions/preview/"
+            + media.getName()
+            + "."
             + ImageUtils.getExtension(media, "preview");
     }
 

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java	2010-02-12 15:16:59 UTC (rev 1905)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/MediaWithPreviewImageTypeHandler.java	2010-02-13 13:09:35 UTC (rev 1906)
@@ -51,7 +51,9 @@
 
         return MediaConfigurationManager.getInstance().getURIMappingPrefix()
             + media.getHandle()
-            + "/resolutions/thumbnail/data."
+            + "/resolutions/thumbnail/"
+            + media.getName()
+            + "."
             + ImageUtils.getExtension(media, "thumbnail");
     }
 

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2010-02-12 15:16:59 UTC (rev 1905)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2010-02-13 13:09:35 UTC (rev 1906)
@@ -46,7 +46,6 @@
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -425,7 +424,7 @@
                 }
                 nd.setAttribute(ImageUtils.RESOLUTION_PROPERTY, originalRes);
                 nd.setAttribute(FileProperties.PROPERTY_EXTENSION, extension);
-                nd.setAttribute(FileProperties.PROPERTY_FILENAME, "data");
+                nd.setAttribute(FileProperties.PROPERTY_FILENAME, saveTo.getName());
                 nd.setAttribute(FileProperties.PROPERTY_CONTENTTYPE, mimetype);
                 nd.setAttribute(FileProperties.PROPERTY_LASTMODIFIED, GregorianCalendar.getInstance(TimeZone
                     .getDefault()));
@@ -702,8 +701,10 @@
 
                     if (image.getContentLength() == 0)
                     {
-                        throw new RuntimeException("Invalid image nodedata " + image.getHandle()
-                                + ", size " + image.getContentLength());
+                        throw new RuntimeException("Invalid image nodedata "
+                            + image.getHandle()
+                            + ", size "
+                            + image.getContentLength());
                     }
 
                     String extension = image.getAttribute(FileProperties.PROPERTY_EXTENSION);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.