From a06e3899c67b167f5916c21774ddc111251071f5 Mon Sep 17 00:00:00 2001 From: karma4u101 Date: Sat, 1 Oct 2016 20:40:20 +0200 Subject: [PATCH] Formating using scalafmt v0.4.2 --- .../net/liftmodules/FoBoAJS/FoBoAJSAPI.scala | 2 +- .../FoBoAJS/mapper/MaterialUser.scala | 14 +++++----- .../FoBoAJS/snippet/FoBo/AJSResources.scala | 2 +- .../FoBoAJS/snippet/FoBo/MDButton.scala | 4 +-- .../net/liftmodules/FoBoAJS/FoBoAJSRes.scala | 2 +- Angular/AngularJS/build.sbt | 2 +- .../net/liftmodules/FoBoAJS/FoBoAJS.scala | 8 +++--- .../net/liftmodules/FoBoTB/FoBoTBAPI.scala | 8 +++--- .../FoBoTB/snippet/FoBo/Bootstrap.scala | 14 +++++----- .../FoBoTB/snippet/FoBo/TBNavLiList.scala | 4 +-- .../FoBoTB/snippet/FoBo/TBNavbar.scala | 4 +-- .../FoBoTB/snippet/FoBo/TBNavlist.scala | 4 +-- .../FoBoTB/snippet/FoBo/TBResources.scala | 2 +- .../net/liftmodules/FoBoTB/FoBoTBRes.scala | 2 +- .../Bootstrap2/Twitter-Bootstrap/build.sbt | 2 +- .../scala/net/liftmodules/FoBoTB/FoBoTB.scala | 12 ++++----- .../net/liftmodules/FoBoBs/FoBoBsAPI.scala | 2 +- .../FoBoBs/mapper/BootstrapUser.scala | 16 ++++++------ .../FoBoBs/snippet/FoBo/BS3Resources.scala | 2 +- .../FoBoBs/snippet/FoBo/Bs3Comp.scala | 26 +++++++++---------- .../snippet/FoBo/Bs3LinkedListGroup.scala | 4 +-- .../FoBoBs/snippet/FoBo/Bs3NavLiList.scala | 4 +-- .../FoBoBs/snippet/FoBo/Bs3Navbar.scala | 4 +-- .../net/liftmodules/FoBoBs/FoBoBsRes.scala | 2 +- .../Bootstrap3/TwBs-Bootstrap3/build.sbt | 2 +- .../scala/net/liftmodules/FoBoBs/FoBoBs.scala | 6 ++--- .../scala/net/liftmodules/FoBo/FoBoAPI.scala | 2 +- .../FoBo/snippet/FoBo/Resources.scala | 2 +- FoBo/FoBo/build.sbt | 18 ++++++------- .../scala/net/liftmodules/FoBo/FoBo.scala | 16 ++++++------ .../net/liftmodules/FoBoFA/FoBoFARes.scala | 2 +- .../scala/net/liftmodules/FoBoFA/FoBoFA.scala | 6 ++--- .../liftmodules/FoBoGCPRes/FoBoGCPRes.scala | 2 +- .../net/liftmodules/FoBoGCP/FoBoGCP.scala | 6 ++--- .../net/liftmodules/FoBoHL/FoBoHLAPI.scala | 2 +- .../FoBoHL/snippet/FoBo/HLResources.scala | 2 +- .../net/liftmodules/FoBoHLRes/FoBoHLRes.scala | 2 +- Highlight/HighlightJS/build.sbt | 2 +- .../scala/net/liftmodules/FoBoHL/FoBoHL.scala | 6 ++--- .../net/liftmodules/FoBoJQ/FoBoJQAPI.scala | 2 +- .../net/liftmodules/FoBoJQ/FoBoJQRes.scala | 2 +- JQuery/JQuery/build.sbt | 2 +- .../scala/net/liftmodules/FoBoJQ/FoBoJQ.scala | 6 ++--- .../net/liftmodules/FoBoKiRes/FoBoKiRes.scala | 2 +- .../scala/net/liftmodules/FoBoKi/FoBoKi.scala | 6 ++--- .../net/liftmodules/FoBoPaRes/FoBoPaRes.scala | 2 +- .../scala/net/liftmodules/FoBoPa/FoBoPa.scala | 6 ++--- build.sbt | 20 +++++++------- 48 files changed, 135 insertions(+), 135 deletions(-) diff --git a/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSAPI.scala b/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSAPI.scala index 8219985f..a2f754dc 100644 --- a/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSAPI.scala +++ b/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSAPI.scala @@ -36,7 +36,7 @@ package object FoBoAJSAPI { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/mapper/MaterialUser.scala b/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/mapper/MaterialUser.scala index 98971649..49aee06f 100644 --- a/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/mapper/MaterialUser.scala +++ b/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/mapper/MaterialUser.scala @@ -27,7 +27,7 @@ trait MaterialMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]] with GenProtoUser { self: ModelType => private lazy val msh = new msh(); - private val logger = Logger(classOf[MaterialMegaMetaProtoUser[ModelType]]) + private val logger = Logger(classOf[MaterialMegaMetaProtoUser[ModelType]]) //overriding lift-core i18 localization to add glyphicons to User menu entries (IF USER SETS fobo.xxx IN APP RESOURCE BUNDLE) //with fallback back to the i18n lift-core localization properties /** @@ -638,7 +638,7 @@ trait MaterialMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]] fields: List[FieldPointerType]): NodeSeq = { for { pointer <- fields - field <- computeFieldFromPointer(user, pointer).toList + field <- computeFieldFromPointer(user, pointer).toList if field.show_? && (!ignorePassword || !pointer.isPasswordField_?) form <- field.toForm.toList } yield { @@ -684,10 +684,10 @@ trait MaterialMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]] protected def extractLocalFormPasswordField( form: NodeSeq, field: BaseField): (NodeSeq, NodeSeq) = { - val pwInputElems = form \ "input" + val pwInputElems = form \ "input" val bindAttrToPwInputElems = "input [class]" #> "form-control" - val bsPwInputElems = bindAttrToPwInputElems(pwInputElems) - val pw1 = bsPwInputElems.head + val bsPwInputElems = bindAttrToPwInputElems(pwInputElems) + val pw1 = bsPwInputElems.head val bindAttrToPw1 = "input [placeholder]" #> resSignUpPlaceholderPassword & "input [value]" #> "" @@ -702,7 +702,7 @@ trait MaterialMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]] override def signup = { val theUser: TheUserType = mutateUserOnSignup(createNewUserInstance()) - val theName = signUpPath.mkString("") + val theName = signUpPath.mkString("") val submitAttr: Seq[SHtml.ElemAttr] = Seq( "class" -> "md-raised md-primary md-button md-default-theme") @@ -823,7 +823,7 @@ trait MaterialMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]] override def changePassword = { val user = currentUser.openOrThrowException( "we can do this because the logged in test has happened") - var oldPassword = "" + var oldPassword = "" var newPassword: List[String] = Nil def testAndSet() { diff --git a/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/snippet/FoBo/AJSResources.scala b/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/snippet/FoBo/AJSResources.scala index 402adf21..80cbcec4 100644 --- a/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/snippet/FoBo/AJSResources.scala +++ b/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/snippet/FoBo/AJSResources.scala @@ -21,7 +21,7 @@ import Helpers._ class AJSResources extends StatefulSnippet { def dispatch = { - case "injectJS" => injectJS + case "injectJS" => injectJS case "injectCSS" => injectCSS } diff --git a/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/snippet/FoBo/MDButton.scala b/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/snippet/FoBo/MDButton.scala index 0d248f82..6a79f842 100644 --- a/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/snippet/FoBo/MDButton.scala +++ b/Angular/AngularJS-API/src/main/scala/net/liftmodules/FoBoAJS/snippet/FoBo/MDButton.scala @@ -12,7 +12,7 @@ class MDButton extends StatefulSnippet with Loggable { def dispatch: DispatchIt = { case "ngHref" => ngHref - case "href" => href + case "href" => href } /** @@ -50,7 +50,7 @@ class MDButton extends StatefulSnippet with Loggable { } private def getLink(name: S.attr.Info): String = { - val loc = SiteMap.findAndTestLoc(name).toList + val loc = SiteMap.findAndTestLoc(name).toList val link = (if (!loc.isEmpty) loc.head.createDefaultLink else None) getOrElse NodeSeq.Empty if (!S.contextPath.isEmpty() && !link.isEmpty) S.contextPath + link.toString() diff --git a/Angular/AngularJS-Res/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSRes.scala b/Angular/AngularJS-Res/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSRes.scala index 32f82f38..d3ee8cee 100644 --- a/Angular/AngularJS-Res/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSRes.scala +++ b/Angular/AngularJS-Res/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJSRes.scala @@ -37,7 +37,7 @@ package object FoBoAJSRes { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Angular/AngularJS/build.sbt b/Angular/AngularJS/build.sbt index ebf00568..6f217957 100644 --- a/Angular/AngularJS/build.sbt +++ b/Angular/AngularJS/build.sbt @@ -5,7 +5,7 @@ moduleName <<= (name, liftEdition) { (n, e) => } libraryDependencies <++= (liftVersion, liftEdition, version) { (v, e, mv) => - "net.liftmodules" %% ("fobo-angularjs-res" + "_" + e) % mv % "provided" :: + "net.liftmodules" %% ("fobo-angularjs-res" + "_" + e) % mv % "provided" :: "net.liftmodules" %% ("fobo-angularjs-api" + "_" + e) % mv % "provided" :: Nil } diff --git a/Angular/AngularJS/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJS.scala b/Angular/AngularJS/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJS.scala index e891a4c5..a6ae424f 100644 --- a/Angular/AngularJS/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJS.scala +++ b/Angular/AngularJS/src/main/scala/net/liftmodules/FoBoAJS/FoBoAJS.scala @@ -68,7 +68,7 @@ package object FoBoAJS { //the object name, we can easily change this if we need to private type Store = List[String] //List[Toolkit] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Toolkit): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -321,7 +321,7 @@ package object FoBoAJS { * : * FoBo.Toolkit.Init=FoBo.Toolkit.AJMaterial111 * }}} - * + * * @since v1.7 */ case object AJMaterial111 extends Toolkit { @@ -444,7 +444,7 @@ package object FoBoAJS { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -803,7 +803,7 @@ package object FoBoAJS { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/FoBoTBAPI.scala b/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/FoBoTBAPI.scala index 4f383b13..329d3ca1 100644 --- a/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/FoBoTBAPI.scala +++ b/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/FoBoTBAPI.scala @@ -37,7 +37,7 @@ package object FoBoTBAPI { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -87,9 +87,9 @@ package object FoBoTBAPI { * }}} */ object TBLocInfo { - private val hd: Box[String] = Full("divider") - private val vd: Box[String] = Full("divider-vertical") - private val nh: Box[String] = Full("nav-header") + private val hd: Box[String] = Full("divider") + private val vd: Box[String] = Full("divider-vertical") + private val nh: Box[String] = Full("nav-header") private val ltb: Box[String] = Full("_blank") private val lts: Box[String] = Full("_self") private val ltp: Box[String] = Full("_parent") diff --git a/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/Bootstrap.scala b/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/Bootstrap.scala index e451289e..fc133d85 100644 --- a/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/Bootstrap.scala +++ b/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/Bootstrap.scala @@ -23,10 +23,10 @@ class Bootstrap extends StatefulSnippet with Loggable { private lazy val sch = new sch() def dispatch = { - case "popover" => popover - case "tooltip" => tooltip + case "popover" => popover + case "tooltip" => tooltip case "popoverPreventDefault" => popoverPreventDefault - case "activateDropdown" => activateDropdown + case "activateDropdown" => activateDropdown } /** @@ -50,7 +50,7 @@ class Bootstrap extends StatefulSnippet with Loggable { * }}} */ def popover = { - var id = S.attr("id") openOr "id: NOT DEFINED!?" + var id = S.attr("id") openOr "id: NOT DEFINED!?" var options = S.attr("options") openOr "" " *" #> sch.popover(id, options) } @@ -81,7 +81,7 @@ class Bootstrap extends StatefulSnippet with Loggable { * }}} */ def tooltip = { - var id = S.attr("id") openOr "id: NOT DEFINED!?" + var id = S.attr("id") openOr "id: NOT DEFINED!?" var options = S.attr("options") openOr "" " *" #> sch.tooltip(id, options) } @@ -145,8 +145,8 @@ class Bootstrap extends StatefulSnippet with Loggable { private def onTest(on: String): String = on match { case "arelpop" => "a[rel=popover]" - case "a[rel" => "a[rel=popover]" - case _ => on + case "a[rel" => "a[rel=popover]" + case _ => on } } diff --git a/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBNavLiList.scala b/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBNavLiList.scala index 21246bad..3f5a93f5 100644 --- a/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBNavLiList.scala +++ b/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBNavLiList.scala @@ -57,7 +57,7 @@ trait TBNavLiList extends FlexMenuBuilder with DispatchSnippet { render } - override def expandAll = true + override def expandAll = true override def linkToSelf = true override def renderOuterTag(inner: NodeSeq, top: Boolean): NodeSeq = inner @@ -222,7 +222,7 @@ trait TBNavLiList extends FlexMenuBuilder with DispatchSnippet { case Full(f) => { buildWithInfo(f, renderInner, item) } - case Empty => + case Empty => case Failure(message, _, _) => "" } //info list has more elements diff --git a/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBNavbar.scala b/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBNavbar.scala index 4af7ab1a..eb346c3b 100644 --- a/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBNavbar.scala +++ b/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBNavbar.scala @@ -82,7 +82,7 @@ trait TBNavbar extends FlexMenuBuilder with DispatchSnippet { render } - override def expandAll = true + override def expandAll = true override def linkToSelf = true override def renderOuterTag(inner: NodeSeq, top: Boolean): NodeSeq = { @@ -258,7 +258,7 @@ trait TBNavbar extends FlexMenuBuilder with DispatchSnippet { case Full(f) => { buildWithInfo(f, renderInner, item) } - case Empty => + case Empty => case Failure(message, _, _) => "" } //info list has more elements diff --git a/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBNavlist.scala b/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBNavlist.scala index 9978ec42..e9bb52bb 100644 --- a/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBNavlist.scala +++ b/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBNavlist.scala @@ -54,7 +54,7 @@ trait TBNavlist extends FlexMenuBuilder with DispatchSnippet { render } - override def expandAll = true + override def expandAll = true override def linkToSelf = true override def renderOuterTag(inner: NodeSeq, top: Boolean): NodeSeq = { @@ -234,7 +234,7 @@ trait TBNavlist extends FlexMenuBuilder with DispatchSnippet { case Full(f) => { buildWithInfo(f, renderInner, item) } - case Empty => + case Empty => case Failure(message, _, _) => "" } //info list has more elements diff --git a/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBResources.scala b/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBResources.scala index 48f70e05..5ae7d126 100644 --- a/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBResources.scala +++ b/Bootstrap/Bootstrap2/Twitter-Bootstrap-API/src/main/scala/net/liftmodules/FoBoTB/snippet/FoBo/TBResources.scala @@ -21,7 +21,7 @@ import Helpers._ class TBResources extends StatefulSnippet { def dispatch = { - case "injectJS" => injectJS + case "injectJS" => injectJS case "injectCSS" => injectCSS } diff --git a/Bootstrap/Bootstrap2/Twitter-Bootstrap-Res/src/main/scala/net/liftmodules/FoBoTB/FoBoTBRes.scala b/Bootstrap/Bootstrap2/Twitter-Bootstrap-Res/src/main/scala/net/liftmodules/FoBoTB/FoBoTBRes.scala index 9e640a62..b3c1ef46 100644 --- a/Bootstrap/Bootstrap2/Twitter-Bootstrap-Res/src/main/scala/net/liftmodules/FoBoTB/FoBoTBRes.scala +++ b/Bootstrap/Bootstrap2/Twitter-Bootstrap-Res/src/main/scala/net/liftmodules/FoBoTB/FoBoTBRes.scala @@ -37,7 +37,7 @@ package object FoBoTBRes { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Bootstrap/Bootstrap2/Twitter-Bootstrap/build.sbt b/Bootstrap/Bootstrap2/Twitter-Bootstrap/build.sbt index 173ec29c..686adb2a 100644 --- a/Bootstrap/Bootstrap2/Twitter-Bootstrap/build.sbt +++ b/Bootstrap/Bootstrap2/Twitter-Bootstrap/build.sbt @@ -5,7 +5,7 @@ moduleName <<= (name, liftEdition) { (n, e) => } libraryDependencies <++= (liftVersion, liftEdition, version) { (v, e, mv) => - "net.liftmodules" %% ("fobo-twitter-bootstrap-res" + "_" + e) % mv % "provided" :: + "net.liftmodules" %% ("fobo-twitter-bootstrap-res" + "_" + e) % mv % "provided" :: "net.liftmodules" %% ("fobo-twitter-bootstrap-api" + "_" + e) % mv % "provided" :: Nil } diff --git a/Bootstrap/Bootstrap2/Twitter-Bootstrap/src/main/scala/net/liftmodules/FoBoTB/FoBoTB.scala b/Bootstrap/Bootstrap2/Twitter-Bootstrap/src/main/scala/net/liftmodules/FoBoTB/FoBoTB.scala index f13329cb..429a59bf 100644 --- a/Bootstrap/Bootstrap2/Twitter-Bootstrap/src/main/scala/net/liftmodules/FoBoTB/FoBoTB.scala +++ b/Bootstrap/Bootstrap2/Twitter-Bootstrap/src/main/scala/net/liftmodules/FoBoTB/FoBoTB.scala @@ -82,7 +82,7 @@ package object FoBoTB { //the object name, we can easily change this if we need to private type Store = List[String] //List[Toolkit] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Toolkit): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -117,7 +117,7 @@ package object FoBoTB { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -151,7 +151,7 @@ package object FoBoTB { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -195,9 +195,9 @@ package object FoBoTB { * }}} */ object TBLocInfo { - private val hd: Box[String] = Full("divider") - private val vd: Box[String] = Full("divider-vertical") - private val nh: Box[String] = Full("nav-header") + private val hd: Box[String] = Full("divider") + private val vd: Box[String] = Full("divider-vertical") + private val nh: Box[String] = Full("nav-header") private val ltb: Box[String] = Full("_blank") private val lts: Box[String] = Full("_self") private val ltp: Box[String] = Full("_parent") diff --git a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/FoBoBsAPI.scala b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/FoBoBsAPI.scala index dacd5d6d..b4ea0732 100644 --- a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/FoBoBsAPI.scala +++ b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/FoBoBsAPI.scala @@ -37,7 +37,7 @@ package object FoBoBsAPI { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/mapper/BootstrapUser.scala b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/mapper/BootstrapUser.scala index 952a1c1e..d7c8bf1b 100644 --- a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/mapper/BootstrapUser.scala +++ b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/mapper/BootstrapUser.scala @@ -637,7 +637,7 @@ trait BootstrapMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]] fields: List[FieldPointerType]): NodeSeq = { for { pointer <- fields - field <- computeFieldFromPointer(user, pointer).toList + field <- computeFieldFromPointer(user, pointer).toList if field.show_? && (!ignorePassword || !pointer.isPasswordField_?) form <- field.toForm.toList } yield { @@ -674,10 +674,10 @@ trait BootstrapMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]] protected def extractLocalFormPasswordField( form: NodeSeq, field: BaseField): (NodeSeq, NodeSeq) = { - val pwInputElems = form \ "input" + val pwInputElems = form \ "input" val bindAttrToPwInputElems = "input [class]" #> "form-control" - val bsPwInputElems = bindAttrToPwInputElems(pwInputElems) - val pw1 = bsPwInputElems.head + val bsPwInputElems = bindAttrToPwInputElems(pwInputElems) + val pw1 = bsPwInputElems.head val bindAttrToPw1 = "input [placeholder]" #> resSignUpPlaceholderPassword & "input [value]" #> "" @@ -691,8 +691,8 @@ trait BootstrapMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]] } override def signup = { - val theUser: TheUserType = mutateUserOnSignup(createNewUserInstance()) - val theName = signUpPath.mkString("") + val theUser: TheUserType = mutateUserOnSignup(createNewUserInstance()) + val theName = signUpPath.mkString("") val submitAttr: Seq[SHtml.ElemAttr] = Seq("class" -> "btn btn-default") def testSignup() { @@ -734,7 +734,7 @@ trait BootstrapMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]] override def edit = { val theUser: TheUserType = mutateUserOnEdit( currentUser.openOrThrowException("we know we're logged in")) - val theName = editPath.mkString("") + val theName = editPath.mkString("") val submitAttr: Seq[SHtml.ElemAttr] = Seq("class" -> "btn btn-default") def testEdit() { @@ -808,7 +808,7 @@ trait BootstrapMegaMetaProtoUser[ModelType <: MegaProtoUser[ModelType]] override def changePassword = { val user = currentUser.openOrThrowException( "we can do this because the logged in test has happened") - var oldPassword = "" + var oldPassword = "" var newPassword: List[String] = Nil def testAndSet() { diff --git a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/BS3Resources.scala b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/BS3Resources.scala index f9aa9dac..b615db3e 100644 --- a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/BS3Resources.scala +++ b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/BS3Resources.scala @@ -21,7 +21,7 @@ import Helpers._ class BS3Resources extends StatefulSnippet { def dispatch = { - case "injectJS" => injectJS + case "injectJS" => injectJS case "injectCSS" => injectCSS } diff --git a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3Comp.scala b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3Comp.scala index 656f5329..f82830e9 100644 --- a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3Comp.scala +++ b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3Comp.scala @@ -25,14 +25,14 @@ class Bs3Comp extends StatefulSnippet with Loggable { private lazy val sch = new sch() def dispatch = { - case "popover" => popover - case "popoverAppendJs" => popoverAppendJs - case "popoverPreventDefault" => popoverPreventDefault + case "popover" => popover + case "popoverAppendJs" => popoverAppendJs + case "popoverPreventDefault" => popoverPreventDefault case "popoverPreventDefaultAppendJs" => popoverPreventDefaultAppendJs - case "tooltip" => tooltip - case "tooltipAppendJs" => tooltipAppendJs - case "activateDropdown" => activateDropdown - case "activateDropdownAppendJs" => activateDropdownAppendJs + case "tooltip" => tooltip + case "tooltipAppendJs" => tooltipAppendJs + case "activateDropdown" => activateDropdown + case "activateDropdownAppendJs" => activateDropdownAppendJs } @@ -57,7 +57,7 @@ class Bs3Comp extends StatefulSnippet with Loggable { * }}} */ def popover = { - var id = S.attr("id") openOr "id: NOT DEFINED!?" + var id = S.attr("id") openOr "id: NOT DEFINED!?" var options = S.attr("options") openOr "" " *" #> JsCmds.Script(sch.popoverScript(id, options)) } @@ -81,7 +81,7 @@ class Bs3Comp extends StatefulSnippet with Loggable { * @since v1.4 */ def popoverAppendJs: CssSel = { - var id = S.attr("id") openOr "id: NOT DEFINED!?" + var id = S.attr("id") openOr "id: NOT DEFINED!?" var options = S.attr("options") openOr "" S.appendJs(sch.popoverScript(id, options)) " *" #> "" @@ -115,7 +115,7 @@ class Bs3Comp extends StatefulSnippet with Loggable { * @see [[net.liftmodules.FoBoBs.lib.BootstrapSH.tooltipScript]] */ def tooltip: CssSel = { - var id = S.attr("id") openOr "id: NOT DEFINED!?" + var id = S.attr("id") openOr "id: NOT DEFINED!?" var options = S.attr("options") openOr "" " *" #> JsCmds.Script(sch.tooltipScript(id, options)) } @@ -144,7 +144,7 @@ class Bs3Comp extends StatefulSnippet with Loggable { * @since v1.4 */ def tooltipAppendJs: CssSel = { - var id = S.attr("id") openOr "id: NOT DEFINED!?" + var id = S.attr("id") openOr "id: NOT DEFINED!?" var options = S.attr("options") openOr "" S.appendJs(sch.tooltipScript(id, options)) " *" #> "" @@ -263,8 +263,8 @@ class Bs3Comp extends StatefulSnippet with Loggable { private def onTest(on: String): String = on match { case "arelpop" => "a[rel=popover]" - case "a[rel" => "a[rel=popover]" - case _ => on + case "a[rel" => "a[rel=popover]" + case _ => on } } diff --git a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3LinkedListGroup.scala b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3LinkedListGroup.scala index a3a54f19..26138eae 100644 --- a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3LinkedListGroup.scala +++ b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3LinkedListGroup.scala @@ -62,7 +62,7 @@ trait Bs3LinkedListGroup extends FlexMenuBuilder with DispatchSnippet { render } - override def expandAll = true + override def expandAll = true override def linkToSelf = true override def renderOuterTag(inner: NodeSeq, top: Boolean): NodeSeq = inner @@ -206,7 +206,7 @@ trait Bs3LinkedListGroup extends FlexMenuBuilder with DispatchSnippet { case Full(f) => { buildWithInfo(f, renderInner, item) } - case Empty => + case Empty => case Failure(message, _, _) => "" } //info list has more elements diff --git a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3NavLiList.scala b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3NavLiList.scala index 2caa3b3a..c4903807 100644 --- a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3NavLiList.scala +++ b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3NavLiList.scala @@ -57,7 +57,7 @@ trait Bs3NavLiList extends FlexMenuBuilder with DispatchSnippet { render } - override def expandAll = true + override def expandAll = true override def linkToSelf = true override def renderOuterTag(inner: NodeSeq, top: Boolean): NodeSeq = inner @@ -223,7 +223,7 @@ trait Bs3NavLiList extends FlexMenuBuilder with DispatchSnippet { case Full(f) => { buildWithInfo(f, renderInner, item) } - case Empty => + case Empty => case Failure(message, _, _) => "" } //info list has more elements diff --git a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3Navbar.scala b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3Navbar.scala index 9636c678..957076c3 100644 --- a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3Navbar.scala +++ b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-API/src/main/scala/net/liftmodules/FoBoBs/snippet/FoBo/Bs3Navbar.scala @@ -85,7 +85,7 @@ trait Bs3Navbar extends FlexMenuBuilder with DispatchSnippet { render } - override def expandAll = true + override def expandAll = true override def linkToSelf = true override def renderOuterTag(inner: NodeSeq, top: Boolean): NodeSeq = { @@ -261,7 +261,7 @@ trait Bs3Navbar extends FlexMenuBuilder with DispatchSnippet { case Full(f) => { buildWithInfo(f, renderInner, item) } - case Empty => + case Empty => case Failure(message, _, _) => "" } //info list has more elements diff --git a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-Res/src/main/scala/net/liftmodules/FoBoBs/FoBoBsRes.scala b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-Res/src/main/scala/net/liftmodules/FoBoBs/FoBoBsRes.scala index ce6649c9..da42fd6f 100644 --- a/Bootstrap/Bootstrap3/TwBs-Bootstrap3-Res/src/main/scala/net/liftmodules/FoBoBs/FoBoBsRes.scala +++ b/Bootstrap/Bootstrap3/TwBs-Bootstrap3-Res/src/main/scala/net/liftmodules/FoBoBs/FoBoBsRes.scala @@ -37,7 +37,7 @@ package object FoBoBsRes { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Bootstrap/Bootstrap3/TwBs-Bootstrap3/build.sbt b/Bootstrap/Bootstrap3/TwBs-Bootstrap3/build.sbt index 1f58aded..3bea2183 100644 --- a/Bootstrap/Bootstrap3/TwBs-Bootstrap3/build.sbt +++ b/Bootstrap/Bootstrap3/TwBs-Bootstrap3/build.sbt @@ -5,7 +5,7 @@ moduleName <<= (name, liftEdition) { (n, e) => } libraryDependencies <++= (liftVersion, liftEdition, version) { (v, e, mv) => - "net.liftmodules" %% ("fobo-twbs-bootstrap3-res" + "_" + e) % mv % "provided" :: + "net.liftmodules" %% ("fobo-twbs-bootstrap3-res" + "_" + e) % mv % "provided" :: "net.liftmodules" %% ("fobo-twbs-bootstrap3-api" + "_" + e) % mv % "provided" :: Nil } diff --git a/Bootstrap/Bootstrap3/TwBs-Bootstrap3/src/main/scala/net/liftmodules/FoBoBs/FoBoBs.scala b/Bootstrap/Bootstrap3/TwBs-Bootstrap3/src/main/scala/net/liftmodules/FoBoBs/FoBoBs.scala index 02adc274..602ffed6 100644 --- a/Bootstrap/Bootstrap3/TwBs-Bootstrap3/src/main/scala/net/liftmodules/FoBoBs/FoBoBs.scala +++ b/Bootstrap/Bootstrap3/TwBs-Bootstrap3/src/main/scala/net/liftmodules/FoBoBs/FoBoBs.scala @@ -82,7 +82,7 @@ package object FoBoBs { //the object name, we can easily change this if we need to private type Store = List[String] //List[Toolkit] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Toolkit): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -209,7 +209,7 @@ package object FoBoBs { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -330,7 +330,7 @@ package object FoBoBs { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/FoBo/FoBo-API/src/main/scala/net/liftmodules/FoBo/FoBoAPI.scala b/FoBo/FoBo-API/src/main/scala/net/liftmodules/FoBo/FoBoAPI.scala index 3c37e860..0e8c7c71 100644 --- a/FoBo/FoBo-API/src/main/scala/net/liftmodules/FoBo/FoBoAPI.scala +++ b/FoBo/FoBo-API/src/main/scala/net/liftmodules/FoBo/FoBoAPI.scala @@ -36,7 +36,7 @@ package object FoBoAPI { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/FoBo/FoBo-API/src/main/scala/net/liftmodules/FoBo/snippet/FoBo/Resources.scala b/FoBo/FoBo-API/src/main/scala/net/liftmodules/FoBo/snippet/FoBo/Resources.scala index 7115a41b..9f9ad0c6 100644 --- a/FoBo/FoBo-API/src/main/scala/net/liftmodules/FoBo/snippet/FoBo/Resources.scala +++ b/FoBo/FoBo-API/src/main/scala/net/liftmodules/FoBo/snippet/FoBo/Resources.scala @@ -21,7 +21,7 @@ import Helpers._ class Resources extends StatefulSnippet { def dispatch = { - case "injectJS" => injectJS + case "injectJS" => injectJS case "injectCSS" => injectCSS } diff --git a/FoBo/FoBo/build.sbt b/FoBo/FoBo/build.sbt index 52a18142..2a89acd7 100644 --- a/FoBo/FoBo/build.sbt +++ b/FoBo/FoBo/build.sbt @@ -5,15 +5,15 @@ moduleName <<= (name, liftEdition) { (n, e) => } libraryDependencies <++= (liftVersion, liftEdition, version) { (v, e, mv) => - "net.liftmodules" %% ("fobo-api" + "_" + e) % mv % "compile" :: - "net.liftmodules" %% ("fobo-pace" + "_" + e) % mv % "compile" :: - "net.liftmodules" %% ("fobo-jquery" + "_" + e) % mv % "compile" :: - "net.liftmodules" %% ("fobo-kineticjs" + "_" + e) % mv % "compile" :: - "net.liftmodules" %% ("fobo-angularjs" + "_" + e) % mv % "compile" :: - "net.liftmodules" %% ("fobo-highlightjs" + "_" + e) % mv % "compile" :: - "net.liftmodules" %% ("fobo-font-awesome" + "_" + e) % mv % "compile" :: - "net.liftmodules" %% ("fobo-twbs-bootstrap3" + "_" + e) % mv % "compile" :: - "net.liftmodules" %% ("fobo-twitter-bootstrap" + "_" + e) % mv % "compile" :: + "net.liftmodules" %% ("fobo-api" + "_" + e) % mv % "compile" :: + "net.liftmodules" %% ("fobo-pace" + "_" + e) % mv % "compile" :: + "net.liftmodules" %% ("fobo-jquery" + "_" + e) % mv % "compile" :: + "net.liftmodules" %% ("fobo-kineticjs" + "_" + e) % mv % "compile" :: + "net.liftmodules" %% ("fobo-angularjs" + "_" + e) % mv % "compile" :: + "net.liftmodules" %% ("fobo-highlightjs" + "_" + e) % mv % "compile" :: + "net.liftmodules" %% ("fobo-font-awesome" + "_" + e) % mv % "compile" :: + "net.liftmodules" %% ("fobo-twbs-bootstrap3" + "_" + e) % mv % "compile" :: + "net.liftmodules" %% ("fobo-twitter-bootstrap" + "_" + e) % mv % "compile" :: "net.liftmodules" %% ("fobo-google-code-prettify" + "_" + e) % mv % "compile" :: Nil } diff --git a/FoBo/FoBo/src/main/scala/net/liftmodules/FoBo/FoBo.scala b/FoBo/FoBo/src/main/scala/net/liftmodules/FoBo/FoBo.scala index 621a74eb..333c3b72 100644 --- a/FoBo/FoBo/src/main/scala/net/liftmodules/FoBo/FoBo.scala +++ b/FoBo/FoBo/src/main/scala/net/liftmodules/FoBo/FoBo.scala @@ -145,7 +145,7 @@ package object FoBo { //the object name, we can easily change this if we need to private type Store = List[String] //List[Toolkit] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Toolkit): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -388,7 +388,7 @@ package object FoBo { * : * FoBo.Toolkit.Init=FoBo.Toolkit.AJMaterial111 * }}} - * + * * @since v1.7 */ case object AJMaterial111 extends Toolkit { @@ -1022,7 +1022,7 @@ package object FoBo { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -1893,7 +1893,7 @@ package object FoBo { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -2053,9 +2053,9 @@ package object FoBo { @deprecated("Use BSLocInfo or TBLocInfo provided by FoBoBs and FoBoTB ", "1.6.0") object TBLocInfo { - private val hd: Box[String] = Full("divider") - private val vd: Box[String] = Full("divider-vertical") - private val nh: Box[String] = Full("nav-header") + private val hd: Box[String] = Full("divider") + private val vd: Box[String] = Full("divider-vertical") + private val nh: Box[String] = Full("nav-header") private val ltb: Box[String] = Full("_blank") private val lts: Box[String] = Full("_self") private val ltp: Box[String] = Full("_parent") @@ -2167,7 +2167,7 @@ package object FoBo { @deprecated("Use FoBo.Toolkit.Init=FoBo.Toolkit.[Toolkit case object name]", "1.6.0") object InitParam extends FoBoToolkit with FoBoJQuery { - var JQuery: FoBoJQuery = null + var JQuery: FoBoJQuery = null var ToolKit: FoBoToolkit = _ } diff --git a/Font-Awesome/Font-Awesome-Res/src/main/scala/net/liftmodules/FoBoFA/FoBoFARes.scala b/Font-Awesome/Font-Awesome-Res/src/main/scala/net/liftmodules/FoBoFA/FoBoFARes.scala index 3f876b60..0bc9b21c 100644 --- a/Font-Awesome/Font-Awesome-Res/src/main/scala/net/liftmodules/FoBoFA/FoBoFARes.scala +++ b/Font-Awesome/Font-Awesome-Res/src/main/scala/net/liftmodules/FoBoFA/FoBoFARes.scala @@ -36,7 +36,7 @@ package object FoBoFARes { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Font-Awesome/Font-Awesome/src/main/scala/net/liftmodules/FoBoFA/FoBoFA.scala b/Font-Awesome/Font-Awesome/src/main/scala/net/liftmodules/FoBoFA/FoBoFA.scala index 46b5b543..4707c1c1 100644 --- a/Font-Awesome/Font-Awesome/src/main/scala/net/liftmodules/FoBoFA/FoBoFA.scala +++ b/Font-Awesome/Font-Awesome/src/main/scala/net/liftmodules/FoBoFA/FoBoFA.scala @@ -71,7 +71,7 @@ package object FoBoFA { //the object name, we can easily change this if we need to private type Store = List[String] //List[Toolkit] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Toolkit): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -173,7 +173,7 @@ package object FoBoFA { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -270,7 +270,7 @@ package object FoBoFA { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Google-Code-Prettify/Google-Code-Prettify-Res/src/main/scala/net/liftmodules/FoBoGCPRes/FoBoGCPRes.scala b/Google-Code-Prettify/Google-Code-Prettify-Res/src/main/scala/net/liftmodules/FoBoGCPRes/FoBoGCPRes.scala index d6d06c66..75783a35 100644 --- a/Google-Code-Prettify/Google-Code-Prettify-Res/src/main/scala/net/liftmodules/FoBoGCPRes/FoBoGCPRes.scala +++ b/Google-Code-Prettify/Google-Code-Prettify-Res/src/main/scala/net/liftmodules/FoBoGCPRes/FoBoGCPRes.scala @@ -38,7 +38,7 @@ package object FoBoGCPRes { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Google-Code-Prettify/Google-Code-Prettify/src/main/scala/net/liftmodules/FoBoGCP/FoBoGCP.scala b/Google-Code-Prettify/Google-Code-Prettify/src/main/scala/net/liftmodules/FoBoGCP/FoBoGCP.scala index 5f8994a2..e234b06e 100644 --- a/Google-Code-Prettify/Google-Code-Prettify/src/main/scala/net/liftmodules/FoBoGCP/FoBoGCP.scala +++ b/Google-Code-Prettify/Google-Code-Prettify/src/main/scala/net/liftmodules/FoBoGCP/FoBoGCP.scala @@ -71,7 +71,7 @@ package object FoBoGCP { //the object name, we can easily change this if we need to private type Store = List[String] //List[Toolkit] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Toolkit): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -105,7 +105,7 @@ package object FoBoGCP { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -137,7 +137,7 @@ package object FoBoGCP { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Highlight/HighlightJS-API/src/main/scala/net/liftmodules/FoBoHL/FoBoHLAPI.scala b/Highlight/HighlightJS-API/src/main/scala/net/liftmodules/FoBoHL/FoBoHLAPI.scala index 1594959a..a71eec08 100644 --- a/Highlight/HighlightJS-API/src/main/scala/net/liftmodules/FoBoHL/FoBoHLAPI.scala +++ b/Highlight/HighlightJS-API/src/main/scala/net/liftmodules/FoBoHL/FoBoHLAPI.scala @@ -36,7 +36,7 @@ package object FoBoHLAPI { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Highlight/HighlightJS-API/src/main/scala/net/liftmodules/FoBoHL/snippet/FoBo/HLResources.scala b/Highlight/HighlightJS-API/src/main/scala/net/liftmodules/FoBoHL/snippet/FoBo/HLResources.scala index 611920f3..7fdace0e 100644 --- a/Highlight/HighlightJS-API/src/main/scala/net/liftmodules/FoBoHL/snippet/FoBo/HLResources.scala +++ b/Highlight/HighlightJS-API/src/main/scala/net/liftmodules/FoBoHL/snippet/FoBo/HLResources.scala @@ -21,7 +21,7 @@ import Helpers._ class HLResources extends StatefulSnippet { def dispatch = { - case "injectJS" => injectJS + case "injectJS" => injectJS case "injectCSS" => injectCSS } diff --git a/Highlight/HighlightJS-Res/src/main/scala/net/liftmodules/FoBoHLRes/FoBoHLRes.scala b/Highlight/HighlightJS-Res/src/main/scala/net/liftmodules/FoBoHLRes/FoBoHLRes.scala index 94571375..2c574cf2 100644 --- a/Highlight/HighlightJS-Res/src/main/scala/net/liftmodules/FoBoHLRes/FoBoHLRes.scala +++ b/Highlight/HighlightJS-Res/src/main/scala/net/liftmodules/FoBoHLRes/FoBoHLRes.scala @@ -38,7 +38,7 @@ package object FoBoHLRes { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Highlight/HighlightJS/build.sbt b/Highlight/HighlightJS/build.sbt index 84116318..0d57aa77 100644 --- a/Highlight/HighlightJS/build.sbt +++ b/Highlight/HighlightJS/build.sbt @@ -5,7 +5,7 @@ moduleName <<= (name, liftEdition) { (n, e) => } libraryDependencies <++= (liftVersion, liftEdition, version) { (v, e, mv) => - "net.liftmodules" %% ("fobo-highlightjs-res" + "_" + e) % mv % "provided" :: + "net.liftmodules" %% ("fobo-highlightjs-res" + "_" + e) % mv % "provided" :: "net.liftmodules" %% ("fobo-highlightjs-api" + "_" + e) % mv % "provided" :: Nil } diff --git a/Highlight/HighlightJS/src/main/scala/net/liftmodules/FoBoHL/FoBoHL.scala b/Highlight/HighlightJS/src/main/scala/net/liftmodules/FoBoHL/FoBoHL.scala index eddd090a..8bb18b82 100644 --- a/Highlight/HighlightJS/src/main/scala/net/liftmodules/FoBoHL/FoBoHL.scala +++ b/Highlight/HighlightJS/src/main/scala/net/liftmodules/FoBoHL/FoBoHL.scala @@ -71,7 +71,7 @@ package object FoBoHL { //the object name, we can easily change this if we need to private type Store = List[String] //List[Toolkit] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Toolkit): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -105,7 +105,7 @@ package object FoBoHL { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -138,7 +138,7 @@ package object FoBoHL { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/JQuery/JQuery-API/src/main/scala/net/liftmodules/FoBoJQ/FoBoJQAPI.scala b/JQuery/JQuery-API/src/main/scala/net/liftmodules/FoBoJQ/FoBoJQAPI.scala index e6e89abc..9df274c4 100644 --- a/JQuery/JQuery-API/src/main/scala/net/liftmodules/FoBoJQ/FoBoJQAPI.scala +++ b/JQuery/JQuery-API/src/main/scala/net/liftmodules/FoBoJQ/FoBoJQAPI.scala @@ -37,7 +37,7 @@ package object FoBoJQAPI { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/JQuery/JQuery-Res/src/main/scala/net/liftmodules/FoBoJQ/FoBoJQRes.scala b/JQuery/JQuery-Res/src/main/scala/net/liftmodules/FoBoJQ/FoBoJQRes.scala index 8aa8f8f6..3eff2eb3 100644 --- a/JQuery/JQuery-Res/src/main/scala/net/liftmodules/FoBoJQ/FoBoJQRes.scala +++ b/JQuery/JQuery-Res/src/main/scala/net/liftmodules/FoBoJQ/FoBoJQRes.scala @@ -36,7 +36,7 @@ package object FoBoJQRes { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/JQuery/JQuery/build.sbt b/JQuery/JQuery/build.sbt index 857089ec..8cfe515c 100644 --- a/JQuery/JQuery/build.sbt +++ b/JQuery/JQuery/build.sbt @@ -5,7 +5,7 @@ moduleName <<= (name, liftEdition) { (n, e) => } libraryDependencies <++= (liftVersion, liftEdition, version) { (v, e, mv) => - "net.liftmodules" %% ("fobo-jquery-api" + "_" + e) % mv % "provided" :: + "net.liftmodules" %% ("fobo-jquery-api" + "_" + e) % mv % "provided" :: "net.liftmodules" %% ("fobo-jquery-res" + "_" + e) % mv % "provided" :: Nil } diff --git a/JQuery/JQuery/src/main/scala/net/liftmodules/FoBoJQ/FoBoJQ.scala b/JQuery/JQuery/src/main/scala/net/liftmodules/FoBoJQ/FoBoJQ.scala index ece211cb..1c6fea63 100644 --- a/JQuery/JQuery/src/main/scala/net/liftmodules/FoBoJQ/FoBoJQ.scala +++ b/JQuery/JQuery/src/main/scala/net/liftmodules/FoBoJQ/FoBoJQ.scala @@ -71,7 +71,7 @@ package object FoBoJQ { //the object name, we can easily change this if we need to private type Store = List[String] //List[Toolkit] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Toolkit): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -319,7 +319,7 @@ package object FoBoJQ { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -549,7 +549,7 @@ package object FoBoJQ { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Kinetic/KineticJS-Res/src/main/scala/net/liftmodules/FoBoKiRes/FoBoKiRes.scala b/Kinetic/KineticJS-Res/src/main/scala/net/liftmodules/FoBoKiRes/FoBoKiRes.scala index 5b67799e..2b0569a8 100644 --- a/Kinetic/KineticJS-Res/src/main/scala/net/liftmodules/FoBoKiRes/FoBoKiRes.scala +++ b/Kinetic/KineticJS-Res/src/main/scala/net/liftmodules/FoBoKiRes/FoBoKiRes.scala @@ -36,7 +36,7 @@ package object FoBoKiRes { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Kinetic/KineticJS/src/main/scala/net/liftmodules/FoBoKi/FoBoKi.scala b/Kinetic/KineticJS/src/main/scala/net/liftmodules/FoBoKi/FoBoKi.scala index a095a949..49509bac 100644 --- a/Kinetic/KineticJS/src/main/scala/net/liftmodules/FoBoKi/FoBoKi.scala +++ b/Kinetic/KineticJS/src/main/scala/net/liftmodules/FoBoKi/FoBoKi.scala @@ -71,7 +71,7 @@ package object FoBoKi { //the object name, we can easily change this if we need to private type Store = List[String] //List[Toolkit] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Toolkit): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -105,7 +105,7 @@ package object FoBoKi { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -139,7 +139,7 @@ package object FoBoKi { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Pace/Pace-Res/src/main/scala/net/liftmodules/FoBoPaRes/FoBoPaRes.scala b/Pace/Pace-Res/src/main/scala/net/liftmodules/FoBoPaRes/FoBoPaRes.scala index 75c0080e..80c48a82 100644 --- a/Pace/Pace-Res/src/main/scala/net/liftmodules/FoBoPaRes/FoBoPaRes.scala +++ b/Pace/Pace-Res/src/main/scala/net/liftmodules/FoBoPaRes/FoBoPaRes.scala @@ -36,7 +36,7 @@ package object FoBoPaRes { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/Pace/Pace/src/main/scala/net/liftmodules/FoBoPa/FoBoPa.scala b/Pace/Pace/src/main/scala/net/liftmodules/FoBoPa/FoBoPa.scala index 5901f037..c84fdb4b 100644 --- a/Pace/Pace/src/main/scala/net/liftmodules/FoBoPa/FoBoPa.scala +++ b/Pace/Pace/src/main/scala/net/liftmodules/FoBoPa/FoBoPa.scala @@ -71,7 +71,7 @@ package object FoBoPa { //the object name, we can easily change this if we need to private type Store = List[String] //List[Toolkit] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Toolkit): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -119,7 +119,7 @@ package object FoBoPa { //the object name, we can easily change this if we need to private type Store = List[String] //List[Resource] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: Resource): Store = { store = if (store contains t.toString) store else t.toString :: store store @@ -167,7 +167,7 @@ package object FoBoPa { //the object name, we can easily change this if we need to private type Store = List[String] //List[API] private var store: Store = List() - def Init: Store = store + def Init: Store = store def Init_=(t: API): Store = { store = if (store contains t.toString) store else t.toString :: store store diff --git a/build.sbt b/build.sbt index b89ea997..5c7e9d7a 100644 --- a/build.sbt +++ b/build.sbt @@ -201,7 +201,7 @@ resolvers in ThisBuild ++= Seq( //############## libraryDependencies in ThisBuild <++= (liftVersion, liftEdition, version) { (v, e, mv) => - "net.liftweb" %% "lift-webkit" % v % "provided" :: + "net.liftweb" %% "lift-webkit" % v % "provided" :: "net.liftweb" %% "lift-testkit" % v % "provided" :: Nil } @@ -210,30 +210,30 @@ libraryDependencies in ThisBuild <++= (scalaVersion, liftVersion) { (sv, lv) => ((sv, lv) match { case ("2.9.2", _) | ("2.9.1", _) | ("2.9.1-1", _) => "org.specs2" %% "specs2" % "1.12.3" % "test" - case ("2.10.4", _) => "org.specs2" %% "specs2" % "1.13" % "test" - case (_, "2.6.2") => "org.specs2" %% "specs2" % "2.3.11" % "test" - case (_, _) => "org.specs2" %% "specs2" % "3.7" % "test" + case ("2.10.4", _) => "org.specs2" %% "specs2" % "1.13" % "test" + case (_, "2.6.2") => "org.specs2" %% "specs2" % "2.3.11" % "test" + case (_, _) => "org.specs2" %% "specs2" % "3.7" % "test" }) :: ((sv, lv) match { case ("2.10.4", _) | ("2.9.2", _) | ("2.9.1", _) | ("2.9.1-1", _) => "org.scalacheck" %% "scalacheck" % "1.10.0" % "test" - case (_, "2.6.2") => "org.scalacheck" %% "scalacheck" % "1.11.4" % "test" - case (_, _) => "org.specs2" %% "specs2-scalacheck" % "3.7" % "test" + case (_, "2.6.2") => "org.scalacheck" %% "scalacheck" % "1.11.4" % "test" + case (_, _) => "org.specs2" %% "specs2-scalacheck" % "3.7" % "test" }) :: Nil } libraryDependencies in ThisBuild <++= liftVersion { lv => (lv match { - case "2.6.2" => "javax.servlet" % "servlet-api" % "2.5" % "provided,test" - case _ => "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided,test" + case "2.6.2" => "javax.servlet" % "servlet-api" % "2.5" % "provided,test" + case _ => "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided,test" }) :: Nil } libraryDependencies in ThisBuild ++= { - "ch.qos.logback" % "logback-classic" % "1.0.0" % "provided" :: - "log4j" % "log4j" % "1.2.16" % "provided" :: + "ch.qos.logback" % "logback-classic" % "1.0.0" % "provided" :: + "log4j" % "log4j" % "1.2.16" % "provided" :: Nil }