summaryrefslogtreecommitdiff
path: root/src/actors
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-10-09 16:28:22 +0000
committermichelou <michelou@epfl.ch>2007-10-09 16:28:22 +0000
commitf91bc93ad4767a86fea46d2d63e3b09cf2f64faf (patch)
tree37d901d19390abd0d769742354986b08a043aa86 /src/actors
parentd93d566e0845aeed5066c30b4bc0d99a2b4729c7 (diff)
downloadscala-f91bc93ad4767a86fea46d2d63e3b09cf2f64faf.tar.gz
scala-f91bc93ad4767a86fea46d2d63e3b09cf2f64faf.tar.bz2
scala-f91bc93ad4767a86fea46d2d63e3b09cf2f64faf.zip
removed type aliases, update svn:keywords
Diffstat (limited to 'src/actors')
-rw-r--r--src/actors/scala/actors/Actor.scala2
-rw-r--r--src/actors/scala/actors/Scheduler.scala4
-rw-r--r--src/actors/scala/actors/remote/FreshNameCreator.scala2
-rw-r--r--src/actors/scala/actors/remote/Serializer.scala10
4 files changed, 9 insertions, 9 deletions
diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index 3ba4da09a2..55eb9ce314 100644
--- a/src/actors/scala/actors/Actor.scala
+++ b/src/actors/scala/actors/Actor.scala
@@ -119,7 +119,7 @@ object Actor {
* @param f a partial function specifying patterns and actions
* @return the result of processing the received message
*/
- def receiveWithin[R](msec: long)(f: PartialFunction[Any, R]): R =
+ def receiveWithin[R](msec: Long)(f: PartialFunction[Any, R]): R =
self.receiveWithin(msec)(f)
/**
diff --git a/src/actors/scala/actors/Scheduler.scala b/src/actors/scala/actors/Scheduler.scala
index 64478262ea..e92e76a803 100644
--- a/src/actors/scala/actors/Scheduler.scala
+++ b/src/actors/scala/actors/Scheduler.scala
@@ -84,7 +84,7 @@ object Scheduler {
def shutdown() = sched.shutdown()
def onLockup(handler: () => Unit) = sched.onLockup(handler)
- def onLockup(millis: int)(handler: () => Unit) = sched.onLockup(millis)(handler)
+ def onLockup(millis: Int)(handler: () => Unit) = sched.onLockup(millis)(handler)
def printActorDump = sched.printActorDump
}
@@ -112,7 +112,7 @@ trait IScheduler {
def shutdown(): Unit
def onLockup(handler: () => Unit): Unit
- def onLockup(millis: int)(handler: () => Unit): Unit
+ def onLockup(millis: Int)(handler: () => Unit): Unit
def printActorDump: Unit
val QUIT_TASK = new Reaction(null) {
diff --git a/src/actors/scala/actors/remote/FreshNameCreator.scala b/src/actors/scala/actors/remote/FreshNameCreator.scala
index 1ca6c16089..8c56cbc6ce 100644
--- a/src/actors/scala/actors/remote/FreshNameCreator.scala
+++ b/src/actors/scala/actors/remote/FreshNameCreator.scala
@@ -13,7 +13,7 @@ package scala.actors.remote
object FreshNameCreator {
protected var counter = 0
- protected val counters = new scala.collection.mutable.HashMap[String,int]
+ protected val counters = new scala.collection.mutable.HashMap[String, Int]
/**
* Create a fresh name with the given prefix. It is guaranteed
diff --git a/src/actors/scala/actors/remote/Serializer.scala b/src/actors/scala/actors/remote/Serializer.scala
index 6e71171997..18ef3eeadd 100644
--- a/src/actors/scala/actors/remote/Serializer.scala
+++ b/src/actors/scala/actors/remote/Serializer.scala
@@ -17,14 +17,14 @@ import java.lang.ClassNotFoundException
import java.io.{DataInputStream, DataOutputStream, EOFException, IOException}
abstract class Serializer(val service: Service) {
- def serialize(o: AnyRef): Array[byte]
- def deserialize(a: Array[byte]): AnyRef
+ def serialize(o: AnyRef): Array[Byte]
+ def deserialize(a: Array[Byte]): AnyRef
@throws(classOf[IOException])
- def readBytes(inputStream: DataInputStream): Array[byte] = {
+ def readBytes(inputStream: DataInputStream): Array[Byte] = {
try {
val length = inputStream.readInt()
- val bytes = new Array[byte](length)
+ val bytes = new Array[Byte](length)
inputStream.readFully(bytes, 0, length)
return bytes
}
@@ -41,7 +41,7 @@ abstract class Serializer(val service: Service) {
}
@throws(classOf[IOException])
- def writeBytes(outputStream: DataOutputStream, bytes: Array[byte]) {
+ def writeBytes(outputStream: DataOutputStream, bytes: Array[Byte]) {
val length = bytes.length;
// original length
outputStream.writeInt(length)