Skip to content

Commit

Permalink
Get us compiling in Scala 2.10.3.
Browse files Browse the repository at this point in the history
As explained in PR #1508, there were some changes to how the Scala
compiler understands types that were introduced in the newer 2.10's.
This appears to get us compiling, though I am as of yet unsure of its
correctness.
  • Loading branch information
farmdawgnation committed Dec 14, 2013
1 parent 23cfba4 commit 4566fd1
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions web/webkit/src/main/scala/net/liftweb/http/LiftScreen.scala
Expand Up @@ -360,7 +360,7 @@ trait AbstractScreen extends Factory {
case AVal(v: (T => List[FieldError])) => v
},
stuff.toList.collect {
case AFilter(v) => v
case filter: AFilter[T] => filter.f
},
stuff)
}
Expand Down Expand Up @@ -484,7 +484,7 @@ trait AbstractScreen extends Factory {
}.toList

override def setFilter = stuff.collect {
case AFilter(f) => f
case filter: AFilter[T] => filter.f
}.toList

override def is = underlying.get
Expand Down Expand Up @@ -586,7 +586,7 @@ trait AbstractScreen extends Factory {
}.toList

override def setFilter = stuff.collect {
case AFilter(f) => f
case filter: AFilter[T] => filter.f
}.toList

override def is = underlying.openOrThrowException("Legacy code").get
Expand Down Expand Up @@ -617,7 +617,7 @@ trait AbstractScreen extends Factory {
case AVal(v: (T => List[FieldError])) => List(v)
case _ => Nil
}, stuff.toList.flatMap {
case AFilter(v) => List(v)
case filter: AFilter[T] => List(filter.f)
case _ => Nil
}, stuff).make

Expand Down Expand Up @@ -755,7 +755,7 @@ trait AbstractScreen extends Factory {
override lazy val formElemAttrs: Seq[SHtml.ElemAttr] = grabParams(stuff)

override val setFilter = stuff.flatMap {
case AFilter(f) => List(f)
case filter: AFilter[T] => List(filter.f)
case _ => Nil
}.toList
override val validations = stuff.flatMap {
Expand Down Expand Up @@ -792,7 +792,7 @@ trait AbstractScreen extends Factory {
override lazy val formElemAttrs: Seq[SHtml.ElemAttr] = grabParams(stuff)

override val setFilter = stuff.flatMap {
case AFilter(f) => List(f)
case filter: AFilter[T] => List(filter.f)
case _ => Nil
}.toList
override val validations = stuff.flatMap {
Expand Down

0 comments on commit 4566fd1

Please sign in to comment.