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

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

Revision: 1786
          http://openutils.svn.sourceforge.net/openutils/?rev=1786&view=rev
Author:   diego_schivo
Date:     2010-02-03 10:17:35 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
MEDIA-54 We should deprecated the autoactivate property and add a better named "singleinstance" one.

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/MediaFolderViewPage.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-03 10:09:18 UTC (rev 1785)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java	2010-02-03 10:17:35 UTC (rev 1786)
@@ -42,7 +42,7 @@
 
     private Logger log = LoggerFactory.getLogger(MediaModule.class);
 
-    private boolean autoactivate;
+    private boolean singleinstance;
 
     private static MediaModule instance;
 
@@ -85,24 +85,46 @@
     }
 
     /**
+     * @deprecated use singleinstance
      * Returns the autoactivate.
      * @return the autoactivate
      */
+    @Deprecated
     public boolean isAutoactivate()
     {
-        return autoactivate;
+        return singleinstance;
     }
 
     /**
+     * @deprecated use singleinstance
      * Sets the autoactivate.
      * @param autoactivate the autoactivate to set
      */
+    @Deprecated
     public void setAutoactivate(boolean autoactivate)
     {
-        this.autoactivate = autoactivate;
+        this.singleinstance = autoactivate;
     }
 
     /**
+     * Returns the singleinstance.
+     * @return the singleinstance
+     */
+    public boolean isSingleinstance()
+    {
+        return singleinstance;
+    }
+
+    /**
+     * Sets the singleinstance.
+     * @param singleinstance the singleinstance to set
+     */
+    public void setSingleinstance(boolean singleinstance)
+    {
+        this.singleinstance = singleinstance;
+    }
+
+    /**
      * Returns the version.
      * @return the version
      */

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-03 10:09:18 UTC (rev 1785)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-02-03 10:17:35 UTC (rev 1786)
@@ -256,7 +256,7 @@
                 try
                 {
                     mb.setWritable(media.getParent().isGranted(Permission.WRITE));
-                    mb.setCanPublish(!MediaModule.getInstance().isAutoactivate()
+                    mb.setCanPublish(!MediaModule.getInstance().isSingleinstance()
                         && mb.isWritable()
                         && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber());
 

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-03 10:09:18 UTC (rev 1785)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java	2010-02-03 10:17:35 UTC (rev 1786)
@@ -214,7 +214,7 @@
             tree.addMenuItem(menuCut);
             tree.addMenuItem(menuCopy);
 
-            if (!MediaModule.getInstance().isAutoactivate())
+            if (!MediaModule.getInstance().isSingleinstance())
             {
                 tree.addSeparator();
                 tree.addMenuItem(menuActivateExcl);
@@ -255,7 +255,7 @@
 
         tree.addColumn(column0);
 
-        if (!browseMode && !MediaModule.getInstance().isAutoactivate())
+        if (!browseMode && !MediaModule.getInstance().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-03 10:09:18 UTC (rev 1785)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-02-03 10:17:35 UTC (rev 1786)
@@ -136,7 +136,7 @@
                 media.save();
             }
 
-            if (MediaModule.getInstance().isAutoactivate())
+            if (MediaModule.getInstance().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-03 10:09:18 UTC (rev 1785)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java	2010-02-03 10:17:35 UTC (rev 1786)
@@ -119,7 +119,7 @@
             nd = NodeDataUtil.getOrCreate(media, "modificationDate");
             nd.setValue(Calendar.getInstance());
 
-            if (MediaModule.getInstance().isAutoactivate())
+            if (MediaModule.getInstance().isSingleinstance())
             {
                 media.getMetaData().setActivated();
             }
@@ -165,7 +165,7 @@
                     contentNodeName,
                     MediaConfigurationManager.FOLDER);
 
-                if (MediaModule.getInstance().isAutoactivate() && !currContent.getMetaData().getIsActivated())
+                if (MediaModule.getInstance().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.