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

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

Revision: 1822
          http://openutils.svn.sourceforge.net/openutils/?rev=1822&view=rev
Author:   fgiust
Date:     2010-02-06 16:42:05 +0000 (Sat, 06 Feb 2010)

Log Message:
-----------
cleanup properties handling for zip upload

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java	2010-02-06 16:01:56 UTC (rev 1821)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java	2010-02-06 16:42:05 UTC (rev 1822)
@@ -21,8 +21,8 @@
 
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.NodeData;
 import info.magnolia.cms.core.Path;
+import info.magnolia.cms.security.AccessDeniedException;
 import info.magnolia.cms.util.ContentUtil;
 import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
@@ -100,25 +100,13 @@
                 Path.getUniqueLabel(parentNode, cleanFilename),
                 MediaConfigurationManager.MEDIA.getSystemName());
 
-            NodeData nd = NodeDataUtil.getOrCreate(media, "type");
-            nd.setValue(mtc.getName());
+            setNodedataOnlyIfNotExisting(media, "creator", MgnlContext.getUser().getName());
+            setNodedataOnlyIfNotExisting(media, "creationDate", Calendar.getInstance());
 
-            nd = NodeDataUtil.getOrCreate(media, "creator");
-            if (StringUtils.isEmpty(nd.getString()))
-            {
-                nd.setValue(MgnlContext.getUser().getName());
-            }
+            NodeDataUtil.getOrCreateAndSet(media, "type", mtc.getName());
+            NodeDataUtil.getOrCreateAndSet(media, "modificationDate", Calendar.getInstance());
+            NodeDataUtil.getOrCreateAndSet(media, "modificationUser", MgnlContext.getUser().getName());
 
-            nd = NodeDataUtil.getOrCreate(media, "creationDate");
-            if (nd.getDate() == null)
-            {
-                nd.setValue(Calendar.getInstance());
-            }
-            nd.setValue(MgnlContext.getUser().getName());
-
-            nd = NodeDataUtil.getOrCreate(media, "modificationDate");
-            nd.setValue(Calendar.getInstance());
-
             if (MediaModule.getInstance().isSingleinstance())
             {
                 media.getMetaData().setActivated();
@@ -145,6 +133,22 @@
     }
 
     /**
+     * @param media
+     * @param key
+     * @param value
+     * @throws RepositoryException
+     * @throws AccessDeniedException
+     */
+    private static void setNodedataOnlyIfNotExisting(Content media, String key, Object value)
+        throws RepositoryException, AccessDeniedException
+    {
+        if (media.hasNodeData(key))
+        {
+            NodeDataUtil.getOrCreateAndSet(media, key, value);
+        }
+    }
+
+    /**
      * Get the content node matching required path using hierarchy manager. If the required path doesn't exist create
      * it.
      * @param mgr hierarchy manager


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