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

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

Revision: 2741
          http://openutils.svn.sourceforge.net/openutils/?rev=2741&view=rev
Author:   diego_schivo
Date:     2010-06-30 07:39:12 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
MEDIA-145 refactoring: moved "page" and "items" fields to super-class

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
    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/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2010-06-30 07:23:21 UTC (rev 2740)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2010-06-30 07:39:12 UTC (rev 2741)
@@ -396,12 +396,14 @@
      * @param path
      * @param type
      * @param search
-     * @param recursive
-     * @param pageIndex
-     * @param pageSize
+     * @param childrenOnly
+     * @param sorting
+     * @param itemsPerPage
+     * @param pageNumberStartingFromOne
      * @return
      */
-    public AdvancedResult find(String path, String type, String search, boolean childrenOnly, String sorting, int pageIndex, int pageSize)
+    public AdvancedResult find(String path, String type, String search, boolean childrenOnly, String sorting,
+        int itemsPerPage, int pageNumberStartingFromOne)
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(MediaModule.REPO);
 
@@ -438,10 +440,10 @@
         }
 
         // paging
-        if (pageSize > 0)
+        if (itemsPerPage > 0)
         {
-            criteria.setFirstResult(pageIndex * pageSize);
-            criteria.setMaxResults(pageSize);
+            criteria.setFirstResult((pageNumberStartingFromOne - 1) * itemsPerPage);
+            criteria.setMaxResults(itemsPerPage);
         }
 
         return criteria.execute();

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2010-06-30 07:23:21 UTC (rev 2740)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2010-06-30 07:39:12 UTC (rev 2741)
@@ -56,10 +56,6 @@
 
     private String selectTab;
 
-    private int page = 1;
-
-    private int items = 100;
-
     /**
      * @param name
      * @param request
@@ -240,41 +236,4 @@
     {
         this.selectTab = selectTab;
     }
-
-    /**
-     * Returns the page.
-     * @return the page
-     */
-    public int getPage()
-    {
-        return page;
-    }
-
-    /**
-     * Sets the page.
-     * @param page the page to set
-     */
-    public void setPage(int page)
-    {
-        this.page = page;
-    }
-
-    /**
-     * Returns the items.
-     * @return the items
-     */
-    public int getItems()
-    {
-        return items;
-    }
-
-    /**
-     * Sets the items.
-     * @param items the items to set
-     */
-    public void setItems(int items)
-    {
-        this.items = items;
-    }
-
 }

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 07:23:21 UTC (rev 2740)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-30 07:39:12 UTC (rev 2741)
@@ -134,7 +134,9 @@
 
     protected List<Page> pages;
 
-    protected int page;
+    protected int page = 1;
+    
+    protected int items = 10;
 
     /**
      * @param name
@@ -195,11 +197,6 @@
         bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
         sorting = StringUtils.defaultIfEmpty(sorting, SORT_BY_CREATIONDATE);
 
-        if (page <= 0)
-        {
-            page = 1;
-        }
-
         develop = SystemProperty.getBooleanProperty("magnolia.develop");
     }
 
@@ -218,7 +215,7 @@
                 StringUtils.isEmpty(search),
                 null,
                 0,
-                -1);
+                1);
             numberOfMedia.put(mtc.getName(), (int) typeResult.getItems().getSize());
         }
     }
@@ -248,8 +245,8 @@
                     null,
                     true,
                     sorting,
-                    page - 1,
-                    5);
+                    items,
+                    page);
             }
         }
         else if (!StringUtils.isBlank(search))
@@ -812,6 +809,24 @@
         this.page = page;
     }
 
+    /**
+     * Returns the items.
+     * @return the items
+     */
+    public int getItems()
+    {
+        return items;
+    }
+
+    /**
+     * Sets the items.
+     * @param items the items to set
+     */
+    public void setItems(int items)
+    {
+        this.items = items;
+    }
+
     public boolean isSingleInstance()
     {
         return MediaEl.module().isSingleinstance();


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