Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[2780] trunk/openutils-mgnlmedia/src/main
|
From: <die...@us...> - 2010-07-01 10:47:52
|
Revision: 2780
http://openutils.svn.sourceforge.net/openutils/?rev=2780&view=rev
Author: diego_schivo
Date: 2010-07-01 10:47:46 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
MEDIA-145 refactoring
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.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
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-07-01 10:36:26 UTC (rev 2779)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-07-01 10:47:46 UTC (rev 2780)
@@ -19,15 +19,12 @@
package net.sourceforge.openutils.mgnlmedia.media.lifecycle;
-import info.magnolia.cms.beans.config.ContentRepository;
import info.magnolia.module.ModuleLifecycle;
import info.magnolia.module.ModuleLifecycleContext;
-import info.magnolia.module.ModuleRegistry;
import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaUsedInManager;
-import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -181,10 +178,4 @@
{
this.folderViewItemsPerPage = folderViewItemsPerPage;
}
-
- public static SearchMediaQueryConfiguration getSearchConfiguration()
- {
- return ((MediaModule) ModuleRegistry.Factory.getInstance().getModuleInstance(NAME)).getSearch();
- }
-
}
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-07-01 10:36:26 UTC (rev 2779)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-07-01 10:47:46 UTC (rev 2780)
@@ -19,12 +19,16 @@
package net.sourceforge.openutils.mgnlmedia.media.pages;
+import java.util.Map;
+
import info.magnolia.freemarker.FreemarkerUtil;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilter;
+import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
@@ -45,6 +49,8 @@
private String selectTab;
+ private Map<String, SearchFilter> filters;
+
/**
* @param name
* @param request
@@ -53,6 +59,7 @@
public MediaAdvancedSearchPage(String name, HttpServletRequest request, HttpServletResponse response)
{
super(name, request, response);
+ filters = MediaEl.module().getSearch().getFilters();
}
@Override
@@ -77,7 +84,11 @@
// no need to count media per type on xml requests
return 0;
}
- return configuration.search(request, mtc.getName(), "/", true, SORT_BY_SCORE, 0, 1).getTotalSize();
+ return MediaEl
+ .module()
+ .getSearch()
+ .search(request, mtc.getName(), "/", true, SORT_BY_SCORE, 0, 1)
+ .getTotalSize();
}
/**
@@ -87,14 +98,19 @@
protected AdvancedResult findMediaItems()
{
// @todo defaultBasePath handling only on xml requests?
+ SearchMediaQueryConfiguration searchConfig = MediaEl.module().getSearch();
if ("xml".equals(format))
{
- return configuration.search(request, null, null, true, SORT_BY_SCORE, MediaEl
- .module()
- .getSearch()
- .getXmlItemsPerPage(), page);
+ return searchConfig.search(
+ request,
+ null,
+ null,
+ true,
+ SORT_BY_SCORE,
+ searchConfig.getXmlItemsPerPage(),
+ page);
}
- return configuration.search(
+ return searchConfig.search(
request,
type,
"/",
@@ -165,6 +181,15 @@
}
/**
+ * Returns the filters.
+ * @return the filters
+ */
+ public Map<String, SearchFilter> getFilters()
+ {
+ return filters;
+ }
+
+ /**
* {@inheritDoc}
*/
@Override
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-01 10:36:26 UTC (rev 2779)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-07-01 10:47:46 UTC (rev 2780)
@@ -53,7 +53,6 @@
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
@@ -141,8 +140,6 @@
protected AdvancedResult contentMediaDetails;
- protected SearchMediaQueryConfiguration configuration;
-
/**
* @param name
* @param request
@@ -151,7 +148,6 @@
public MediaFolderViewPage(String name, HttpServletRequest request, HttpServletResponse response)
{
super(name, request, response);
- configuration = MediaModule.getSearchConfiguration();
}
/**
@@ -216,8 +212,14 @@
return 0;
}
// sorting must be specified for total-size to work (-1 otherwise)
- AdvancedResult typeResult = configuration
- .search(request, mtc.getName(), path, false, getDefaultSorting(), 0, 1);
+ AdvancedResult typeResult = MediaEl.module().getSearch().search(
+ request,
+ mtc.getName(),
+ path,
+ false,
+ getDefaultSorting(),
+ 0,
+ 1);
return typeResult.getTotalSize();
}
@@ -238,7 +240,7 @@
}
writable = folder.isGranted(Permission.WRITE);
canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
- return configuration.search(
+ return MediaEl.module().getSearch().search(
request,
type,
path,
@@ -815,15 +817,6 @@
return contentMediaDetails;
}
- /**
- * Returns the configuration.
- * @return the configuration
- */
- public SearchMediaQueryConfiguration getConfiguration()
- {
- return configuration;
- }
-
public boolean isSingleInstance()
{
return MediaEl.module().isSingleinstance();
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2010-07-01 10:36:26 UTC (rev 2779)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2010-07-01 10:47:46 UTC (rev 2780)
@@ -24,7 +24,7 @@
[/#if]
[/#list]
[/#macro]
- [@rendersFilter filters=this.configuration.filters /]
+ [@rendersFilter this.filters /]
<input type="hidden" name="selectMedia" value="${this.selectMedia?string('true', 'false')}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
