added changes missing in the previous commit

Author: Cazaril

src/client/Client.scala

@@ -5,6 +5,7 @@ import java.rmi.registry.LocateRegistry
 import java.util.Calendar
 import scala.annotation.tailrec
 import scala.language.postfixOps
+import java.rmi.server.UnicastRemoteObject
 
 sealed abstract class State
 object State {
@@ -32,6 +33,8 @@ object Client {
       val ret = stub login(user,pass)
       if (ret) {
         println("Welcome back! :D")
+        val callback: ClientTrait = new ClientTraitImpl(user)
+        stub registerForCallback(user,callback)
         (MainState,user)
       }
       else {
@@ -334,7 +337,7 @@ Message: ${tweet.msg}""")
       val registry = LocateRegistry getRegistry("localhost")
       val stub = registry.lookup("tweetorro").asInstanceOf[server.ServerTrait]
 
-      stub.test(Test(n => println(n)))
+      //stub.test(Test(n => println(n)))
       println("Welcome to Tweetorro terminal App!")
       repl(stub,(StartState,""))
     } catch {

src/client/ClientTrait.scala

@@ -3,4 +3,11 @@ package client
 import java.rmi.Remote
 import java.rmi.RemoteException
 
-trait ClientTrait extends Remote { }
+trait ClientTrait extends Remote { 
+  
+  @throws(classOf[RemoteException])
+  def notifyMe(): Unit
+  
+  @throws(classOf[RemoteException])
+  def getUserName():String
+}

src/server/ServerTrait.scala

@@ -1 +1,69 @@
-/home/yagox//git/Tweetorro/src/server/ServerTrait.scala
+package server
+
+import java.rmi.Remote
+import java.rmi.RemoteException
+import client.ClientTrait
+
+object Shared {
+  case class DMTweet(user: String, msg: String, date: String)
+  case class DMT(id: String, user: String, msg: String, date: String)
+  case class Test(f: Int => Unit)
+}
+
+trait ServerTrait extends Remote {
+  import Shared._
+  
+  @throws(classOf[RemoteException])
+  def registerForCallback(userName: String,callback: ClientTrait): Unit
+  
+  @throws(classOf[RemoteException])
+  def searchUsers(name: String): List[String]
+
+  @throws(classOf[RemoteException])
+  def sendDM(dm: DMTweet, userTo: String): Unit
+  
+  @throws(classOf[RemoteException])
+  def getDM(user: String, number: Int): List[DMT]
+
+  @throws(classOf[RemoteException])
+  def createUser(user: String, pass: String): Boolean
+
+  @throws(classOf[RemoteException])
+  def login(user: String, pass: String): Boolean
+  
+  @throws(classOf[RemoteException])
+  def sendTweet(tweet: DMTweet): Unit
+
+  @throws(classOf[RemoteException])
+  def retweet(user: String, tweetID: String): Boolean
+
+  @throws(classOf[RemoteException])
+  def follow(user: String, userID: String): Boolean
+
+  @throws(classOf[RemoteException])
+  def unfollow(user: String, userID: String): Boolean
+
+  @throws(classOf[RemoteException])
+  def followers(user: String, number: Int): List[String]
+
+  @throws(classOf[RemoteException])
+  def following(user: String, number: Int): List[String]
+
+  @throws(classOf[RemoteException])
+  def logoutRemote(user: String): Boolean
+
+  @throws(classOf[RemoteException])
+  def checkRemoteProfile(user: String, param: String): Option[String]
+
+  @throws(classOf[RemoteException])
+  def modifyRemoteProfile(user: String, param: String, value: String): Boolean
+
+  @throws(classOf[RemoteException])
+  def getTweets(user: String, number: Int): List[DMT]
+
+  @throws(classOf[RemoteException])
+  def test(f: Test): Unit
+}
+
+
+