[Openutils-svn] SF.net SVN: openutils:[1715] trunk/openutils-mgnlmedia/src/main

[<die...@us...>]

Revision: 1715
          http://openutils.svn.sourceforge.net/openutils/?rev=1715&view=rev
Author:   diego_schivo
Date:     2010-01-29 16:55:42 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
MEDIA-42 Add image format info in gallery

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java	2010-01-29 16:51:27 UTC (rev 1714)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBean.java	2010-01-29 16:55:42 UTC (rev 1715)
@@ -56,6 +56,8 @@
 
     private boolean writable;
 
+    private String formatInfo;
+
     /**
      * Returns the metaData.
      * @return the metaData
@@ -254,4 +256,22 @@
         this.writable = writable;
     }
 
+    /**
+     * Returns the formatInfo.
+     * @return the formatInfo
+     */
+    public String getFormatInfo()
+    {
+        return formatInfo;
+    }
+
+    /**
+     * Sets the formatInfo.
+     * @param formatInfo the formatInfo to set
+     */
+    public void setFormatInfo(String formatInfo)
+    {
+        this.formatInfo = formatInfo;
+    }
+
 }
\ No newline at end of file

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-01-29 16:51:27 UTC (rev 1714)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-01-29 16:55:42 UTC (rev 1715)
@@ -19,6 +19,7 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.pages;
 
+import info.magnolia.cms.beans.runtime.FileProperties;
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.cms.core.ItemType;
@@ -32,6 +33,7 @@
 import info.magnolia.cms.security.Permission;
 import info.magnolia.cms.util.AlertUtil;
 import info.magnolia.cms.util.ExclusiveWrite;
+import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.commands.CommandsManager;
 import info.magnolia.context.Context;
 import info.magnolia.context.MgnlContext;
@@ -51,6 +53,7 @@
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 
 import org.apache.commons.chain.Command;
 import org.apache.commons.lang.StringUtils;
@@ -267,6 +270,18 @@
                 {
                     log.error("Exception caught", ex);
                 }
+
+                if ("image".equals(type))
+                {
+                    int[] size = MediaEl.getSize(media, "original");
+                    mb.setFormatInfo(mtc.getHandler().getExtension(media)
+                        + ' '
+                        + size[0]
+                        + 'x'
+                        + size[1]
+                        + ' '
+                        + mtc.getHandler().getSize(media));
+                }
                 medias.add(mb);
             }
         }

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java	2010-01-29 16:51:27 UTC (rev 1714)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/MediaTypeHandler.java	2010-01-29 16:55:42 UTC (rev 1715)
@@ -95,6 +95,13 @@
     String getExtension(Content media);
 
     /**
+     * return size
+     * @param media media
+     * @return size
+     */
+    String getSize(Content media);
+
+    /**
      * return filename
      * @param media media
      * @return filename

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-01-29 16:51:27 UTC (rev 1714)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-01-29 16:55:42 UTC (rev 1715)
@@ -185,6 +185,14 @@
     /**
      * {@inheritDoc}
      */
+    public String getSize(Content media)
+    {
+        return new FileProperties(media, ORGINAL_NODEDATA_NAME).getProperty(FileProperties.SIZE);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
     public String getFilename(Content media)
     {
         return getOriginalFileNodeData(media).getAttribute(FileProperties.PROPERTY_FILENAME);

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2010-01-29 16:51:27 UTC (rev 1714)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2010-01-29 16:55:42 UTC (rev 1715)
@@ -232,6 +232,9 @@
           <#else>${name}
           </#if>
         </span>
+        <#if media.formatInfo??>
+          <div>${media.formatInfo}</div>
+        </#if>
       </li>
       </#list>
     </ul>


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