[Openutils-svn] SF.net SVN: openutils:[4561] magnoliamodules/branches/magnolia44/ openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media /zip/DefaultZipImporter.java

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

Revision: 4561
          http://openutils.svn.sourceforge.net/openutils/?rev=4561&view=rev
Author:   diego_schivo
Date:     2014-02-07 11:54:48 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
MEDIA-313 - Possibility to automatically rename files imported from zip archive

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

Modified: magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java	2014-02-07 11:44:47 UTC (rev 4560)
+++ magnoliamodules/branches/magnolia44/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/zip/DefaultZipImporter.java	2014-02-07 11:54:48 UTC (rev 4561)
@@ -84,10 +84,17 @@
 
                     parent = StringUtils.substringBeforeLast(parent, "/");
 
-                    String baseName = StringUtils.defaultIfEmpty(baseFilename, FilenameUtils.getBaseName(filename));
+                    String baseName;
+                    if (!StringUtils.isEmpty(baseFilename))
+                    {
+                        baseName = baseFilename + (i + 1);
+                    }
+                    else
+                    {
+                        baseName = FilenameUtils.getBaseName(filename);
+                    }
                     String extension = FilenameUtils.getExtension(filename);
                     filename = baseName
-                        + (i + 1)
                         + (!StringUtils.isEmpty(extension) ? FilenameUtils.EXTENSION_SEPARATOR : StringUtils.EMPTY)
                         + StringUtils.defaultString(extension);
                     MediaLoadUtils.loadEntry(

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