[Openutils-svn] SF.net SVN: openutils:[4308] magnoliamodules/trunk

[<fg...@us...>]

Revision: 4308
          http://openutils.svn.sourceforge.net/openutils/?rev=4308&view=rev
Author:   fgiust
Date:     2013-09-15 14:45:32 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
cleanup deprecations

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java

Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java	2013-09-15 14:41:50 UTC (rev 4307)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java	2013-09-15 14:45:32 UTC (rev 4308)
@@ -19,12 +19,13 @@
 
 package it.openutils.mgnltasks;
 
+import info.magnolia.init.MagnoliaConfigurationProperties;
 import info.magnolia.module.DefaultModuleVersionHandler;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.Delta;
 import info.magnolia.module.delta.DeltaBuilder;
 import info.magnolia.module.model.Version;
-import it.openutils.mgnlutils.el.MgnlUtilsDeprecatedAdapters;
+import info.magnolia.objectfactory.Components;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -99,12 +100,14 @@
                 .add(new BootstrapMissingNodesTask(ctx.getCurrentModuleDefinition().getName() + "-nooverwrite"));
 
             // only for development, add the (module)-dev bootstrap directory
-            if (MgnlUtilsDeprecatedAdapters.getBooleanProperty("magnolia.develop"))
+            if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty("magnolia.develop"))
             {
-                if (StringUtils.isEmpty(MgnlUtilsDeprecatedAdapters.getProperty("magnolia.bootstrapdev"))
-                    || StringUtils.contains(MgnlUtilsDeprecatedAdapters.getProperty("magnolia.bootstrapdev"), ctx
-                        .getCurrentModuleDefinition()
-                        .getName()))
+                if (StringUtils.isEmpty(Components.getComponent(MagnoliaConfigurationProperties.class).getProperty(
+                    "magnolia.bootstrapdev"))
+                    || StringUtils.contains(
+                        Components.getComponent(MagnoliaConfigurationProperties.class).getProperty(
+                            "magnolia.bootstrapdev"),
+                        ctx.getCurrentModuleDefinition().getName()))
                 {
                     deltas
                         .get(0)
@@ -122,7 +125,8 @@
 
         List<Delta> deltas = new ArrayList<Delta>();
 
-        if (MgnlUtilsDeprecatedAdapters.getBooleanProperty(modulename + ".update.disabled"))
+        if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty(
+            modulename + ".update.disabled"))
         {
             return deltas;
         }

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java	2013-09-15 14:41:50 UTC (rev 4307)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsDeprecatedAdapters.java	2013-09-15 14:45:32 UTC (rev 4308)
@@ -104,16 +104,6 @@
         return null;
     }
 
-    public static String getProperty(String name)
-    {
-        return SystemProperty.getProperty(name);
-    }
-
-    public static boolean getBooleanProperty(String name)
-    {
-        return SystemProperty.getBooleanProperty(name);
-    }
-
     public static Properties systemProperties()
     {
         return SystemProperty.getProperties();

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2013-09-15 14:41:50 UTC (rev 4307)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java	2013-09-15 14:45:32 UTC (rev 4308)
@@ -32,6 +32,7 @@
 import info.magnolia.cms.security.auth.Entity;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.context.WebContext;
+import info.magnolia.init.MagnoliaConfigurationProperties;
 import info.magnolia.jaas.principal.EntityImpl;
 import info.magnolia.jcr.util.ContentMap;
 import info.magnolia.jcr.util.NodeUtil;
@@ -217,7 +218,7 @@
      */
     public static boolean develop()
     {
-        return MgnlUtilsDeprecatedAdapters.getBooleanProperty("magnolia.develop");
+        return Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty("magnolia.develop");
     }
 
     /**
@@ -1249,7 +1250,7 @@
      */
     public static String systemProperty(String key)
     {
-        return MgnlUtilsDeprecatedAdapters.getProperty(key);
+        return Components.getComponent(MagnoliaConfigurationProperties.class).getProperty(key);
     }
 
     /**

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