Convert CRLF to LF

src/main/scala/model/Activity.scala

@@ -1,29 +1,29 @@
-package model
+package model
-
+
-trait ActivityComponent extends TemplateComponent { self: Profile =>
+trait ActivityComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
+  import profile.simple._
-  import self._
+  import self._
-
+
-  lazy val Activities = TableQuery[Activities]
+  lazy val Activities = TableQuery[Activities]
-
+
-  class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate {
+  class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate {
-    val activityId = column[Int]("ACTIVITY_ID", O AutoInc)
+    val activityId = column[Int]("ACTIVITY_ID", O AutoInc)
-    val activityUserName = column[String]("ACTIVITY_USER_NAME")
+    val activityUserName = column[String]("ACTIVITY_USER_NAME")
-    val activityType = column[String]("ACTIVITY_TYPE")
+    val activityType = column[String]("ACTIVITY_TYPE")
-    val message = column[String]("MESSAGE")
+    val message = column[String]("MESSAGE")
-    val additionalInfo = column[String]("ADDITIONAL_INFO")
+    val additionalInfo = column[String]("ADDITIONAL_INFO")
-    val activityDate = column[java.util.Date]("ACTIVITY_DATE")
+    val activityDate = column[java.util.Date]("ACTIVITY_DATE")
-    def * = (userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate, activityId) <> (Activity.tupled, Activity.unapply)
+    def * = (userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate, activityId) <> (Activity.tupled, Activity.unapply)
-  }
+  }
-
+
-  case class Activity(
+  case class Activity(
-    userName: String,
+    userName: String,
-    repositoryName: String,
+    repositoryName: String,
-    activityUserName: String,
+    activityUserName: String,
-    activityType: String,
+    activityType: String,
-    message: String,
+    message: String,
-    additionalInfo: Option[String],
+    additionalInfo: Option[String],
-    activityDate: java.util.Date,
+    activityDate: java.util.Date,
-    activityId: Int = 0
+    activityId: Int = 0
-  )
+  )
-}
+}

src/main/scala/model/Profile.scala

@@ -1,19 +1,19 @@
-package model
+package model
-
+
-import slick.driver.JdbcProfile
+import slick.driver.JdbcProfile
-
+
-trait Profile {
+trait Profile {
-  val profile: JdbcProfile
+  val profile: JdbcProfile
-  import profile.simple._
+  import profile.simple._
-
+
-  // java.util.Date Mapped Column Types
+  // java.util.Date Mapped Column Types
-  implicit val dateColumnType = MappedColumnType.base[java.util.Date, java.sql.Timestamp](
+  implicit val dateColumnType = MappedColumnType.base[java.util.Date, java.sql.Timestamp](
-      d => new java.sql.Timestamp(d.getTime),
+      d => new java.sql.Timestamp(d.getTime),
-      t => new java.util.Date(t.getTime)
+      t => new java.util.Date(t.getTime)
-  )
+  )
-
+
-  implicit class RichColumn(c1: Column[Boolean]){
+  implicit class RichColumn(c1: Column[Boolean]){
-    def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
+    def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
-  }
+  }
-
+
-}
+}