diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 4be937d471..472637f596 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ # Scala Steward: Reformat with scalafmt 3.6.0 df858b0ea7cc4743ec9c78cee1486ad91de1dbd4 + +# Scala Steward: Reformat with scalafmt 3.8.3 +c008a3af2590b2006a0ff5e7b745b3a5163b46cd diff --git a/.scalafmt.conf b/.scalafmt.conf index ace08b0c38..123943fe0d 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,5 +13,5 @@ optIn.breakChainOnFirstMethodDot = false align.openParenDefnSite = false project.git = true assumeStandardLibraryStripMargin = true -version = 3.6.1 +version = 3.8.3 runner.dialect = scala213 diff --git a/modules/jobs/src/main/scala/de/proteinevolution/jobs/models/Job.scala b/modules/jobs/src/main/scala/de/proteinevolution/jobs/models/Job.scala index ce3c4cf96c..286d2bcd0c 100644 --- a/modules/jobs/src/main/scala/de/proteinevolution/jobs/models/Job.scala +++ b/modules/jobs/src/main/scala/de/proteinevolution/jobs/models/Job.scala @@ -58,7 +58,7 @@ case class Job( "jobID" -> jobID.asJson, "parentID" -> parentID.asJson, "status" -> status.asJson, - "foreign" -> (!ownerID.equals(user.userID)).asJson, + "foreign" -> !ownerID.equals(user.userID).asJson, "watched" -> watchList.contains(user.userID).asJson, "isPublic" -> isPublic.asJson, "code" -> toolObj.code.asJson, diff --git a/modules/statistics/src/main/scala/de/proteinevolution/statistics/UserStatistic.scala b/modules/statistics/src/main/scala/de/proteinevolution/statistics/UserStatistic.scala index e69de29bb2..8b13789179 100644 --- a/modules/statistics/src/main/scala/de/proteinevolution/statistics/UserStatistic.scala +++ b/modules/statistics/src/main/scala/de/proteinevolution/statistics/UserStatistic.scala @@ -0,0 +1 @@ + diff --git a/modules/tools/src/main/scala/de/proteinevolution/tools/parameters/ParamAccess.scala b/modules/tools/src/main/scala/de/proteinevolution/tools/parameters/ParamAccess.scala index 5d7215acb4..120d14bd4f 100644 --- a/modules/tools/src/main/scala/de/proteinevolution/tools/parameters/ParamAccess.scala +++ b/modules/tools/src/main/scala/de/proteinevolution/tools/parameters/ParamAccess.scala @@ -93,14 +93,12 @@ class ParamAccess @Inject() (tel: TEL) { case "COSINE_PERCENTILE_CUTOFF" => select("cosine_percentile_cutoff", default = Some("70")) case "ALIGNMENT_CUTOFF" => select("alignment_cutoff", default = Some("0.30")) case "WIN_LEN" => select("win_len", default = Some("15")) - case "MERGE_HITS" => select("merge_hits", default = Some("1")) - case "PLM_ALN_MODE" => select("plm_aln_mode", default = Some("loc")) - case "SPAN" => select("span", default = Some("25")) - case "SIGMA_FACTOR" => select("sigma_factor", default = Some("2")) - case "BFACTOR" => select("bfactor", default = Some("2")) - case "PLM_GAP_EXT" => select("plm_gap_ext", default = Some("0.5")) - - + case "MERGE_HITS" => select("merge_hits", default = Some("1")) + case "PLM_ALN_MODE" => select("plm_aln_mode", default = Some("loc")) + case "SPAN" => select("span", default = Some("25")) + case "SIGMA_FACTOR" => select("sigma_factor", default = Some("2")) + case "BFACTOR" => select("bfactor", default = Some("2")) + case "PLM_GAP_EXT" => select("plm_gap_ext", default = Some("0.5")) // HHpred case "TWOTEXTALIGNMENT" =>