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

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

Revision: 3538
          http://openutils.svn.sourceforge.net/openutils/?rev=3538&view=rev
Author:   fgiust
Date:     2011-06-16 10:57:00 +0000 (Thu, 16 Jun 2011)

Log Message:
-----------
cleanup handling of "thumbnail" and "preview" resolutions

Modified Paths:
--------------
    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/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2011-06-16 10:51:10 UTC (rev 3537)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2011-06-16 10:57:00 UTC (rev 3538)
@@ -85,6 +85,26 @@
 {
 
     /**
+     * Size for the "preview" resolution.
+     */
+    private static final String RESOLUTION_PREVIEW_SIZE = "l450x350";
+
+    /**
+     * Size for the "thumbnail" resolution.
+     */
+    private static final String RESOLUTION_THUMBNAIL_SIZE = "l100x100";
+
+    /**
+     * Name for the "preview" resolution.
+     */
+    private static final String RESOLUTION_PREVIEW = "preview";
+
+    /**
+     * Name for the "thumbnail" resolution.
+     */
+    private static final String RESOLUTION_THUMBNAIL = "thumbnail";
+
+    /**
      * Logger.
      */
     private static Logger log = LoggerFactory.getLogger(ImageUtils.class);
@@ -625,7 +645,7 @@
 
         String resolution = resolutionTarget;
 
-        if (!"thumbnail".equals(resolutionTarget) && !"preview".equals(resolutionTarget))
+        if (!RESOLUTION_THUMBNAIL.equals(resolutionTarget) && !RESOLUTION_PREVIEW.equals(resolutionTarget))
         {
             resolution = "res-" + resolutionTarget;
         }
@@ -689,13 +709,13 @@
                     HierarchyManager hm = MgnlContext.getHierarchyManager(MediaModule.REPO);
                     String resolution = resolutionTarget;
 
-                    if ("thumbnail".equals(resolution))
+                    if (RESOLUTION_THUMBNAIL.equals(resolution))
                     {
-                        resolution = "l100x100";
+                        resolution = RESOLUTION_THUMBNAIL_SIZE;
                     }
-                    if ("preview".equals(resolution))
+                    if (RESOLUTION_PREVIEW.equals(resolution))
                     {
-                        resolution = "l450x350";
+                        resolution = RESOLUTION_PREVIEW_SIZE;
                     }
 
                     Content node;
@@ -771,7 +791,8 @@
                         {
                             forceProgressive = true;
                         }
-                        if ("thumbnail".equals(resolutionTarget) || "preview".equals(resolutionTarget))
+                        if (RESOLUTION_THUMBNAIL.equals(resolutionTarget)
+                            || RESOLUTION_PREVIEW.equals(resolutionTarget))
                         {
                             ImageUtils
                                 .saveResolution(img, node, resolutionTarget, extension, quality, forceProgressive);
@@ -1006,6 +1027,23 @@
         }
     }
 
+    private static String normalizeResolutionString(String res)
+    {
+
+        String resolution = StringUtils.lowerCase(res);
+
+        if (RESOLUTION_THUMBNAIL.equals(resolution))
+        {
+            return RESOLUTION_THUMBNAIL_SIZE;
+        }
+        if (RESOLUTION_PREVIEW.equals(resolution))
+        {
+            return RESOLUTION_PREVIEW_SIZE;
+        }
+
+        return resolution;
+    }
+
     /**
      * Parse resolution string for required sizesuper.read(b);
      * @param res resolution string
@@ -1014,7 +1052,7 @@
     public static java.awt.Point parseForSize(String res)
     {
         Point size = new Point();
-        String resolution = StringUtils.lowerCase(res);
+        String resolution = normalizeResolutionString(res);
 
         if (StringUtils.contains(resolution, ";"))
         {


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