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

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

Revision: 1905
          http://openutils.svn.sourceforge.net/openutils/?rev=1905&view=rev
Author:   diego_schivo
Date:     2010-02-12 15:16:59 +0000 (Fri, 12 Feb 2010)

Log Message:
-----------
MEDIA-87 bootstrap dam-support only if stk module is present

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java

Removed Paths:
-------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/BootstrapDamSupportTask.java

Deleted: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/BootstrapDamSupportTask.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/BootstrapDamSupportTask.java	2010-02-12 15:03:15 UTC (rev 1904)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/BootstrapDamSupportTask.java	2010-02-12 15:16:59 UTC (rev 1905)
@@ -1,33 +0,0 @@
-package net.sourceforge.openutils.mgnlmedia.media.setup;
-
-import info.magnolia.module.InstallContext;
-import info.magnolia.module.ModuleRegistry;
-import it.openutils.mgnltasks.BootstrapMissingNodesTask;
-
-
-/**
- * @author dschivo
- * @version $Id$
- */
-public class BootstrapDamSupportTask extends BootstrapMissingNodesTask
-{
-
-    /**
-     * 
-     */
-    public BootstrapDamSupportTask(String folder)
-    {
-        super(folder);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected boolean acceptResource(InstallContext installContext, String name)
-    {
-        return ModuleRegistry.Factory.getInstance().getDefinition("standard-templating-kit") != null
-            && super.acceptResource(installContext, name);
-    }
-
-}

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2010-02-12 15:03:15 UTC (rev 1904)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/setup/MediaModuleVersionHandler.java	2010-02-12 15:16:59 UTC (rev 1905)
@@ -22,9 +22,11 @@
 import info.magnolia.cms.beans.config.ContentRepository;
 import info.magnolia.cms.core.SystemProperty;
 import info.magnolia.module.InstallContext;
+import info.magnolia.module.ModuleRegistry;
 import info.magnolia.module.delta.Delta;
 import info.magnolia.module.delta.Task;
 import info.magnolia.module.model.Version;
+import it.openutils.mgnltasks.BootstrapMissingNodesTask;
 import it.openutils.mgnltasks.ChangeExistingPropertyTask;
 import it.openutils.mgnltasks.CreateMissingPropertyTask;
 import it.openutils.mgnltasks.NodeSortTask;
@@ -115,14 +117,13 @@
     @Override
     public List<Delta> getDeltas(InstallContext ctx, Version from)
     {
-        if (from == null)
+        List<Delta> deltas = super.getDeltas(ctx, from);
+        if (from == null && ModuleRegistry.Factory.getInstance().getDefinition("standard-templating-kit") != null)
         {
-            List<Delta> deltas = super.getDeltas(ctx, from);
             // adding the "-dam" in addiction to the standard bootstrap directory
             deltas.get(0).getTasks().add(
-                new BootstrapDamSupportTask(ctx.getCurrentModuleDefinition().getName() + "-dam"));
-            return deltas;
+                new BootstrapMissingNodesTask(ctx.getCurrentModuleDefinition().getName() + "-dam"));
         }
-        return super.getDeltas(ctx, from);
+        return deltas;
     }
 }


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