Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

* Removed all but two warnings (both, scala and Lift warnings)

* Changed version of lift-sbt plugin from 2.4-SNAPSHOT to 2.4
  • Loading branch information...
commit a2f700af9ee43ecd4dc094ec429a6138e5120f09 1 parent 37a4264
Diego Medina authored May 28, 2012

Showing 20 changed files with 70 additions and 95 deletions. Show diff stats Hide diff stats

  1. 4  combo/example/src/main/scala/bootstrap/liftweb/Boot.scala
  2. 4  combo/example/src/main/scala/net/liftweb/example/comet/Chat.scala
  3. 15  combo/example/src/main/scala/net/liftweb/example/comet/Clock.scala
  4. 12  combo/example/src/main/scala/net/liftweb/example/comet/LongTime.scala
  5. 2  combo/example/src/main/scala/net/liftweb/example/lib/StatelessJson.scala
  6. 13  combo/example/src/main/scala/net/liftweb/example/snippet/AjaxForm.scala
  7. 13  combo/example/src/main/scala/net/liftweb/example/snippet/Misc.scala
  8. 3  combo/example/src/main/scala/net/liftweb/example/snippet/SimpleWizard.scala
  9. 20  nuggets/flotDemo/src/main/scala/net/liftweb/flot_demo/web/model/SensorActor.scala
  10. 4  nuggets/flotDemo/src/main/scala/net/liftweb/flot_demo/web/snippet/Basic.scala
  11. 8  nuggets/flotDemo/src/main/scala/net/liftweb/flot_demo/web/snippet/GraphTypes.scala
  12. 2  nuggets/flotDemo/src/main/scala/net/liftweb/flot_demo/web/snippet/Interacting.scala
  13. 8  nuggets/flotDemo/src/main/scala/net/liftweb/flot_demo/web/snippet/SettingOption.scala
  14. 17  nuggets/flotDemo/src/main/scala/net/liftweb/flot_demo/web/snippet/Zooming.scala
  15. 4  nuggets/hellofbc/src/main/scala/bootstrap/liftweb/Boot.scala
  16. 6  nuggets/hellolift/src/main/scala/com/hellolift/comet/DynamicBlogView.scala
  17. 8  nuggets/hellolift/src/main/scala/com/hellolift/controller/BlogCache.scala
  18. 4  nuggets/skittr/src/main/scala/bootstrap/liftweb/Boot.scala
  19. 16  nuggets/skittr/src/main/scala/com/skittr/actor/UserActor.scala
  20. 2  project/plugins/Plugins.scala
4  combo/example/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -17,7 +17,7 @@ package bootstrap.liftweb
17 17
 
18 18
 import net.liftweb._
19 19
 import common.{Box, Full, Empty, Failure, Loggable}
20  
-import util.{Helpers, Log, NamedPF, Props}
  20
+import util.{Helpers, NamedPF, Props}
21 21
 import http._
22 22
 import actor._
23 23
 import provider._
@@ -64,7 +64,7 @@ class Boot {
64 64
 
65 65
     XmlServer.init()
66 66
 
67  
-    LiftRules.statelessDispatchTable.append {
  67
+    LiftRules.statelessDispatch.append {
68 68
       case r@Req("stateless" :: _, "", GetRequest) => StatelessHtml.render(r) _
69 69
     }
70 70
 
4  combo/example/src/main/scala/net/liftweb/example/comet/Chat.scala
@@ -44,7 +44,7 @@ class Chat extends CometActor with CometListener {
44 44
   private val liId = S.attr("li_id")
45 45
 
46 46
   private lazy val li = liId.
47  
-  flatMap{ Helpers.findId(defaultXml, _) } openOr NodeSeq.Empty
  47
+  flatMap{ Helpers.findId(defaultHtml, _) } openOr NodeSeq.Empty
48 48
 
49 49
   private val inputId = Helpers.nextFuncName
50 50
 
@@ -53,7 +53,7 @@ class Chat extends CometActor with CometListener {
53 53
   // to the browser
54 54
   override def lowPriority = {
55 55
     case ChatServerUpdate(value) => {
56  
-      val update = (value -- chats).reverse.
  56
+      val update = (value filterNot (chats contains)).reverse.
57 57
       map(b => AppendHtml(ulId, line(b)))
58 58
 
59 59
       partialUpdate(update)
15  combo/example/src/main/scala/net/liftweb/example/comet/Clock.scala
... ...
@@ -1,5 +1,5 @@
1 1
 /*
2  
- * Copyright 2007-2010 WorldWide Conferencing, LLC
  2
+ * Copyright 2007-2012 WorldWide Conferencing, LLC
3 3
  *
4 4
  * Licensed under the Apache License, Version 2.0 (the "License");
5 5
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
14 14
  * limitations under the License.
15 15
  */
16 16
 
17  
-package net.liftweb {
18  
-package example {
19  
-package comet {
  17
+package net.liftweb
  18
+package example
  19
+package comet
20 20
 
21 21
 import _root_.net.liftweb._
22 22
 import http._
@@ -33,19 +33,16 @@ class ExampleClock (initSession: LiftSession,
33 33
                    initDefaultXml: NodeSeq,
34 34
                    initAttributes: Map[String, String]) extends CometActor {
35 35
   // schedule a ping every 10 seconds so we redraw
36  
-  ActorPing.schedule(this, Tick, 10 seconds)
  36
+  Schedule.schedule(this, Tick, 10 seconds)
37 37
 
38 38
   def render = "#clock_time *" replaceWith timeNow.toString
39 39
 
40 40
   override def lowPriority = {
41 41
     case Tick =>
42 42
       partialUpdate(SetHtml("clock_time", Text(timeNow.toString)))
43  
-      ActorPing.schedule(this, Tick, 10 seconds)
  43
+      Schedule.schedule(this, Tick, 10 seconds)
44 44
   }
45 45
   initCometActor(initSession, initType, initName, initDefaultXml, initAttributes)
46 46
 }
47 47
 
48 48
 case object Tick
49  
-}
50  
-}
51  
-}
12  combo/example/src/main/scala/net/liftweb/example/comet/LongTime.scala
@@ -14,9 +14,9 @@
14 14
  * limitations under the License.
15 15
  */
16 16
 
17  
-package net.liftweb {
18  
-package example {
19  
-package comet {
  17
+package net.liftweb
  18
+package example
  19
+package comet
20 20
 
21 21
 import net.liftweb.actor._
22 22
 import scala.xml.{NodeSeq, Text}
@@ -51,7 +51,7 @@ object ThingBuilder extends LiftActor {
51 51
 
52 52
       case (a: LiftActor, i: Int) =>
53 53
         a ! BuildStatus(i * 10, Empty)
54  
-        ActorPing.schedule(this, (a, i + 1), 2 seconds)
  54
+        Schedule.schedule(this, (a, i + 1), 2 seconds)
55 55
 
56 56
       case _ =>
57 57
     }
@@ -95,7 +95,5 @@ class LongTime extends CometActor {
95 95
       <span>We're working on your job... it's {progress}% complete</span>
96 96
   }
97 97
 }
98  
-}
99  
-}
100  
-}
  98
+
101 99
 
2  combo/example/src/main/scala/net/liftweb/example/lib/StatelessJson.scala
@@ -34,7 +34,7 @@ import scala.xml._
34 34
 object StatelessJson {
35 35
   def init() {
36 36
     // register the JSON handler
37  
-    LiftRules.statelessDispatchTable.append {
  37
+    LiftRules.statelessDispatch.append{
38 38
       case r @ Req("stateless_json_call" :: Nil, _, PostRequest) => () => handleJson(r)
39 39
     }
40 40
   }
13  combo/example/src/main/scala/net/liftweb/example/snippet/AjaxForm.scala
@@ -14,9 +14,9 @@
14 14
  * limitations under the License.
15 15
  */
16 16
 
17  
-package net.liftweb {
18  
-package example {
19  
-package snippet {
  17
+package net.liftweb
  18
+package example
  19
+package snippet
20 20
 
21 21
 import _root_.scala.xml._
22 22
 import _root_.net.liftweb._
@@ -50,7 +50,7 @@ class AjaxForm {
50 50
 
51 51
   // bind the view to the dynamic HTML
52 52
   def show(xhtml: Group): NodeSeq = {
53  
-    val (name, js) = ajaxCall(JE.JsRaw("this.value"),
  53
+    val (name: String, js): (String, JsExp) = ajaxCall(JE.JsRaw("this.value"),
54 54
                               s => After(200, replace(s)))
55 55
     bind("select", xhtml,
56 56
          "state" -> select(AjaxForm.states.map(s => (s,s)),
@@ -324,12 +324,9 @@ object AjaxForm {
324 324
                              "Wisconsin" -> "Madison",
325 325
                              "Wisconsin" -> "Milwaukee")
326 326
 
327  
-  val states = citiesAndStates.map(_._1).removeDuplicates
  327
+  val states = citiesAndStates.map(_._1).distinct
328 328
 
329 329
   val state: String = states.head
330 330
 
331 331
   def citiesFor(state: String): List[String] = citiesAndStates.filter(_._1 == state).map(_._2)
332 332
 }
333  
-}
334  
-}
335  
-}
13  combo/example/src/main/scala/net/liftweb/example/snippet/Misc.scala
@@ -14,9 +14,9 @@
14 14
  * limitations under the License.
15 15
  */
16 16
 
17  
-package net.liftweb {
18  
-package example {
19  
-package snippet {
  17
+package net.liftweb
  18
+package example
  19
+package snippet
20 20
 
21 21
 import model._
22 22
 
@@ -141,14 +141,9 @@ class Misc {
141 141
   }
142 142
 
143 143
   private def locales =
144  
-  Locale.getAvailableLocales.toList.sort(_.getDisplayName < _.getDisplayName)
  144
+  Locale.getAvailableLocales.toList.sortWith(_.getDisplayName < _.getDisplayName)
145 145
 
146 146
   private def setLocale(loc: Locale) = definedLocale(Full(loc))
147 147
 }
148 148
 
149 149
 object definedLocale extends SessionVar[Box[Locale]](Empty)
150  
-
151  
-
152  
-}
153  
-}
154  
-}
3  combo/example/src/main/scala/net/liftweb/example/snippet/SimpleWizard.scala
@@ -47,8 +47,7 @@ class SimpleWizard extends StatefulSnippet {
47 47
   var color = ""
48 48
 
49 49
   private def template(name: String, f: NodeSeq => NodeSeq): NodeSeq =
50  
-    TemplateFinder.
51  
-  findAnyTemplate(List("templating") ::: List(name)).map(f) openOr
  50
+    Templates(List("templating") ::: List(name)).map(f) openOr
52 51
   NodeSeq.Empty
53 52
 
54 53
   /**
20  nuggets/flotDemo/src/main/scala/net/liftweb/flot_demo/web/model/SensorActor.scala
@@ -14,10 +14,10 @@
14 14
  * limitations under the License.
15 15
  */
16 16
 
17  
-package net.liftweb {
18  
-package flot_demo {
19  
-package web {
20  
-package model {
  17
+package net.liftweb
  18
+package flot_demo
  19
+package web
  20
+package model
21 21
 
22 22
 import scala.collection.mutable.{HashMap, HashSet}
23 23
 
@@ -111,7 +111,7 @@ class AcumSamplesActor (max : Int) extends LiftActor {
111 111
     
112 112
     
113 113
       case RemoveListener(listener: LiftActor) =>
114  
-        listeners = listeners.remove(listener.eq)
  114
+        listeners = listeners.filterNot(listener.eq)
115 115
   }
116 116
 }
117 117
 
@@ -127,10 +127,10 @@ object Sensor extends _root_.java.lang.Runnable {
127 127
   override def run () : Unit = {
128 128
     while (true)
129 129
     {
130  
-      val time = new _root_.java.util.Date ().getTime ()
  130
+      val time = new java.util.Date ().getTime ()
131 131
 
132  
-      val sinus = Math.sin (time)
133  
-      val cosinus = Math.cos (time)
  132
+      val sinus = math.sin (time)
  133
+      val cosinus = math.cos (time)
134 134
       val both = sinus + 2.0 * cosinus
135 135
 
136 136
       acum ! Sample (time, List (sinus, cosinus, both))
@@ -139,7 +139,3 @@ object Sensor extends _root_.java.lang.Runnable {
139 139
     }
140 140
   }
141 141
 }
142  
-}
143  
-}
144  
-}
145  
-}
4  nuggets/flotDemo/src/main/scala/net/liftweb/flot_demo/web/snippet/Basic.scala
@@ -38,11 +38,11 @@ class Basic {
38 38
       var d1 : List [Pair [Double, Double]] = Nil
39 39
 
40 40
       for (i <- List.range (0, 140, 5))
41  
-        d1 = Pair (i / 10.0, Math.sin(i / 10.0)) :: d1
  41
+        d1 = Pair (i / 10.0, math.sin(i / 10.0)) :: d1
42 42
 
43 43
       val d2 : List [Pair [Double, Double]] = (0.0, 3.0) :: (4.0, 8.0) :: (8.0, 5.0) :: (9.0, 13.0) :: Nil
44 44
 
45  
-      var d3 : List [Pair [Double, Double]] = (0.0, 12.0) :: (7.0, 12.0) :: (Math.NaN_DOUBLE, Math.NaN_DOUBLE) ::
  45
+      var d3 : List [Pair [Double, Double]] = (0.0, 12.0) :: (7.0, 12.0) :: (Double.NaN, Double.NaN) ::
46 46
                                               (7.0, 2.5) :: (12.0, 2.5) :: Nil
47 47
 
48 48
       val s1 = new FlotSerie () {
8  nuggets/flotDemo/src/main/scala/net/liftweb/flot_demo/web/snippet/GraphTypes.scala
@@ -40,21 +40,21 @@ class GraphTypes {
40 40
       var d1 : List [Pair [Double, Double]] = Nil
41 41
 
42 42
       for (i <- List.range (0, 140, 5))
43  
-        d1 = Pair (i / 10.0, Math.sin(i / 10.0)) :: d1
  43
+        d1 = Pair (i / 10.0, math.sin(i / 10.0)) :: d1
44 44
 
45 45
       val d2 : List [Pair [Double, Double]] = (0.0, 3.0) :: (4.0, 8.0) :: (8.0, 5.0) :: (9.0, 13.0) :: Nil
46 46
 
47 47
       var d3 : List [Pair [Double, Double]] = Nil
48 48
       for (i <- List.range (0, 140, 5))
49  
-        d3 = (i / 10.0, Math.cos(i / 10.0)) :: d3
  49
+        d3 = (i / 10.0, math.cos(i / 10.0)) :: d3
50 50
 
51 51
       var d4 : List [Pair [Double, Double]] = Nil
52 52
       for (i <- List.range (0, 140, 5))
53  
-        d4 = (i / 10.0, Math.sqrt(i * 1.0)) :: d4
  53
+        d4 = (i / 10.0, math.sqrt(i * 1.0)) :: d4
54 54
 
55 55
       var d5 : List [Pair [Double, Double]] = Nil
56 56
       for (i <- List.range (0, 140, 5))
57  
-        d5 = (i / 10.0, Math.sqrt(i / 10.0)) :: d5
  57
+        d5 = (i / 10.0, math.sqrt(i / 10.0)) :: d5
58 58
 
59 59
       val s1 = new FlotSerie () {
60 60
         override val data = d1
2  nuggets/flotDemo/src/main/scala/net/liftweb/flot_demo/web/snippet/Interacting.scala
@@ -40,7 +40,7 @@ class Interacting {
40 40
       var d : List [Pair [Double, Double]] = Nil
41 41
 
42 42
       for (i <- List.range (0, 140, 5))
43  
-        d = (i / 10.0, Math.sin(i / 10.0)) :: d
  43
+        d = (i / 10.0, math.sin(i / 10.0)) :: d
44 44
 
45 45
       val s = new FlotSerie () {
46 46
         override val data = d
8  nuggets/flotDemo/src/main/scala/net/liftweb/flot_demo/web/snippet/SettingOption.scala
@@ -43,11 +43,11 @@ class SettingOption {
43 43
       var d3 : List [Pair [Double, Double]] = Nil
44 44
 
45 45
       var i = 0.0
46  
-      while (i < Math.Pi * 2.0)
  46
+      while (i < math.Pi * 2.0)
47 47
       {
48  
-        d1 = (i, Math.sin(i)) :: d1
49  
-        d2 = (i, Math.cos(i)) :: d2
50  
-        d3 = (i, Math.tan(i)) :: d3
  48
+        d1 = (i, math.sin(i)) :: d1
  49
+        d2 = (i, math.cos(i)) :: d2
  50
+        d3 = (i, math.tan(i)) :: d3
51 51
 
52 52
         i += 0.25
53 53
       }
17  nuggets/flotDemo/src/main/scala/net/liftweb/flot_demo/web/snippet/Zooming.scala
@@ -14,13 +14,12 @@
14 14
  * limitations under the License.
15 15
  */
16 16
 
17  
-package net.liftweb {
18  
-package flot_demo {
19  
-package web {
20  
-package snippet {
  17
+package net.liftweb
  18
+package flot_demo
  19
+package web
  20
+package snippet
21 21
 
22 22
 import scala.xml.NodeSeq
23  
-
24 23
 import net.liftweb.common._
25 24
 import net.liftweb.util._
26 25
 import Helpers._
@@ -39,7 +38,7 @@ class Zooming {
39 38
 
40 39
     var i = x1
41 40
     while (i < x2) {
42  
-      ret = (i, Math.sin (i * Math.sin(i))) :: ret
  41
+      ret = (i, math.sin (i * math.sin(i))) :: ret
43 42
       i += (x2 - x1) / 100
44 43
     }
45 44
 
@@ -54,7 +53,7 @@ class Zooming {
54 53
     def graph () = {
55 54
       val data = new FlotSerie () {
56 55
         override val label = Full ("sin(x sin(x))")
57  
-        override val data = getData (0.0, 3 * Math.Pi)
  56
+        override val data = getData (0.0, 3 * math.Pi)
58 57
       }
59 58
 
60 59
       val options = new FlotOptions () {
@@ -107,7 +106,3 @@ class Zooming {
107 106
     bind ("flot", xhtml, "graph" -> graph)
108 107
   }
109 108
 }
110  
-}
111  
-}
112  
-}
113  
-}
4  nuggets/hellofbc/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -14,7 +14,7 @@
14 14
  * limitations under the License.
15 15
  */
16 16
  
17  
-package bootstrap.liftweb {
  17
+package bootstrap.liftweb
18 18
 
19 19
 import _root_.net.liftweb.util._
20 20
 import _root_.net.liftweb.http._
@@ -72,6 +72,7 @@ class Boot {
72 72
           c <- FacebookConnect.client
73 73
           user <- User.findByFbId(c.session.uid)
74 74
         } User.logUserIn(user)
  75
+      case Failure(_,_,_) | Empty =>
75 76
     }
76 77
     
77 78
     //this is really important for fb connect
@@ -95,4 +96,3 @@ object DBVendor extends StandardDBVendor("org.h2.Driver",
95 96
                                         Empty)
96 97
 
97 98
 
98  
-}
6  nuggets/hellolift/src/main/scala/com/hellolift/comet/DynamicBlogView.scala
@@ -50,8 +50,8 @@ class DynamicBlogView extends CometActor {
50 50
   // localSetup is the first thing run, we use it to setup the blogid or
51 51
   // redirect them to / if no blogid was given.
52 52
   override def localSetup {
53  
-    name match {
54  
-      case Full(t) => this.blogid = Helpers.toLong(t)
  53
+    name map{
  54
+      t => this.blogid = Helpers.toLong(t)
55 55
     }
56 56
 
57 57
     // Let the BlogCache know that we are watching for updates for this blog.
@@ -62,7 +62,7 @@ class DynamicBlogView extends CometActor {
62 62
 
63 63
   // lowPriority will receive messages sent from the BlogCache
64 64
   override def lowPriority : PartialFunction[Any, Unit] = {
65  
-    case BlogUpdate(entries : List[Entry]) => this.blog = entries; reRender(false)
  65
+    case BlogUpdate(entries : List[_]) => this.blog = entries; reRender(false)
66 66
   }
67 67
 }
68 68
 }
8  nuggets/hellolift/src/main/scala/com/hellolift/controller/BlogCache.scala
@@ -14,8 +14,8 @@
14 14
  * limitations under the License.
15 15
  */
16 16
 
17  
-package com.hellolift {
18  
-package controller {
  17
+package com.hellolift
  18
+package controller
19 19
 
20 20
 import _root_.net.liftweb.mapper._
21 21
 import _root_.net.liftweb.actor._
@@ -50,7 +50,7 @@ class BlogCache extends LiftActor {
50 50
 	
51 51
       case DeleteEntry(e, id) =>
52 52
 	// When an Entry is deleted
53  
-	cache += (id -> cache.getOrElse(id, getEntries(id)).remove(_ == e))
  53
+	cache += (id -> cache.getOrElse(id, getEntries(id)).filterNot(_ == e))
54 54
         sessions.getOrElse(id, Nil).foreach(_ ! BlogUpdate(cache.getOrElse(id, Nil)))
55 55
 
56 56
       case EditEntry(e, id) =>
@@ -72,5 +72,3 @@ case class BlogUpdate(xs : List[Entry])
72 72
 object BlogCache {
73 73
   lazy val cache = new BlogCache // {val ret = new BlogCache; ret.start; ret}
74 74
 }
75  
-}
76  
-}
4  nuggets/skittr/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -16,7 +16,7 @@ package bootstrap.liftweb
16 16
  * and limitations under the License.
17 17
  */
18 18
 
19  
-import _root_.net.liftweb.util.{Helpers, Log, NamedPF}
  19
+import _root_.net.liftweb.util.{Helpers, NamedPF}
20 20
 import _root_.net.liftweb.common.{Box, Empty, Full, Failure}
21 21
 import _root_.net.liftweb.http._
22 22
 import _root_.net.liftweb.mapper._
@@ -52,7 +52,7 @@ class Boot {
52 52
        RewriteResponse("unfriend" :: Nil, Map("user" -> user))
53 53
   }
54 54
 
55  
-  LiftRules.rewrite.prepend(rewriter)
  55
+  LiftRules.statelessRewrite.prepend(rewriter)
56 56
 
57 57
   // load up the list of user actors
58 58
   UserList.create
16  nuggets/skittr/src/main/scala/com/skittr/actor/UserActor.scala
@@ -107,7 +107,7 @@ class UserActor extends LiftActor with Loggable {
107 107
       // get friends
108 108
       friends = User.findAllByInsecureSql("SELECT users.* FROM users, friends WHERE users.id = friends.friend AND friends.owner = "+userId,
109 109
                                           IHaveValidatedThisSQL("dpp",
110  
-                                                                "08/23/08")).map(_.name.is).sort(_ < _)
  110
+                                                                "08/23/08")).map(_.name.is).sortWith(_ < _)
111 111
       reply("Done")
112 112
       
113 113
       // tell all our friends that we follow them
@@ -121,7 +121,7 @@ class UserActor extends LiftActor with Loggable {
121 121
       
122 122
       // if we add a friend,
123 123
     case AddFriend(name) =>
124  
-      friends = (name :: friends).sort(_ < _)
  124
+      friends = (name :: friends).sortWith(_ < _)
125 125
       // find the user
126 126
       UserList.find(name).foreach{
127 127
         ua =>
@@ -134,7 +134,7 @@ class UserActor extends LiftActor with Loggable {
134 134
       
135 135
       // We are removing a friend
136 136
     case RemoveFriend(name) =>
137  
-      friends = friends.remove(_ == name)
  137
+      friends = friends.filterNot(_ == name)
138 138
       // find the user
139 139
       UserList.find(name).foreach{
140 140
         ua =>
@@ -161,7 +161,7 @@ class UserActor extends LiftActor with Loggable {
161 161
       
162 162
       // remove the timeline viewer
163 163
     case RemoveTimelineViewer(who) =>
164  
-      timelineViewers = timelineViewers.remove(_ == who)
  164
+      timelineViewers = timelineViewers.filterNot(_ == who)
165 165
       // this.unlink(sender.receiver)
166 166
       
167 167
       // Add an Actor to the list of folks who want to see when we get a message
@@ -172,7 +172,7 @@ class UserActor extends LiftActor with Loggable {
172 172
       
173 173
       // removes the message viewer
174 174
     case RemoveMessageViewer(who) =>
175  
-      messageViewers = messageViewers.remove(_ == who)
  175
+      messageViewers = messageViewers.filterNot(_ == who)
176 176
       // this.unlink(sender.receiver)
177 177
       
178 178
       // add someone who is following us
@@ -181,7 +181,7 @@ class UserActor extends LiftActor with Loggable {
181 181
       who ! MergeIntoTimeline(latestMsgs) // give the follower our messages to merge into his timeline
182 182
       
183 183
       // remove the follower
184  
-    case RemoveFollower(who) =>  followers = followers.remove(_ == who) // filter out the sender of the message
  184
+    case RemoveFollower(who) =>  followers = followers.filterNot(_ == who) // filter out the sender of the message
185 185
       
186 186
       // We get a message
187 187
     case msg : Message =>
@@ -203,12 +203,12 @@ class UserActor extends LiftActor with Loggable {
203 203
   /**
204 204
    * Sort the list in reverse chronological order and take the first maxMessages elements
205 205
    */
206  
-  private def merge(bigList: List[Message]) = bigList.sort((a,b) => b.when < a.when).take(maxMessages)
  206
+  private def merge(bigList: List[Message]) = bigList.sortWith((a,b) => b.when < a.when).take(maxMessages)
207 207
 
208 208
   /**
209 209
    * Autogenerate and schedule a message
210 210
    */
211  
-  def autoGen = ActorPing.schedule(this, SendMessage("This is a random message @ "+timeNow+" for "+userName, "autogen"), User.randomPeriod)
  211
+  def autoGen = Schedule.schedule(this, SendMessage("This is a random message @ "+timeNow+" for "+userName, "autogen"), User.randomPeriod)
212 212
 }
213 213
 
214 214
 /**
2  project/plugins/Plugins.scala
@@ -5,5 +5,5 @@ class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
5 5
   lazy val snapshots = ScalaToolsSnapshots
6 6
 
7 7
   // Add plugin
8  
-  lazy val a = "net.liftweb" % "lift-sbt" % "2.4-SNAPSHOT"
  8
+  lazy val a = "net.liftweb" % "lift-sbt" % "2.4"
9 9
 }

0 notes on commit a2f700a

Please sign in to comment.
Something went wrong with that request. Please try again.