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

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

Revision: 1992
          http://openutils.svn.sourceforge.net/openutils/?rev=1992&view=rev
Author:   diego_schivo
Date:     2010-02-18 15:23:36 +0000 (Thu, 18 Feb 2010)

Log Message:
-----------
MEDIA-100 removing width/height when not specified

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java	2010-02-18 15:23:28 UTC (rev 1991)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/MediaCustomSaveHandler.java	2010-02-18 15:23:36 UTC (rev 1992)
@@ -23,6 +23,7 @@
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.module.admininterface.FieldSaveHandler;
 
@@ -35,6 +36,7 @@
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,6 +70,14 @@
             {
                 parentNode.deleteNodeData(name);
             }
+            if (parentNode.hasNodeData(name + "_width"))
+            {
+                parentNode.deleteNodeData(name + "width");
+            }
+            if (parentNode.hasNodeData(name + "_height"))
+            {
+                parentNode.deleteNodeData(name + "_height");
+            }
 
             return;
         }
@@ -97,6 +107,22 @@
             log.warn("Missing media {} referenced in node {}", value, parentNode.getHandle());
         }
 
+        boolean resizing = NodeDataUtil.getBoolean(configNode, "resizing", false);
+        for (String dimKey : new String[]{
+            "width", "height"
+        })
+        {
+            String paramName = name + '_' + dimKey;
+            long dimValue = NumberUtils.toLong(request.getParameter(paramName), -1);
+            if (resizing && dimValue >= 0)
+            {
+                NodeDataUtil.getOrCreateAndSet(parentNode, paramName, dimValue);
+            }
+            else if (parentNode.hasNodeData(paramName))
+            {
+                parentNode.deleteNodeData(paramName);
+            }
+        }
     }
 
 }

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-02-18 15:23:28 UTC (rev 1991)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-02-18 15:23:36 UTC (rev 1992)
@@ -103,17 +103,6 @@
         NodeData nd = NodeDataUtil.getOrCreate(parentNode, name);
         nd.setValue(uuid);
 
-        for (String dimKey : new String[]{
-            "width", "height"
-        })
-        {
-            String paramName = name + '_' + dimKey;
-            long dimValue = NumberUtils.toLong(request.getParameter(paramName), -1);
-            if (dimValue >= 0)
-            {
-                NodeDataUtil.getOrCreateAndSet(parentNode, paramName, dimValue);
-            }
-        }
         return true;
     }
 


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