aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/reading/models/Theme.scala
diff options
context:
space:
mode:
authorJoris2017-01-31 10:18:33 +0100
committerJoris2017-01-31 10:18:33 +0100
commit5b5c04315c4923ba4ea871db0c5be6f071442b9d (patch)
treee0f26bec755a5e71a8fa2cf700f93285bbf700d2 /src/main/scala/reading/models/Theme.scala
parentb5f2ced2c742a7df3c077bf0013f88c1607beef9 (diff)
downloadreading-5b5c04315c4923ba4ea871db0c5be6f071442b9d.tar.gz
reading-5b5c04315c4923ba4ea871db0c5be6f071442b9d.tar.bz2
reading-5b5c04315c4923ba4ea871db0c5be6f071442b9d.zip
Use public instead of src/resources
Diffstat (limited to 'src/main/scala/reading/models/Theme.scala')
-rw-r--r--src/main/scala/reading/models/Theme.scala7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/scala/reading/models/Theme.scala b/src/main/scala/reading/models/Theme.scala
index 116bff8..61186a9 100644
--- a/src/main/scala/reading/models/Theme.scala
+++ b/src/main/scala/reading/models/Theme.scala
@@ -5,9 +5,8 @@ import enumeratum._
sealed trait Theme extends EnumEntry with Ordered[Theme] {
import Theme._
- def compare(that: Theme): Int = {
- values.indexOf(that) - values.indexOf(this)
- }
+ def compare(that: Theme) =
+ Compare.format(this.prettyPrint).compare(Compare.format(that.prettyPrint))
def prettyPrint(): String = this match {
case Amitie => "amitiƩ"
@@ -90,7 +89,7 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] {
}
object Theme extends Enum[Theme] {
- val values = findValues
+ val values = findValues.sorted
case object Adolescence extends Theme
case object Americain extends Theme