From e94438a94ebc249b9af5f5b637dabef3365a00a9 Mon Sep 17 00:00:00 2001
From: tobias <tobias@thecodedev.de>
Date: Sun, 13 Oct 2019 14:36:49 +0200
Subject: [PATCH] Update versionizer dependency; fix code issues
---
.../tobias/playpad/design/ModernCartDesignHandlerImpl.scala | 5 ++---
.../playpad/design/ModernGlobalDesignHandlerImpl.scala | 5 ++---
pom.xml | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/design/ModernCartDesignHandlerImpl.scala b/PlayWall/src/main/scala/de/tobias/playpad/design/ModernCartDesignHandlerImpl.scala
index 5bcdce6c..aec4ccf9 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/design/ModernCartDesignHandlerImpl.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/design/ModernCartDesignHandlerImpl.scala
@@ -8,7 +8,6 @@ import de.tobias.playpad.pad.viewcontroller.IPadViewController
import de.tobias.playpad.util.Minifier
import de.tobias.playpad.view.PseudoClasses
import javafx.util.Duration
-import org.apache.commons.lang3.StringUtils
import org.springframework.expression.ExpressionParser
import org.springframework.expression.common.TemplateParserContext
import org.springframework.expression.spel.standard.SpelExpressionParser
@@ -19,7 +18,7 @@ import scala.jdk.CollectionConverters._
class ModernCartDesignHandlerImpl extends ModernCartDesignHandler {
override def generateCss(design: ModernCartDesign, classSuffix: String, flat: Boolean): String = {
- StringUtils.join(
+ String.join(
generateCss(design, flat, classSuffix, design.getBackgroundColor),
generateCss(design, flat, classSuffix, design.getPlayColor, s":${PseudoClasses.PLAY_CLASS.getPseudoClassName}"),
generateCss(design, flat, classSuffix, design.getBackgroundColor, s":${PseudoClasses.WARN_CLASS.getPseudoClassName}")
@@ -33,7 +32,7 @@ class ModernCartDesignHandlerImpl extends ModernCartDesignHandler {
val resource = ApplicationUtils.getApplication.getClasspathResource("style/modern-pad.css")
val string = Minifier minify resource.getAsString
- val values: Map[String, Any] = Map(
+ val values: Map[String, AnyRef] = Map(
"prefix" -> padIdentifier,
"class" -> styleState,
"buttonColor" -> color.getButtonColor,
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/design/ModernGlobalDesignHandlerImpl.scala b/PlayWall/src/main/scala/de/tobias/playpad/design/ModernGlobalDesignHandlerImpl.scala
index 84450cf5..ca1ade72 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/design/ModernGlobalDesignHandlerImpl.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/design/ModernGlobalDesignHandlerImpl.scala
@@ -17,7 +17,6 @@ import de.tobias.playpad.{DisplayableColor, PlayPadMain}
import javafx.scene.paint.Color
import javafx.stage.Stage
import javafx.util.Duration
-import org.apache.commons.lang3.StringUtils
import org.springframework.expression.ExpressionParser
import org.springframework.expression.common.TemplateParserContext
import org.springframework.expression.spel.standard.SpelExpressionParser
@@ -64,7 +63,7 @@ class ModernGlobalDesignHandlerImpl extends ModernGlobalDesignHandler with Color
}
private def generateCss(design: ModernGlobalDesign): String = {
- StringUtils.join(
+ String.join(
generateCss(design, design.getBackgroundColor),
generateCss(design, design.getPlayColor, s":${PseudoClasses.PLAY_CLASS.getPseudoClassName}"),
generateCss(design, design.getBackgroundColor, s":${PseudoClasses.WARN_CLASS.getPseudoClassName}")
@@ -78,7 +77,7 @@ class ModernGlobalDesignHandlerImpl extends ModernGlobalDesignHandler with Color
val resource = ApplicationUtils.getApplication.getClasspathResource("style/modern-global.css")
val string = Minifier minify resource.getAsString
- val values: Map[String, Any] = Map(
+ val values: Map[String, AnyRef] = Map(
"class" -> styleState,
"buttonColor" -> color.getButtonColor,
"playbarTrackColor" -> color.getPlaybarColor,
diff --git a/pom.xml b/pom.xml
index 843306ae..82079b9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<jlibs.version>2.0.6</jlibs.version>
<libPlugins.version>2.2.1</libPlugins.version>
- <versionizer-api.version>1.1.1</versionizer-api.version>
+ <versionizer-api.version>1.2.0</versionizer-api.version>
<jlayer.version>1.0.1</jlayer.version>
--
GitLab