aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/reading/models
diff options
context:
space:
mode:
authorJoris2017-01-20 19:15:34 +0100
committerJoris2017-01-20 19:15:34 +0100
commite7c270ef8970a87923b80175d60e265cdb94c2db (patch)
treeb9e987960b2218f947fac749377201f08ff476d7 /src/main/scala/reading/models
parent3877c76175007ddf0659abd63f30c7d163650174 (diff)
downloadreading-e7c270ef8970a87923b80175d60e265cdb94c2db.tar.gz
reading-e7c270ef8970a87923b80175d60e265cdb94c2db.tar.bz2
reading-e7c270ef8970a87923b80175d60e265cdb94c2db.zip
Add scalariform before each compilation
Diffstat (limited to 'src/main/scala/reading/models')
-rw-r--r--src/main/scala/reading/models/Book.scala20
-rw-r--r--src/main/scala/reading/models/Grade.scala8
-rw-r--r--src/main/scala/reading/models/Program.scala38
3 files changed, 33 insertions, 33 deletions
diff --git a/src/main/scala/reading/models/Book.scala b/src/main/scala/reading/models/Book.scala
index 1ee7eb6..7930a63 100644
--- a/src/main/scala/reading/models/Book.scala
+++ b/src/main/scala/reading/models/Book.scala
@@ -1,15 +1,15 @@
package reading.models
-case class Book (
- title: String,
- author: String,
- year: String,
- parts: Int = 1,
- period: Option[Period],
- genres: Seq[Genre],
- themes: Seq[Theme],
- programs: Seq[Program],
- level: Level
+case class Book(
+ title: String,
+ author: String,
+ year: String,
+ parts: Int = 1,
+ period: Option[Period],
+ genres: Seq[Genre],
+ themes: Seq[Theme],
+ programs: Seq[Program],
+ level: Level
) extends Ordered[Book] {
def compare(that: Book) = {
def formatTitle(title: String) =
diff --git a/src/main/scala/reading/models/Grade.scala b/src/main/scala/reading/models/Grade.scala
index c48234b..32c5b72 100644
--- a/src/main/scala/reading/models/Grade.scala
+++ b/src/main/scala/reading/models/Grade.scala
@@ -10,10 +10,10 @@ sealed trait Grade extends EnumEntry with Ordered[Grade] {
}
def prettyPrint(): String = this match {
- case Sixieme => "6ème"
- case Cinquieme => "5ème"
- case Quatrieme => "4ème"
- case Troisieme => "3ème"
+ case Sixieme => "6ème"
+ case Cinquieme => "5ème"
+ case Quatrieme => "4ème"
+ case Troisieme => "3ème"
}
}
diff --git a/src/main/scala/reading/models/Program.scala b/src/main/scala/reading/models/Program.scala
index da07653..17385b4 100644
--- a/src/main/scala/reading/models/Program.scala
+++ b/src/main/scala/reading/models/Program.scala
@@ -10,28 +10,28 @@ sealed trait Program extends EnumEntry with Ordered[Program] {
}
def prettyPrint(): String = this match {
- case Monstre => "Le monstre, aux limites de l'humain"
- case RecitAventure => "Récits d'aventures"
- case CreationPoetique => "Récit de création, création poétique"
- case Resister => "Résister au plus fort : ruses, mensonges et masques"
+ case Monstre => "Le monstre, aux limites de l'humain"
+ case RecitAventure => "Récits d'aventures"
+ case CreationPoetique => "Récit de création, création poétique"
+ case Resister => "Résister au plus fort : ruses, mensonges et masques"
- case VoyageEtAventure => "Le voyage et l'aventure"
- case Autrui => "Avec autrui : familles, amis, réseaux"
- case UniversNouveaux => "Imaginer des univers nouveaux"
- case Heros => "Héros, héroïnes et héroïsmes"
- case HommeEtNature => "L'être humain est-il maître de la nature ?"
+ case VoyageEtAventure => "Le voyage et l'aventure"
+ case Autrui => "Avec autrui : familles, amis, réseaux"
+ case UniversNouveaux => "Imaginer des univers nouveaux"
+ case Heros => "Héros, héroïnes et héroïsmes"
+ case HommeEtNature => "L'être humain est-il maître de la nature ?"
- case DireAmour => "Dire l'amour"
- case IndividuEtSociete => "Individu et société : confrontations de valeur ?"
- case FictionEtReel => "La fiction pour interroger le réel"
- case Informer => "Informer, s'informer, déformer ?"
- case Ville => "La ville, lieu de tous les possibles ?"
+ case DireAmour => "Dire l'amour"
+ case IndividuEtSociete => "Individu et société : confrontations de valeur ?"
+ case FictionEtReel => "La fiction pour interroger le réel"
+ case Informer => "Informer, s'informer, déformer ?"
+ case Ville => "La ville, lieu de tous les possibles ?"
- case RaconterRepresenter => "Se raconter, se représenter"
- case TraversSociete => "Dénoncer les travers de la société"
- case VisionsPoetiques => "Visions poétiques du monde"
- case AgirCite => "Agir dans la cité : individu et pouvoir"
- case ProgresReveScientifique => "Progrès et rêves scientifiques"
+ case RaconterRepresenter => "Se raconter, se représenter"
+ case TraversSociete => "Dénoncer les travers de la société"
+ case VisionsPoetiques => "Visions poétiques du monde"
+ case AgirCite => "Agir dans la cité : individu et pouvoir"
+ case ProgresReveScientifique => "Progrès et rêves scientifiques"
}
}