From 2214c7fc88845ecf4cd4fe9790834bc4a17b316a Mon Sep 17 00:00:00 2001 From: patriknw Date: Tue, 5 Apr 2011 11:35:21 +0200 Subject: [PATCH] 734: moved package objects to package.scala files --- .../{Implicits.scala => actor/package.scala} | 0 .../src/main/scala/akka/util/Duration.scala | 20 -------------- .../src/main/scala/akka/util/package.scala | 27 +++++++++++++++++++ 3 files changed, 27 insertions(+), 20 deletions(-) rename akka-actor/src/main/scala/akka/{Implicits.scala => actor/package.scala} (100%) create mode 100644 akka-actor/src/main/scala/akka/util/package.scala diff --git a/akka-actor/src/main/scala/akka/Implicits.scala b/akka-actor/src/main/scala/akka/actor/package.scala similarity index 100% rename from akka-actor/src/main/scala/akka/Implicits.scala rename to akka-actor/src/main/scala/akka/actor/package.scala diff --git a/akka-actor/src/main/scala/akka/util/Duration.scala b/akka-actor/src/main/scala/akka/util/Duration.scala index 743ce0fc4c..fb5673277c 100644 --- a/akka-actor/src/main/scala/akka/util/Duration.scala +++ b/akka-actor/src/main/scala/akka/util/Duration.scala @@ -317,26 +317,6 @@ class FiniteDuration(val length: Long, val unit: TimeUnit) extends Duration { override def hashCode = toNanos.asInstanceOf[Int] } -package object duration { - implicit def intToDurationInt(n: Int) = new DurationInt(n) - implicit def longToDurationLong(n: Long) = new DurationLong(n) - implicit def doubleToDurationDouble(d: Double) = new DurationDouble(d) - - implicit def pairIntToDuration(p : (Int, TimeUnit)) = Duration(p._1, p._2) - implicit def pairLongToDuration(p : (Long, TimeUnit)) = Duration(p._1, p._2) - implicit def durationToPair(d : Duration) = (d.length, d.unit) - - implicit def intMult(i : Int) = new { - def *(d : Duration) = d * i - } - implicit def longMult(l : Long) = new { - def *(d : Duration) = d * l - } - implicit def doubleMult(f : Double) = new { - def *(d : Duration) = d * f - } -} - class DurationInt(n: Int) { def nanoseconds = Duration(n, NANOSECONDS) def nanos = Duration(n, NANOSECONDS) diff --git a/akka-actor/src/main/scala/akka/util/package.scala b/akka-actor/src/main/scala/akka/util/package.scala new file mode 100644 index 0000000000..662c0d7393 --- /dev/null +++ b/akka-actor/src/main/scala/akka/util/package.scala @@ -0,0 +1,27 @@ +/** + * Copyright (C) 2009-2011 Scalable Solutions AB + */ + +package akka.util + +import java.util.concurrent.TimeUnit + +package object duration { + implicit def intToDurationInt(n: Int) = new DurationInt(n) + implicit def longToDurationLong(n: Long) = new DurationLong(n) + implicit def doubleToDurationDouble(d: Double) = new DurationDouble(d) + + implicit def pairIntToDuration(p : (Int, TimeUnit)) = Duration(p._1, p._2) + implicit def pairLongToDuration(p : (Long, TimeUnit)) = Duration(p._1, p._2) + implicit def durationToPair(d : Duration) = (d.length, d.unit) + + implicit def intMult(i : Int) = new { + def *(d : Duration) = d * i + } + implicit def longMult(l : Long) = new { + def *(d : Duration) = d * l + } + implicit def doubleMult(f : Double) = new { + def *(d : Duration) = d * f + } +}