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

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

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

Log Message:
-----------
MEDIA-145 moved call to fillNumberOfMediaPerType() from init() to show() because sub-classes (adv-search pages) do not need it

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 08:36:11 UTC (rev 2743)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-30 08:59:38 UTC (rev 2744)
@@ -177,11 +177,6 @@
             types = MediaConfigurationManager.getInstance().getTypes().values();
         }
 
-        if (!StringUtils.isBlank(path) || !StringUtils.isBlank(search))
-        {
-            fillNumberOfMediaPerType();
-        }
-
         bgSelector = null;
         sorting = null;
         for (Cookie cookie : request.getCookies())
@@ -228,7 +223,10 @@
     @Override
     public String show()
     {
-        final MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
+        if (!StringUtils.isBlank(path) || !StringUtils.isBlank(search))
+        {
+            fillNumberOfMediaPerType();
+        }
 
         AdvancedResult typeResult = null;
 
@@ -262,8 +260,8 @@
         pages = Collections.emptyList();
         if (typeResult != null)
         {
-            ResultIterator<AdvancedResultItem> items = typeResult.getItems();
-            medias = Iterators.transform(items, new MediaBeanBuilder(mtc));
+            MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
+            medias = Iterators.transform(typeResult.getItems(), new MediaBeanBuilder(mtc));
             pages = MgnlPagingElFunctions.pageList(typeResult.getNumberOfPages(), 5, "page");
         }
 


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