[Openutils-svn] SF.net SVN: openutils:[3585] trunk/openutils-mgnlcriteria/src

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

Revision: 3585
          http://openutils.svn.sourceforge.net/openutils/?rev=3585&view=rev
Author:   fgiust
Date:     2011-08-08 10:31:44 +0000 (Mon, 08 Aug 2011)

Log Message:
-----------
CRIT-42 using DAY_OF_YER and HOUR_OF_DAY

Modified Paths:
--------------
    trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java

Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java	2011-08-08 09:32:08 UTC (rev 3584)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/criterion/Restrictions.java	2011-08-08 10:31:44 UTC (rev 3585)
@@ -375,7 +375,7 @@
     private static Calendar getDayEnd(Calendar cal)
     {
         Calendar cal2 = getDayStart(cal);
-        cal2.add(Calendar.DATE, 1);
+        cal2.add(Calendar.DAY_OF_YEAR, 1);
         cal2.add(Calendar.MILLISECOND, -1);
         return cal2;
     }

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java	2011-08-08 09:32:08 UTC (rev 3584)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java	2011-08-08 10:31:44 UTC (rev 3585)
@@ -92,18 +92,18 @@
 
         Calendar begin = Calendar.getInstance();
         begin.set(1999, Calendar.JANUARY, 1);
-        begin.set(Calendar.HOUR, 0);
+        begin.set(Calendar.HOUR_OF_DAY, 0);
         begin.set(Calendar.MINUTE, 0);
         begin.set(Calendar.SECOND, 0);
         begin.set(Calendar.MILLISECOND, 0);
         Calendar end = Calendar.getInstance();
         end.set(2001, Calendar.DECEMBER, 31);
-        end.set(Calendar.HOUR, 0);
+        end.set(Calendar.HOUR_OF_DAY, 0);
         end.set(Calendar.MINUTE, 0);
         end.set(Calendar.SECOND, 0);
         end.set(Calendar.MILLISECOND, 0);
         end.add(Calendar.MILLISECOND, -1);
-        end.add(Calendar.DATE, 1);
+        end.add(Calendar.DAY_OF_YEAR, 1);
 
         String expectedStmt = "//pets//*"
             + "[((jcr:contains(@title, 'Lucky')) and (@petType='dog')"
@@ -402,4 +402,5 @@
         node = iterator.next();
         Assert.assertEquals(node.getTitle(), "Leo");
     }
+
 }


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