Merge branch 'snapshots'

[aquarium] / src / main / scala / gr / grnet / aquarium / util / date / TimeHelpers.scala

diff --git a/src/main/scala/gr/grnet/aquarium/util/date/TimeHelpers.scala b/src/main/scala/gr/grnet/aquarium/util/date/TimeHelpers.scala
index 7d217e2..35b7432 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/util/date/TimeHelpers.scala
+++ b/src/main/scala/gr/grnet/aquarium/util/date/TimeHelpers.scala
@@ -36,6 +36,7 @@
 package gr.grnet.aquarium.util.date
 
 import java.util.Date
+import org.joda.time.MutableDateTime
 
 
 /**
@@ -43,23 +44,39 @@ import java.util.Date
  * @author Christos KK Loverdos <loverdos@gmail.com>
  */
 
-object TimeHelpers {
+final object TimeHelpers {
   @inline
-  def nowMillis() = System.currentTimeMillis()
+  final def nowMillis() = System.currentTimeMillis()
 
   @inline
-  def nowDate = new Date(nowMillis())
+  final def nowDate = new Date(nowMillis())
 
   def secDiffOfMillis(ms0: Long, ms1: Long) = (ms1 - ms0).toDouble / 1000.0
 
-  def timed[U](f: ⇒U): (Long, Long, U) = {
+  def timed[U](f: ⇒ U): (Long, Long, U) = {
     val ms0 = nowMillis()
     val u = f
     val ms1 = nowMillis()
     (ms0, ms1, u)
   }
 
- def toYYYYMMDDHHMMSSSSS(millis: Long): String = {
-   new MutableDateCalc(millis).toYYYYMMDDHHMMSSSSS
- }
+  def toYYYYMMDDHHMMSSSSS(millis: Long): String = {
+    new MutableDateCalc(millis).toYYYYMMDDHHMMSSSSS
+  }
+
+  def calcCalendarMonthDiff(fromMillis: Long, toMillis: Long): Int = {
+    val fromDate = new MutableDateTime(fromMillis)
+    val toDate = new MutableDateTime(toMillis)
+
+    val fromYear  = fromDate.getYear
+    val fromMonth = fromDate.getMonthOfYear
+
+    val toYear = toDate.getYear
+    val toMonth = toDate.getMonthOfYear
+
+    val _from = fromYear * 12 + fromMonth
+    val _to = toYear * 12 + toMonth
+
+    _to - _from
+  }
 }
\ No newline at end of file