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

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

Revision: 2747
          http://openutils.svn.sourceforge.net/openutils/?rev=2747&view=rev
Author:   diego_schivo
Date:     2010-06-30 09:47:08 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
MEDIA-145 refactoring

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java

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-06-30 09:28:32 UTC (rev 2746)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-30 09:47:08 UTC (rev 2747)
@@ -53,8 +53,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
@@ -157,6 +155,7 @@
 
         if (!StringUtils.isEmpty(mediaType))
         {
+            // subset of types specified by selectMedia control
             String[] mediaTypes = StringUtils.split(mediaType, ",");
             type = mediaTypes[0];
             types = new ArrayList<MediaTypeConfiguration>();
@@ -165,13 +164,12 @@
                 types.add(MediaConfigurationManager.getInstance().getTypes().get(mt));
             }
         }
-        else if (type == null)
-        {
-            type = MediaConfigurationManager.getInstance().getTypes().entrySet().iterator().next().getKey();
-            types = MediaConfigurationManager.getInstance().getTypes().values();
-        }
         else
         {
+            if (StringUtils.isEmpty(type))
+            {
+                type = MediaConfigurationManager.getInstance().getTypes().keySet().iterator().next();
+            }
             types = MediaConfigurationManager.getInstance().getTypes().values();
         }
 


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