nova/scalafx-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove deprecated view-bound syntax

Browse Source
This commit is contained in:
Sarah Gerweck 2015-10-05 11:26:36 -07:00
parent f1d4ab70fe
commit 05d4a4f8aa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/org/gerweck/scalafx/util/ObservableTupler.scala
View File

@ -70,7 +70,7 @@ class ObservableTupler
} }
object ObservableUnwrapper extends Poly1 { object ObservableUnwrapper extends Poly1 {
implicit def apply[T, U, A <% ObservableValue[T, U]]: Case.Aux[A, T] = at[A]{ o => o.value } implicit def apply[T, U, A](implicit ev1: A => ObservableValue[T, U]): Case.Aux[A, T] = at[A]{ o => o.value }
} }
object ObservableTupler { object ObservableTupler {

8
src/main/scala/org/gerweck/scalafx/util/observable.scala
View File

@ -110,8 +110,8 @@ trait ObservableImplicits {
} }
implicit def enrichObservable[A, B](o: ObservableValue[A, B]) = new RichObservable(o) implicit def enrichObservable[A, B](o: ObservableValue[A, B]) = new RichObservable(o)
implicit def enrichObservableOfIterable[A, B <% Iterable[A]](ooi: ObservableValue[B, B]) = new ObservableOfIterable[A, B](ooi) implicit def enrichObservableOfIterable[A, B](ooi: ObservableValue[B, B])(implicit ev1: B => Iterable[A]) = new ObservableOfIterable[A, B](ooi)
implicit def enrichObservableOfMapLike[A, B, C <% Iterable[(A, B)]](ooml: ObservableValue[C, C]) = new ObservableOfMapLike[A, B, C](ooml) implicit def enrichObservableOfMapLike[A, B, C](ooml: ObservableValue[C, C])(implicit ev1: C => Iterable[(A, B)]) = new ObservableOfMapLike[A, B, C](ooml)
implicit def enrichProperty[A, B](o: Property[A, B]) = new RichProperty(o) implicit def enrichProperty[A, B](o: Property[A, B]) = new RichProperty(o)
implicit def enrichTuple[A <: Product](a: A) = new RichTuple(a) implicit def enrichTuple[A <: Product](a: A) = new RichTuple(a)
} }
@ -166,7 +166,7 @@ final class RichObservable[A, C](val self: ObservableValue[A, C]) extends AnyVal
final def ⊛[B, B1](fb: ObservableValue[B, B1]) = |@|(fb) final def ⊛[B, B1](fb: ObservableValue[B, B1]) = |@|(fb)
} }
final class ObservableOfIterable[A, B <% Iterable[A]](val self: ObservableValue[B, B]) { final class ObservableOfIterable[A, B](val self: ObservableValue[B, B])(implicit ev1: B => Iterable[A]) {
def observeBuffer: ObservableBuffer[A] = { def observeBuffer: ObservableBuffer[A] = {
val buff = ObservableBuffer(self.value.toSeq) val buff = ObservableBuffer(self.value.toSeq)
self onChange { (_, oldV, newV) => fillCollection(buff.delegate, newV) } self onChange { (_, oldV, newV) => fillCollection(buff.delegate, newV) }
@ -184,7 +184,7 @@ final class ObservableOfIterable[A, B <% Iterable[A]](val self: ObservableValue[
set set
} }
} }
final class ObservableOfMapLike[A, B, C <% Iterable[(A, B)]](val self: ObservableValue[C, C]) { final class ObservableOfMapLike[A, B, C](val self: ObservableValue[C, C])(implicit ev1: C => Iterable[(A, B)]) {
def observeMap: ObservableMap[A, B] = { def observeMap: ObservableMap[A, B] = {
val map = ObservableMap[A, B](self.value.toMap.toSeq: _*) val map = ObservableMap[A, B](self.value.toMap.toSeq: _*)
self onChange { (_, oldV, newV) => self onChange { (_, oldV, newV) =>