Skip to content
Snippets Groups Projects
Commit e94438a9 authored by Tobias Ullerich's avatar Tobias Ullerich
Browse files

Update versionizer dependency; fix code issues

parent b58e8e4e
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,6 @@ import de.tobias.playpad.pad.viewcontroller.IPadViewController ...@@ -8,7 +8,6 @@ import de.tobias.playpad.pad.viewcontroller.IPadViewController
import de.tobias.playpad.util.Minifier import de.tobias.playpad.util.Minifier
import de.tobias.playpad.view.PseudoClasses import de.tobias.playpad.view.PseudoClasses
import javafx.util.Duration import javafx.util.Duration
import org.apache.commons.lang3.StringUtils
import org.springframework.expression.ExpressionParser import org.springframework.expression.ExpressionParser
import org.springframework.expression.common.TemplateParserContext import org.springframework.expression.common.TemplateParserContext
import org.springframework.expression.spel.standard.SpelExpressionParser import org.springframework.expression.spel.standard.SpelExpressionParser
...@@ -19,7 +18,7 @@ import scala.jdk.CollectionConverters._ ...@@ -19,7 +18,7 @@ import scala.jdk.CollectionConverters._
class ModernCartDesignHandlerImpl extends ModernCartDesignHandler { class ModernCartDesignHandlerImpl extends ModernCartDesignHandler {
override def generateCss(design: ModernCartDesign, classSuffix: String, flat: Boolean): String = { 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.getBackgroundColor),
generateCss(design, flat, classSuffix, design.getPlayColor, s":${PseudoClasses.PLAY_CLASS.getPseudoClassName}"), generateCss(design, flat, classSuffix, design.getPlayColor, s":${PseudoClasses.PLAY_CLASS.getPseudoClassName}"),
generateCss(design, flat, classSuffix, design.getBackgroundColor, s":${PseudoClasses.WARN_CLASS.getPseudoClassName}") generateCss(design, flat, classSuffix, design.getBackgroundColor, s":${PseudoClasses.WARN_CLASS.getPseudoClassName}")
...@@ -33,7 +32,7 @@ class ModernCartDesignHandlerImpl extends ModernCartDesignHandler { ...@@ -33,7 +32,7 @@ class ModernCartDesignHandlerImpl extends ModernCartDesignHandler {
val resource = ApplicationUtils.getApplication.getClasspathResource("style/modern-pad.css") val resource = ApplicationUtils.getApplication.getClasspathResource("style/modern-pad.css")
val string = Minifier minify resource.getAsString val string = Minifier minify resource.getAsString
val values: Map[String, Any] = Map( val values: Map[String, AnyRef] = Map(
"prefix" -> padIdentifier, "prefix" -> padIdentifier,
"class" -> styleState, "class" -> styleState,
"buttonColor" -> color.getButtonColor, "buttonColor" -> color.getButtonColor,
......
...@@ -17,7 +17,6 @@ import de.tobias.playpad.{DisplayableColor, PlayPadMain} ...@@ -17,7 +17,6 @@ import de.tobias.playpad.{DisplayableColor, PlayPadMain}
import javafx.scene.paint.Color import javafx.scene.paint.Color
import javafx.stage.Stage import javafx.stage.Stage
import javafx.util.Duration import javafx.util.Duration
import org.apache.commons.lang3.StringUtils
import org.springframework.expression.ExpressionParser import org.springframework.expression.ExpressionParser
import org.springframework.expression.common.TemplateParserContext import org.springframework.expression.common.TemplateParserContext
import org.springframework.expression.spel.standard.SpelExpressionParser import org.springframework.expression.spel.standard.SpelExpressionParser
...@@ -64,7 +63,7 @@ class ModernGlobalDesignHandlerImpl extends ModernGlobalDesignHandler with Color ...@@ -64,7 +63,7 @@ class ModernGlobalDesignHandlerImpl extends ModernGlobalDesignHandler with Color
} }
private def generateCss(design: ModernGlobalDesign): String = { private def generateCss(design: ModernGlobalDesign): String = {
StringUtils.join( String.join(
generateCss(design, design.getBackgroundColor), generateCss(design, design.getBackgroundColor),
generateCss(design, design.getPlayColor, s":${PseudoClasses.PLAY_CLASS.getPseudoClassName}"), generateCss(design, design.getPlayColor, s":${PseudoClasses.PLAY_CLASS.getPseudoClassName}"),
generateCss(design, design.getBackgroundColor, s":${PseudoClasses.WARN_CLASS.getPseudoClassName}") generateCss(design, design.getBackgroundColor, s":${PseudoClasses.WARN_CLASS.getPseudoClassName}")
...@@ -78,7 +77,7 @@ class ModernGlobalDesignHandlerImpl extends ModernGlobalDesignHandler with Color ...@@ -78,7 +77,7 @@ class ModernGlobalDesignHandlerImpl extends ModernGlobalDesignHandler with Color
val resource = ApplicationUtils.getApplication.getClasspathResource("style/modern-global.css") val resource = ApplicationUtils.getApplication.getClasspathResource("style/modern-global.css")
val string = Minifier minify resource.getAsString val string = Minifier minify resource.getAsString
val values: Map[String, Any] = Map( val values: Map[String, AnyRef] = Map(
"class" -> styleState, "class" -> styleState,
"buttonColor" -> color.getButtonColor, "buttonColor" -> color.getButtonColor,
"playbarTrackColor" -> color.getPlaybarColor, "playbarTrackColor" -> color.getPlaybarColor,
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<jlibs.version>2.0.6</jlibs.version> <jlibs.version>2.0.6</jlibs.version>
<libPlugins.version>2.2.1</libPlugins.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> <jlayer.version>1.0.1</jlayer.version>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment