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

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

Revision: 2734
          http://openutils.svn.sourceforge.net/openutils/?rev=2734&view=rev
Author:   diego_schivo
Date:     2010-06-30 06:24:40 +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 06:17:44 UTC (rev 2733)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-30 06:24:40 UTC (rev 2734)
@@ -40,6 +40,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -230,7 +231,6 @@
     @Override
     public String show()
     {
-        HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModule.REPO);
         final MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
 
         AdvancedResult typeResult = null;
@@ -251,7 +251,6 @@
                     sorting,
                     page - 1,
                     5);
-                pages = MgnlPagingElFunctions.pageList(typeResult.getNumberOfPages(), 5, "page");
             }
         }
         else if (!StringUtils.isBlank(search))
@@ -262,16 +261,14 @@
             typeResult = MediaConfigurationManager.getInstance().find(null, type, search, false, sorting, 0, -1);
         }
 
-        medias = null;
+        medias = CollectionUtils.EMPTY_COLLECTION;
+        pages = Collections.emptyList();
         if (typeResult != null)
         {
             ResultIterator<AdvancedResultItem> items = typeResult.getItems();
             medias = Lists.newArrayList(Iterators.transform(items, new MediaBeanBuilder(mtc)));
+            pages = MgnlPagingElFunctions.pageList(typeResult.getNumberOfPages(), 5, "page");
         }
-        if (medias == null)
-        {
-            medias = CollectionUtils.EMPTY_COLLECTION;
-        }
 
         return super.show();
     }


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