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

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

Revision: 1971
          http://openutils.svn.sourceforge.net/openutils/?rev=1971&view=rev
Author:   diego_schivo
Date:     2010-02-17 09:50:56 +0000 (Wed, 17 Feb 2010)

Log Message:
-----------
MEDIA-109 Remove static method MediaModule.getInstance()

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/MediaBrowserPage.java
    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/tags/el/MediaEl.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java

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-02-17 09:34:12 UTC (rev 1970)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java	2010-02-17 09:50:56 UTC (rev 1971)
@@ -21,6 +21,7 @@
 
 import info.magnolia.module.ModuleLifecycle;
 import info.magnolia.module.ModuleLifecycleContext;
+import info.magnolia.module.ModuleRegistry;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 
@@ -36,12 +37,15 @@
 {
 
     /**
+     * Media module name.
+     */
+    public static final String NAME = "media";
+
+    /**
      * Media repository name.
      */
     public static final String REPO = "media";
 
-    private static MediaModule instance;
-
     private Logger log = LoggerFactory.getLogger(MediaModule.class);
 
     private boolean singleinstance;
@@ -55,19 +59,9 @@
      */
     public MediaModule()
     {
-        instance = this;
     }
 
     /**
-     * Get instance
-     * @return media module instance
-     */
-    public static MediaModule getInstance()
-    {
-        return instance;
-    }
-
-    /**
      * {@inheritDoc}
      */
     public void start(ModuleLifecycleContext ctx)

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java	2010-02-17 09:34:12 UTC (rev 1970)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java	2010-02-17 09:50:56 UTC (rev 1971)
@@ -40,6 +40,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
 
 import org.apache.commons.io.FileUtils;
@@ -369,7 +370,7 @@
      */
     public String getModuleVersion()
     {
-        return MediaModule.getInstance().getVersion();
+        return MediaEl.module().getVersion();
     }
 
 }

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-02-17 09:34:12 UTC (rev 1970)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-02-17 09:50:56 UTC (rev 1971)
@@ -52,6 +52,7 @@
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 
 import org.apache.commons.chain.Command;
 import org.apache.commons.collections.CollectionUtils;
@@ -264,7 +265,7 @@
                     try
                     {
                         mb.setWritable(media.getParent().isGranted(Permission.WRITE));
-                        mb.setCanPublish(!MediaModule.getInstance().isSingleinstance()
+                        mb.setCanPublish(!MediaEl.module().isSingleinstance()
                             && mb.isWritable()
                             && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber());
 
@@ -784,7 +785,7 @@
 
     public boolean isSingleInstance()
     {
-        return MediaModule.getInstance().isSingleinstance();
+        return MediaEl.module().isSingleinstance();
     }
 
     public String getBgSelector()

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2010-02-17 09:34:12 UTC (rev 1970)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2010-02-17 09:50:56 UTC (rev 1971)
@@ -25,6 +25,7 @@
 import info.magnolia.cms.core.NodeData;
 import info.magnolia.cms.util.NodeDataUtil;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.module.ModuleRegistry;
 
 import java.awt.Point;
 import java.util.ArrayList;
@@ -79,7 +80,7 @@
      */
     public static MediaModule module()
     {
-        return MediaModule.getInstance();
+        return (MediaModule) ModuleRegistry.Factory.getInstance().getModuleInstance(MediaModule.NAME);
     }
 
     /**

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java	2010-02-17 09:34:12 UTC (rev 1970)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java	2010-02-17 09:50:56 UTC (rev 1971)
@@ -37,6 +37,7 @@
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -214,7 +215,7 @@
             tree.addMenuItem(menuCut);
             tree.addMenuItem(menuCopy);
 
-            if (!MediaModule.getInstance().isSingleinstance())
+            if (!MediaEl.module().isSingleinstance())
             {
                 tree.addSeparator();
                 tree.addMenuItem(menuActivateExcl);
@@ -255,7 +256,7 @@
 
         tree.addColumn(column0);
 
-        if (!browseMode && !MediaModule.getInstance().isSingleinstance())
+        if (!browseMode && !MediaEl.module().isSingleinstance())
         {
 
             if (ServerConfiguration.getInstance().isAdmin()

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-02-17 09:34:12 UTC (rev 1970)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-02-17 09:50:56 UTC (rev 1971)
@@ -41,6 +41,7 @@
 
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
 
 import org.apache.commons.lang.StringUtils;
@@ -137,7 +138,7 @@
                 media.save();
             }
 
-            if (MediaModule.getInstance().isSingleinstance())
+            if (MediaEl.module().isSingleinstance())
             {
                 media.getMetaData().setActivated();
                 media.save();

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java	2010-02-17 09:34:12 UTC (rev 1970)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java	2010-02-17 09:50:56 UTC (rev 1971)
@@ -38,6 +38,7 @@
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
+import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -107,7 +108,7 @@
             NodeDataUtil.getOrCreateAndSet(media, "modificationDate", Calendar.getInstance());
             NodeDataUtil.getOrCreateAndSet(media, "modificationUser", MgnlContext.getUser().getName());
 
-            if (MediaModule.getInstance().isSingleinstance())
+            if (MediaEl.module().isSingleinstance())
             {
                 media.getMetaData().setActivated();
             }
@@ -169,7 +170,7 @@
                     contentNodeName,
                     MediaConfigurationManager.FOLDER);
 
-                if (MediaModule.getInstance().isSingleinstance() && !currContent.getMetaData().getIsActivated())
+                if (MediaEl.module().isSingleinstance() && !currContent.getMetaData().getIsActivated())
                 {
                     currContent.getMetaData().setActivated();
                 }


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