[Openutils-svn] SF.net SVN: openutils:[2107] trunk/openutils-elfunctions/src/main

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

Revision: 2107
          http://openutils.svn.sourceforge.net/openutils/?rev=2107&view=rev
Author:   diego_schivo
Date:     2010-03-08 14:09:21 +0000 (Mon, 08 Mar 2010)

Log Message:
-----------
ELFUNCTIONS-6 EL function currentDateIncluded

Modified Paths:
--------------
    trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/DateElUtils.java
    trunk/openutils-elfunctions/src/main/resources/META-INF/dateutils.tld

Modified: trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/DateElUtils.java
===================================================================
--- trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/DateElUtils.java	2010-03-08 13:59:59 UTC (rev 2106)
+++ trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/DateElUtils.java	2010-03-08 14:09:21 UTC (rev 2107)
@@ -327,4 +327,31 @@
         return midniteCalendar;
     }
 
+    /**
+     * Tests if the current date is between the specified time limits
+     * @param from
+     * @param to
+     * @return
+     */
+    public static boolean currentDateIncluded(Calendar from, Calendar to)
+    {
+        if (from == null && to == null)
+        {
+            return true;
+        }
+
+        Calendar now = Calendar.getInstance();
+
+        if (from != null && now.before(from))
+        {
+            return false;
+        }
+        if (to != null && now.after(to))
+        {
+            return false;
+        }
+        return true;
+
+    }
+
 }

Modified: trunk/openutils-elfunctions/src/main/resources/META-INF/dateutils.tld
===================================================================
--- trunk/openutils-elfunctions/src/main/resources/META-INF/dateutils.tld	2010-03-08 13:59:59 UTC (rev 2106)
+++ trunk/openutils-elfunctions/src/main/resources/META-INF/dateutils.tld	2010-03-08 14:09:21 UTC (rev 2107)
@@ -55,4 +55,10 @@
     <function-class>net.sourceforge.openutils.elfunctions.DateElUtils</function-class>
     <function-signature>java.util.Calendar parseDate(java.lang.String, java.lang.String)</function-signature>
   </function>
+  <function>
+    <name>currentDateIncluded</name>
+    <description>Tests if the current date is between the specified time limits</description>
+    <function-class>net.sourceforge.openutils.elfunctions.DateElUtils</function-class>
+    <function-signature>boolean currentDateIncluded(java.util.Calendar, java.util.Calendar)</function-signature>
+  </function>
 </taglib>


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