[Openutils-svn] SF.net SVN: openutils:[4556] magnoliamodules/branches/magnolia44/ openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media /dialog/LayerDialogMVC.java

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

Revision: 4556
          http://openutils.svn.sourceforge.net/openutils/?rev=4556&view=rev
Author:   diego_schivo
Date:     2014-01-28 15:45:34 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
MEDIA-311 LayerDialogMVC onSaveFailed

Modified Paths:
--------------
    magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java

Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java	2014-01-28 15:40:36 UTC (rev 4555)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialogMVC.java	2014-01-28 15:45:34 UTC (rev 4556)
@@ -151,22 +151,7 @@
 
         // TODO rename dei nodi in base al filename?
 
-        boolean result = MediaConfigurationManager.getInstance().getTypes().get(type).getHandler().onPostSave(node);
-        // MEDIA-311
-        if (!result && newNode)
-        {
-            try
-            {
-                Content parent = node.getParent();
-                node.delete();
-                parent.save();
-            }
-            catch (RepositoryException e)
-            {
-                log.error(e.getMessage(), e);
-            }
-        }
-        return result;
+        return MediaConfigurationManager.getInstance().getTypes().get(type).getHandler().onPostSave(node);
     }
 
     /**
@@ -203,4 +188,31 @@
 
         return super.onPreSave(control);
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected String onSaveFailed()
+    {
+        // MEDIA-311
+        if (newNode)
+        {
+            Content node = getStorageNode();
+            if (node != null)
+            {
+                try
+                {
+                    Content parent = node.getParent();
+                    node.delete();
+                    parent.save();
+                }
+                catch (RepositoryException e)
+                {
+                    log.error(e.getMessage(), e);
+                }
+            }
+        }
+        return super.onSaveFailed();
+    }
 }

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