[Openutils-svn] SF.net SVN: openutils:[2789] trunk/openutils-mgnlmedia/src/main

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

Revision: 2789
          http://openutils.svn.sourceforge.net/openutils/?rev=2789&view=rev
Author:   diego_schivo
Date:     2010-07-02 07:55:14 +0000 (Fri, 02 Jul 2010)

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

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

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-07-02 07:51:31 UTC (rev 2788)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-07-02 07:55:14 UTC (rev 2789)
@@ -138,7 +138,7 @@
 
     protected int page = 1;
 
-    protected AdvancedResult contentMediaDetails;
+    protected AdvancedResult searchResult;
 
     /**
      * @param name
@@ -263,14 +263,14 @@
             numberOfMedia.put(type.getName(), countMediaItems(type));
         }
 
-        contentMediaDetails = findMediaItems();
-        if (contentMediaDetails != null)
+        searchResult = findMediaItems();
+        if (searchResult != null)
         {
             MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
             // casts Iterator<AdvancedResultItem> to Iterator<Content>
-            Iterator<Content> contentIterator = Iterators.filter(contentMediaDetails.getItems(), Content.class);
+            Iterator<Content> contentIterator = Iterators.filter(searchResult.getItems(), Content.class);
             medias = Iterators.transform(contentIterator, new MediaBeanBuilder(mtc));
-            pages = MgnlPagingElFunctions.pageList(contentMediaDetails.getNumberOfPages(), 5, "page");
+            pages = MgnlPagingElFunctions.pageList(searchResult.getNumberOfPages(), 5, "page");
         }
         if (medias == null)
         {
@@ -816,12 +816,12 @@
     }
 
     /**
-     * Returns the contentMediaDetails.
-     * @return the contentMediaDetails
+     * Returns the searchResult.
+     * @return the searchResult
      */
-    public AdvancedResult getContentMediaDetails()
+    public AdvancedResult getSearchResult()
     {
-        return contentMediaDetails;
+        return searchResult;
     }
 
     public boolean isSingleInstance()

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage-xml.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage-xml.html	2010-07-02 07:51:31 UTC (rev 2788)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage-xml.html	2010-07-02 07:55:14 UTC (rev 2789)
@@ -8,11 +8,11 @@
   [#assign mediaEl = this.getStatic("net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl")]
   <location><![CDATA[${mgnlEl.baseUrl()}/media/search?${this.currentQueryString()}]]></location>
   <date>${dateUtils.toXsdDate(cal.getInstance())}</date>
-  <meta rel="page">${this.contentMediaDetails.page}</meta>
-  <meta rel="itemsperpage">${this.contentMediaDetails.itemsPerPage}</meta>
-  <meta rel="totalitems">${this.contentMediaDetails.totalSize}</meta> 
+  <meta rel="page">${this.searchResult.page}</meta>
+  <meta rel="itemsperpage">${this.searchResult.itemsPerPage}</meta>
+  <meta rel="totalitems">${this.searchResult.totalSize}</meta> 
   <trackList>
-  [#list this.contentMediaDetails.items as mediaDetail]
+  [#list this.searchResult.items as mediaDetail]
     [#assign mediaLocale = xxxx.getFirstMediaLocale(mediaDetail, this.locale)]
     [#assign mediaNode = mediaEl.node(mediaDetail.@uuid)]
     <track>


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