diff --git a/base/src/main/java/atlantafx/base/controls/RingProgressIndicatorSkin.java b/base/src/main/java/atlantafx/base/controls/RingProgressIndicatorSkin.java index 3c79c92..6ec62f2 100755 --- a/base/src/main/java/atlantafx/base/controls/RingProgressIndicatorSkin.java +++ b/base/src/main/java/atlantafx/base/controls/RingProgressIndicatorSkin.java @@ -240,10 +240,10 @@ public class RingProgressIndicatorSkin extends SkinBase { } @Override - @SuppressWarnings("RedundantCast") + @SuppressWarnings("unchecked") public StyleableProperty getStyleableProperty(RingProgressIndicator n) { final RingProgressIndicatorSkin skin = (RingProgressIndicatorSkin) n.getSkin(); - return (StyleableProperty) (WritableValue) skin.indeterminateAnimationTimeProperty(); + return (StyleableProperty) skin.indeterminateAnimationTimeProperty(); } }; diff --git a/sampler/src/main/java/atlantafx/sampler/page/components/HTMLEditorPage.java b/sampler/src/main/java/atlantafx/sampler/page/components/HTMLEditorPage.java index 70392eb..4a6f6f1 100644 --- a/sampler/src/main/java/atlantafx/sampler/page/components/HTMLEditorPage.java +++ b/sampler/src/main/java/atlantafx/sampler/page/components/HTMLEditorPage.java @@ -48,10 +48,12 @@ public class HTMLEditorPage extends AbstractPage { } private SampleBlock editorSample() { - var description = new Text( - "HTMLEditor toolbar buttons use images from 'com/sun/javafx/scene/control/skin/modena'. " - + "In opposite, since AtlantaFX themes are also distributed as single CSS files, it contains no images. " - + "Unfortunately reusing Modena resources isn't possible, because the package isn't opened in OpenJFX 'module-info'." + var description = new Text(""" + HTMLEditor toolbar buttons use images from 'com/sun/javafx/scene/control/skin/modena'. + In opposite, since AtlantaFX themes are also distributed as single CSS files, it contains no images. + Unfortunately reusing Modena resources isn't possible, because the package isn't opened in OpenJFX + 'module-info'. + """ ); var fixToggle = new ToggleSwitch("Apply Fix"); diff --git a/sampler/src/main/java/atlantafx/sampler/page/general/ColorScale.java b/sampler/src/main/java/atlantafx/sampler/page/general/ColorScale.java index 3639dc0..ce692e2 100644 --- a/sampler/src/main/java/atlantafx/sampler/page/general/ColorScale.java +++ b/sampler/src/main/java/atlantafx/sampler/page/general/ColorScale.java @@ -46,7 +46,8 @@ class ColorScale extends VBox { var noteText = new TextFlow( new Text( - "Avoid referencing scale variables directly when building UI that needs to adapt to different color themes. Instead, use the functional variables listed above." + "Avoid referencing scale variables directly when building UI that needs " + + "to adapt to different color themes. Instead, use the functional variables listed above." ) ); diff --git a/sampler/src/main/java/atlantafx/sampler/page/general/ContrastChecker.java b/sampler/src/main/java/atlantafx/sampler/page/general/ContrastChecker.java index 3f6e850..73c0ba5 100644 --- a/sampler/src/main/java/atlantafx/sampler/page/general/ContrastChecker.java +++ b/sampler/src/main/java/atlantafx/sampler/page/general/ContrastChecker.java @@ -521,22 +521,28 @@ class ContrastChecker extends GridPane { var c = JColor.color( new float[] {color.getHue(), color.getSaturation(), color.getLightness(), color.getAlpha()}); PlatformUtils.copyToClipboard(color.getAlpha() < 1 - ? String.format( + ? String.format( "rgba(%d,%d,%d, %.1f)", c.getGreen(), c.getGreen(), c.getBlue(), c.getAlphaArithmetic() ) - : String.format("rgb(%d,%d,%d)", c.getGreen(), c.getGreen(), c.getBlue()) + : String.format("rgb(%d,%d,%d)", c.getGreen(), c.getGreen(), c.getBlue()) ); }); var hslItem = new MenuItem("Copy as HSL"); hslItem.setOnAction(e -> { - var c = JColor.color( - new float[] {color.getHue(), color.getSaturation(), color.getLightness(), color.getAlpha()}); - PlatformUtils.copyToClipboard(color.getAlpha() < 1 - ? String.format( - "hsla(%.0f,%.2f,%.2f, %.1f)", c.getHue(), c.getSaturation(), c.getLightness(), c.getAlphaArithmetic() + var c = JColor.color(new float[] { + color.getHue(), color.getSaturation(), color.getLightness(), color.getAlpha() + }); + PlatformUtils.copyToClipboard( + color.getAlpha() < 1 + ? String.format( + "hsla(%.0f,%.2f,%.2f, %.1f)", + c.getHue(), c.getSaturation(), c.getLightness(), c.getAlphaArithmetic() + ) + : String.format( + "hsl(%.0f,%.2f,%.2f)", + c.getHue(), c.getSaturation(), c.getLightness() ) - : String.format("hsl(%.0f,%.2f,%.2f)", c.getHue(), c.getSaturation(), c.getLightness()) ); }); diff --git a/sampler/src/main/java/atlantafx/sampler/page/general/TypographyPage.java b/sampler/src/main/java/atlantafx/sampler/page/general/TypographyPage.java index 4ed6b7e..1925524 100755 --- a/sampler/src/main/java/atlantafx/sampler/page/general/TypographyPage.java +++ b/sampler/src/main/java/atlantafx/sampler/page/general/TypographyPage.java @@ -323,8 +323,9 @@ public class TypographyPage extends AbstractPage { new Hyperlink("consectetur"), new Text(" "), new Hyperlink("ipsum"), - new Text( - ", eget facilisis enim. Suspendisse potenti. Nulla euismod, nisl sed dapibus pretium, augue ligula finibus arcu, in iaculis nulla neque a est. Sed in rutrum diam. Donec quis arcu molestie, facilisis ex fringilla, "), + new Text(", eget facilisis enim. Suspendisse potenti. Nulla euismod, nisl sed dapibus pretium," + + " augue ligula finibus arcu, in iaculis nulla neque a est. Sed in rutrum diam." + + " Donec quis arcu molestie, facilisis ex fringilla, "), new Hyperlink("volutpat velit"), new Text(".") ); diff --git a/sampler/src/main/java/atlantafx/sampler/page/showcase/filemanager/FileManagerPage.java b/sampler/src/main/java/atlantafx/sampler/page/showcase/filemanager/FileManagerPage.java index aacadfc..5abd762 100644 --- a/sampler/src/main/java/atlantafx/sampler/page/showcase/filemanager/FileManagerPage.java +++ b/sampler/src/main/java/atlantafx/sampler/page/showcase/filemanager/FileManagerPage.java @@ -125,7 +125,9 @@ public class FileManagerPage extends ShowcasePage { ); var aboutBox = new HBox(new Text( - "Simple file manager. You can traverse through the file system and open files via default system application.")); + "Simple file manager. You can traverse through the file system and open files" + + " via default system application." + )); aboutBox.setPadding(new Insets(5, 0, 5, 0)); aboutBox.getStyleClass().add("about"); diff --git a/sampler/src/main/java/atlantafx/sampler/theme/HighlightJSTheme.java b/sampler/src/main/java/atlantafx/sampler/theme/HighlightJSTheme.java index 82daabc..6df4ea5 100644 --- a/sampler/src/main/java/atlantafx/sampler/theme/HighlightJSTheme.java +++ b/sampler/src/main/java/atlantafx/sampler/theme/HighlightJSTheme.java @@ -46,7 +46,7 @@ public class HighlightJSTheme { // there's no Nord light theme, // below is "stackoverflow-light" theme with changed background var css = - "*/.hljs{color:#2f3337;background:#f4f5f8}.hljs-subst{color:#2f3337}.hljs-comment{color:#656e77}.hljs-attr,.hljs-doctag,.hljs-keyword,.hljs-meta .hljs-keyword,.hljs-section,.hljs-selector-tag{color:#015692}.hljs-attribute{color:#803378}.hljs-name,.hljs-number,.hljs-quote,.hljs-selector-id,.hljs-template-tag,.hljs-type{color:#b75501}.hljs-selector-class{color:#015692}.hljs-link,.hljs-regexp,.hljs-selector-attr,.hljs-string,.hljs-symbol,.hljs-template-variable,.hljs-variable{color:#54790d}.hljs-meta,.hljs-selector-pseudo{color:#015692}.hljs-built_in,.hljs-literal,.hljs-title{color:#b75501}.hljs-bullet,.hljs-code{color:#535a60}.hljs-meta .hljs-string{color:#54790d}.hljs-deletion{color:#c02d2e}.hljs-addition{color:#2f6f44}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}"; + ".hljs{color:#2f3337;background:#f4f5f8}.hljs-subst{color:#2f3337}.hljs-comment{color:#656e77}.hljs-attr,.hljs-doctag,.hljs-keyword,.hljs-meta .hljs-keyword,.hljs-section,.hljs-selector-tag{color:#015692}.hljs-attribute{color:#803378}.hljs-name,.hljs-number,.hljs-quote,.hljs-selector-id,.hljs-template-tag,.hljs-type{color:#b75501}.hljs-selector-class{color:#015692}.hljs-link,.hljs-regexp,.hljs-selector-attr,.hljs-string,.hljs-symbol,.hljs-template-variable,.hljs-variable{color:#54790d}.hljs-meta,.hljs-selector-pseudo{color:#015692}.hljs-built_in,.hljs-literal,.hljs-title{color:#b75501}.hljs-bullet,.hljs-code{color:#535a60}.hljs-meta .hljs-string{color:#54790d}.hljs-deletion{color:#c02d2e}.hljs-addition{color:#2f6f44}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}"; var bg = "#fafafc"; var fg = "#2E3440"; return new HighlightJSTheme(css, bg, fg); @@ -54,7 +54,7 @@ public class HighlightJSTheme { public static HighlightJSTheme nordDark() { var css = - "pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}.hljs{background:#2e3440}.hljs,.hljs-subst{color:#d8dee9}.hljs-selector-tag{color:#81a1c1}.hljs-selector-id{color:#8fbcbb;font-weight:700}.hljs-selector-attr,.hljs-selector-class{color:#8fbcbb}.hljs-property,.hljs-selector-pseudo{color:#88c0d0}.hljs-addition{background-color:rgba(163,190,140,.5)}.hljs-deletion{background-color:rgba(191,97,106,.5)}.hljs-built_in,.hljs-class,.hljs-type{color:#8fbcbb}.hljs-function,.hljs-function>.hljs-title,.hljs-title.hljs-function{color:#88c0d0}.hljs-keyword,.hljs-literal,.hljs-symbol{color:#81a1c1}.hljs-number{color:#b48ead}.hljs-regexp{color:#ebcb8b}.hljs-string{color:#a3be8c}.hljs-title{color:#8fbcbb}.hljs-params{color:#d8dee9}.hljs-bullet{color:#81a1c1}.hljs-code{color:#8fbcbb}.hljs-emphasis{font-style:italic}.hljs-formula{color:#8fbcbb}.hljs-strong{font-weight:700}.hljs-link:hover{text-decoration:underline}.hljs-comment,.hljs-quote{color:#4c566a}.hljs-doctag{color:#8fbcbb}.hljs-meta,.hljs-meta .hljs-keyword{color:#5e81ac}.hljs-meta .hljs-string{color:#a3be8c}.hljs-attr{color:#8fbcbb}.hljs-attribute{color:#d8dee9}.hljs-name{color:#81a1c1}.hljs-section{color:#88c0d0}.hljs-tag{color:#81a1c1}.hljs-template-variable,.hljs-variable{color:#d8dee9}.hljs-template-tag{color:#5e81ac}.language-abnf .hljs-attribute{color:#88c0d0}.language-abnf .hljs-symbol{color:#ebcb8b}.language-apache .hljs-attribute{color:#88c0d0}.language-apache .hljs-section{color:#81a1c1}.language-arduino .hljs-built_in{color:#88c0d0}.language-aspectj .hljs-meta{color:#d08770}.language-aspectj>.hljs-title{color:#88c0d0}.language-bnf .hljs-attribute{color:#8fbcbb}.language-clojure .hljs-name{color:#88c0d0}.language-clojure .hljs-symbol{color:#ebcb8b}.language-coq .hljs-built_in{color:#88c0d0}.language-cpp .hljs-meta .hljs-string{color:#8fbcbb}.language-css .hljs-built_in{color:#88c0d0}.language-css .hljs-keyword{color:#d08770}.language-diff .hljs-meta,.language-ebnf .hljs-attribute{color:#8fbcbb}.language-glsl .hljs-built_in{color:#88c0d0}.language-groovy .hljs-meta:not(:first-child),.language-haxe .hljs-meta,.language-java .hljs-meta{color:#d08770}.language-ldif .hljs-attribute{color:#8fbcbb}.language-lisp .hljs-name,.language-lua .hljs-built_in,.language-moonscript .hljs-built_in,.language-nginx .hljs-attribute{color:#88c0d0}.language-nginx .hljs-section{color:#5e81ac}.language-pf .hljs-built_in,.language-processing .hljs-built_in{color:#88c0d0}.language-scss .hljs-keyword,.language-stylus .hljs-keyword{color:#81a1c1}.language-swift .hljs-meta{color:#d08770}.language-vim .hljs-built_in{color:#88c0d0;font-style:italic}.language-yaml .hljs-meta{color:#d08770}"; + ".hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}.hljs{background:#2e3440}.hljs,.hljs-subst{color:#d8dee9}.hljs-selector-tag{color:#81a1c1}.hljs-selector-id{color:#8fbcbb;font-weight:700}.hljs-selector-attr,.hljs-selector-class{color:#8fbcbb}.hljs-property,.hljs-selector-pseudo{color:#88c0d0}.hljs-addition{background-color:rgba(163,190,140,.5)}.hljs-deletion{background-color:rgba(191,97,106,.5)}.hljs-built_in,.hljs-class,.hljs-type{color:#8fbcbb}.hljs-function,.hljs-function>.hljs-title,.hljs-title.hljs-function{color:#88c0d0}.hljs-keyword,.hljs-literal,.hljs-symbol{color:#81a1c1}.hljs-number{color:#b48ead}.hljs-regexp{color:#ebcb8b}.hljs-string{color:#a3be8c}.hljs-title{color:#8fbcbb}.hljs-params{color:#d8dee9}.hljs-bullet{color:#81a1c1}.hljs-code{color:#8fbcbb}.hljs-emphasis{font-style:italic}.hljs-formula{color:#8fbcbb}.hljs-strong{font-weight:700}.hljs-link:hover{text-decoration:underline}.hljs-comment,.hljs-quote{color:#4c566a}.hljs-doctag{color:#8fbcbb}.hljs-meta,.hljs-meta .hljs-keyword{color:#5e81ac}.hljs-meta .hljs-string{color:#a3be8c}.hljs-attr{color:#8fbcbb}.hljs-attribute{color:#d8dee9}.hljs-name{color:#81a1c1}.hljs-section{color:#88c0d0}.hljs-tag{color:#81a1c1}.hljs-template-variable,.hljs-variable{color:#d8dee9}.hljs-template-tag{color:#5e81ac}.language-abnf .hljs-attribute{color:#88c0d0}.language-abnf .hljs-symbol{color:#ebcb8b}.language-apache .hljs-attribute{color:#88c0d0}.language-apache .hljs-section{color:#81a1c1}.language-arduino .hljs-built_in{color:#88c0d0}.language-aspectj .hljs-meta{color:#d08770}.language-aspectj>.hljs-title{color:#88c0d0}.language-bnf .hljs-attribute{color:#8fbcbb}.language-clojure .hljs-name{color:#88c0d0}.language-clojure .hljs-symbol{color:#ebcb8b}.language-coq .hljs-built_in{color:#88c0d0}.language-cpp .hljs-meta .hljs-string{color:#8fbcbb}.language-css .hljs-built_in{color:#88c0d0}.language-css .hljs-keyword{color:#d08770}.language-diff .hljs-meta,.language-ebnf .hljs-attribute{color:#8fbcbb}.language-glsl .hljs-built_in{color:#88c0d0}.language-groovy .hljs-meta:not(:first-child),.language-haxe .hljs-meta,.language-java .hljs-meta{color:#d08770}.language-ldif .hljs-attribute{color:#8fbcbb}.language-lisp .hljs-name,.language-lua .hljs-built_in,.language-moonscript .hljs-built_in,.language-nginx .hljs-attribute{color:#88c0d0}.language-nginx .hljs-section{color:#5e81ac}.language-pf .hljs-built_in,.language-processing .hljs-built_in{color:#88c0d0}.language-scss .hljs-keyword,.language-stylus .hljs-keyword{color:#81a1c1}.language-swift .hljs-meta{color:#d08770}.language-vim .hljs-built_in{color:#88c0d0;font-style:italic}.language-yaml .hljs-meta{color:#d08770}"; var bg = "#2E3440"; var fg = "#ECEFF4"; return new HighlightJSTheme(css, bg, fg); diff --git a/sampler/src/main/java/atlantafx/sampler/util/JColorUtils.java b/sampler/src/main/java/atlantafx/sampler/util/JColorUtils.java index 1d22ef0..84a9752 100644 --- a/sampler/src/main/java/atlantafx/sampler/util/JColorUtils.java +++ b/sampler/src/main/java/atlantafx/sampler/util/JColorUtils.java @@ -627,8 +627,9 @@ public class JColorUtils { public static void validateHex(String color) { if (!isValidHex(color)) { throw new IllegalArgumentException( - "Hex color must be in format #RRGGBB, #RGB, #AARRGGBB, #ARGB, RRGGBB, RGB, AARRGGBB, or ARGB, invalid value: " - + color); + "Hex color must be in format #RRGGBB, #RGB, #AARRGGBB, #ARGB, RRGGBB, RGB, AARRGGBB," + + " or ARGB, invalid value: " + color + ); } }