openutils-svn

[Openutils-svn] SF.net SVN: openutils: [192] trunk/openutils-dbmigration/src/main/java/it/ openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

[<fc...@us...>]

Revision: 192
          http://svn.sourceforge.net/openutils/?rev=192&view=rev
Author:   fcarone
Date:     2007-02-02 01:23:36 -0800 (Fri, 02 Feb 2007)

Log Message:
-----------
More javadocs.

Modified Paths:
--------------
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-02-02 09:19:59 UTC (rev 191)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-02-02 09:23:36 UTC (rev 192)
@@ -29,6 +29,9 @@
      */
     private static Logger log = LoggerFactory.getLogger(GenericScriptBasedConditionalTask.class);
 
+    /**
+     * Script list to execute
+     */
     protected List<Resource> scripts;
 
     private String check;
@@ -51,6 +54,10 @@
         this.check = check;
     }
 
+    /**
+     * @param script The script resource
+     * @return The script name
+     */
     protected String objectNameFromFileName(Resource script)
     {
         return StringUtils.substringBeforeLast(script.getFilename(), ".");


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

[Openutils-svn] SF.net SVN: openutils: [350] trunk/openutils-dbmigration/src/main/java/it/ openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

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

Revision: 350
          http://svn.sourceforge.net/openutils/?rev=350&view=rev
Author:   fgiust
Date:     2007-07-03 14:47:37 -0700 (Tue, 03 Jul 2007)

Log Message:
-----------
fix getDescription()

Modified Paths:
--------------
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-07-03 07:58:42 UTC (rev 349)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-07-03 21:47:37 UTC (rev 350)
@@ -68,8 +68,22 @@
      */
     public String getDescription()
     {
-        // @todo add better description and avoid NPEs
-        return "Checking " + objectNameFromFileName(scripts.get(0));
+        if (scripts == null)
+        {
+            return "Nothing to do, no scripts configured";
+        }
+
+        StringBuffer result = new StringBuffer();
+        if (!scripts.isEmpty())
+        {
+            result.append("Checking :\n");
+            for (Resource script : scripts)
+            {
+                result.append("  - " + objectNameFromFileName(script) + "\n");
+            }
+
+        }
+        return result.toString();
     }
 
     /**


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

[Openutils-svn] SF.net SVN: openutils: [358] trunk/openutils-dbmigration/src/main/java/it/ openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

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

Revision: 358
          http://svn.sourceforge.net/openutils/?rev=358&view=rev
Author:   fgiust
Date:     2007-07-12 02:29:18 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
allow a custom description

Modified Paths:
--------------
    trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java

Modified: trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java
===================================================================
--- trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-07-12 09:18:12 UTC (rev 357)
+++ trunk/openutils-dbmigration/src/main/java/it/openutils/migration/task/setup/GenericScriptBasedConditionalTask.java	2007-07-12 09:29:18 UTC (rev 358)
@@ -34,9 +34,17 @@
      */
     protected List<Resource> scripts;
 
-    private String check;
+    /**
+     * Check statement.
+     */
+    protected String check;
 
     /**
+     * Custom description.
+     */
+    protected String description;
+
+    /**
      * Sets the scripts.
      * @param scripts the scripts to set
      */
@@ -55,6 +63,15 @@
     }
 
     /**
+     * Sets the description.
+     * @param description the description to set
+     */
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
+
+    /**
      * @param script The script resource
      * @return The script name
      */
@@ -68,6 +85,11 @@
      */
     public String getDescription()
     {
+        if (StringUtils.isNotEmpty(description))
+        {
+            return description;
+        }
+
         if (scripts == null)
         {
             return "Nothing to do, no scripts configured";


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