Changeset 264:31ad17f72637

Timestamp:

04/30/2010 01:01:58 PM (4 months ago)

Author:

dcaoyuan

Branch:

default

Message:

Type paramter is not neccesary for ScalaActor?

Location:

blogbird/src/main/scala/org/aiotrade/httpd

Files:

• ClientConnection.scala (modified) (2 diffs)
• HttpdActors.scala (modified) (2 diffs)
• SelectActor.scala (modified) (4 diffs)

blogbird/src/main/scala/org/aiotrade/httpd/ClientConnection.scala

@@ -5 +5 @@
 import java.nio.channels.SocketChannel
 
+import org.aiotrade.httpd.SelectActor.Read
+import org.aiotrade.httpd.SelectActor.Write
 import scala.actors.Actor
 import Debugger._
@@ -11 +13 @@
  * Represents an open HTTP connection coming from a client.
  */
-class ClientConnection(val channel: SocketChannel) extends Actor with WithSelectableChannel {
+class ClientConnection(val channel: SocketChannel) extends Actor with ChannelListener {
   private var _isOpen = true
   private var requestParser = new HttpRequestParser

blogbird/src/main/scala/org/aiotrade/httpd/HttpdActors.scala

@@ -66 +66 @@
   }
 
-  object selectActor extends SelectActor[ClientConnection](SelectionKey.OP_READ) {
+  object selectActor extends SelectActor(SelectionKey.OP_READ) {
     def produce(o: Request) = ConnectionManager.produce(o)
   }
@@ -116 +116 @@
   }
 
-  private object selectActor extends SelectActor[ClientConnection](SelectionKey.OP_WRITE)
+  private object selectActor extends SelectActor(SelectionKey.OP_WRITE)
 
   protected def consume(reply: Reply) {

blogbird/src/main/scala/org/aiotrade/httpd/SelectActor.scala

@@ -9 +9 @@
 import scala.collection.JavaConversions._
 
-abstract class SelectionEvent[T <: WithSelectableChannel](sender: SelectActor[T])
-case class Read   [T <: WithSelectableChannel](sender: SelectActor[T]) extends SelectionEvent(sender)
-case class Write  [T <: WithSelectableChannel](sender: SelectActor[T]) extends SelectionEvent(sender)
-case class Unknown[T <: WithSelectableChannel](sender: SelectActor[T]) extends SelectionEvent(sender)
 
-abstract class SelectActor[T <: WithSelectableChannel](ops: Int) extends Actor {
+object SelectActor {
+  abstract class Event(sender: SelectActor)
+  case class Read   (sender: SelectActor) extends Event(sender)
+  case class Write  (sender: SelectActor) extends Event(sender)
+  case class Unknown(sender: SelectActor) extends Event(sender)
+}
+
+import SelectActor._
+abstract class SelectActor(ops: Int) extends Actor {
 
   // @Note tried using ConcurrentMap here before, but no success
-  private val newListeners = new LinkedBlockingQueue[T]
+  private val newListeners = new LinkedBlockingQueue[ChannelListener]
 
   private val selector: Selector = SelectorProvider.provider.openSelector
 
-  def addListener(listener: T) {
+  def addListener(listener: ChannelListener) {
     newListeners put listener
     selector.wakeup
@@ -39 +43 @@
 
       if (key.isValid) {
-        val listener = key.attachment.asInstanceOf[T]
+        val listener = key.attachment.asInstanceOf[ChannelListener]
         val event =
           if (key.isReadable) {
@@ -56 +60 @@
 
     // Add queued up connections before looping back around:
-    val listeners = new java.util.Vector[T]
+    val listeners = new java.util.Vector[ChannelListener]
     newListeners.drainTo(listeners)
 
@@ -68 +72 @@
 }
 
-trait WithSelectableChannel extends Actor {
+trait ChannelListener extends Actor {
   def isOpen: Boolean
   def channel: SelectableChannel