Revision: 3260
http://openutils.svn.sourceforge.net/openutils/?rev=3260&view=rev
Author: fgiust
Date: 2011-01-23 18:22:47 +0000 (Sun, 23 Jan 2011)
Log Message:
-----------
magnolia 4.0.0 compatibility
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/configuration/MediaUsedInManager.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 2011-01-23 17:59:32 UTC (rev 3259)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2011-01-23 18:22:47 UTC (rev 3260)
@@ -294,7 +294,8 @@
*/
public String getURIMappingPrefix()
{
- for (URI2RepositoryMapping mapping : URI2RepositoryManager.getInstance().getMappings())
+ Collection<URI2RepositoryMapping> mappings = URI2RepositoryManager.getInstance().getMappings();
+ for (URI2RepositoryMapping mapping : mappings)
{
if (mapping.getRepository().equals(MediaModule.REPO))
{
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2011-01-23 17:59:32 UTC (rev 3259)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaUsedInManager.java 2011-01-23 18:22:47 UTC (rev 3260)
@@ -26,10 +26,10 @@
import info.magnolia.cms.core.search.Query;
import info.magnolia.cms.core.search.QueryManager;
import info.magnolia.cms.core.search.QueryResult;
+import info.magnolia.cms.util.FactoryUtil;
import info.magnolia.content2bean.Content2BeanException;
import info.magnolia.content2bean.Content2BeanUtil;
import info.magnolia.context.MgnlContext;
-import info.magnolia.objectfactory.Components;
import java.util.ArrayList;
import java.util.Collection;
@@ -57,7 +57,7 @@
public static MediaUsedInManager getInstance()
{
- return Components.getSingleton(MediaUsedInManager.class);
+ return (MediaUsedInManager) FactoryUtil.getSingleton(MediaUsedInManager.class);
}
private Logger log = LoggerFactory.getLogger(MediaUsedInManager.class);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
