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

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

Revision: 2752
          http://openutils.svn.sourceforge.net/openutils/?rev=2752&view=rev
Author:   diego_schivo
Date:     2010-06-30 10:27:26 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
MEDIA-145 media-type before path

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/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 10:24:33 UTC (rev 2751)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2010-06-30 10:27:26 UTC (rev 2752)
@@ -392,9 +392,9 @@
     }
 
     /**
-     * Media search using Magnolia Criteria API
+     * Finds media items using Magnolia Criteria API.
+     * @param mediaType
      * @param path
-     * @param type
      * @param search
      * @param childrenOnly
      * @param sorting
@@ -402,7 +402,7 @@
      * @param pageNumberStartingFromOne
      * @return
      */
-    public AdvancedResult find(String path, String type, String search, boolean childrenOnly, String sorting,
+    public AdvancedResult find(String mediaType, String path, String search, boolean childrenOnly, String sorting,
         int itemsPerPage, int pageNumberStartingFromOne)
     {
         Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(MediaModule.REPO);
@@ -418,9 +418,9 @@
         criteria.add(Restrictions.eq("@jcr:primaryType", MGNL_MEDIA_TYPE));
 
         // media type
-        if (!StringUtils.isEmpty(type))
+        if (!StringUtils.isEmpty(mediaType))
         {
-            criteria.add(Restrictions.eq("@type", type));
+            criteria.add(Restrictions.eq("@type", mediaType));
         }
 
         // search text

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 10:24:33 UTC (rev 2751)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-30 10:27:26 UTC (rev 2752)
@@ -207,8 +207,8 @@
             return 0;
         }
         AdvancedResult typeResult = MediaConfigurationManager.getInstance().find(
+            mtc.getName(),
             path,
-            mtc.getName(),
             search,
             StringUtils.isEmpty(search),
             null,
@@ -232,8 +232,8 @@
                 writable = folder.isGranted(Permission.WRITE);
                 canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
                 result = MediaConfigurationManager.getInstance().find(
+                    type,
                     folder.getHandle(),
-                    type,
                     null,
                     true,
                     sorting,


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