diff --git a/README.md b/README.md index 627f88f..a920754 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Maven dependency com.github.leewyatt rxcontrols - 11.0.0-alpha + 8.0.0-alpha ``` diff --git a/pom.xml b/pom.xml index e5ebff6..f5142b7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,36 +6,13 @@ UTF-8 - 11 - 11 + 8 + 8 com.github.leewyatt rxcontrols - 11.0.0-alpha + 8.0.0-alpha jar - - - org.openjfx - javafx-controls - 11 - - - - - org.openjfx - javafx-fxml - 11 - test - - - - - org.openjfx - javafx-web - 11 - test - - @@ -45,34 +22,11 @@ 3.8.1 UTF-8 - 11 - 11 + 8 + 8 - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXAudioSpectrum.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXAudioSpectrum.java index 1b0253d..0750e23 100644 --- a/src/main/java/com/leewyatt/rxcontrols/controls/RXAudioSpectrum.java +++ b/src/main/java/com/leewyatt/rxcontrols/controls/RXAudioSpectrum.java @@ -26,6 +26,9 @@ package com.leewyatt.rxcontrols.controls; import com.leewyatt.rxcontrols.skins.RXAudioSpectrumSkin; import com.leewyatt.rxcontrols.utils.RXResources; +import com.sun.javafx.css.converters.EffectConverter; +import com.sun.javafx.css.converters.EnumConverter; +import com.sun.javafx.css.converters.ShapeConverter; import javafx.beans.property.IntegerProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleIntegerProperty; @@ -35,9 +38,6 @@ import javafx.css.CssMetaData; import javafx.css.Styleable; import javafx.css.StyleableObjectProperty; import javafx.css.StyleableProperty; -import javafx.css.converter.EffectConverter; -import javafx.css.converter.EnumConverter; -import javafx.css.converter.ShapeConverter; import javafx.scene.control.Control; import javafx.scene.control.Skin; import javafx.scene.effect.Effect; diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXAvatar.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXAvatar.java index b9e466e..d104a13 100644 --- a/src/main/java/com/leewyatt/rxcontrols/controls/RXAvatar.java +++ b/src/main/java/com/leewyatt/rxcontrols/controls/RXAvatar.java @@ -24,8 +24,9 @@ */ package com.leewyatt.rxcontrols.controls; -import com.leewyatt.rxcontrols.utils.RXResources; import com.leewyatt.rxcontrols.skins.RXAvatarSkin; +import com.leewyatt.rxcontrols.utils.RXResources; +import com.sun.javafx.css.converters.EnumConverter; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.property.SimpleObjectProperty; @@ -33,7 +34,6 @@ import javafx.css.CssMetaData; import javafx.css.Styleable; import javafx.css.StyleableObjectProperty; import javafx.css.StyleableProperty; -import javafx.css.converter.EnumConverter; import javafx.scene.control.Control; import javafx.scene.control.Skin; import javafx.scene.image.Image; diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXButtonBase.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXButtonBase.java index f8bd8a8..32b6b48 100644 --- a/src/main/java/com/leewyatt/rxcontrols/controls/RXButtonBase.java +++ b/src/main/java/com/leewyatt/rxcontrols/controls/RXButtonBase.java @@ -24,10 +24,10 @@ */ package com.leewyatt.rxcontrols.controls; +import com.sun.javafx.css.converters.DurationConverter; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectPropertyBase; import javafx.css.*; -import javafx.css.converter.DurationConverter; import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.scene.Node; diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXCarousel.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXCarousel.java index 03b563a..9394219 100644 --- a/src/main/java/com/leewyatt/rxcontrols/controls/RXCarousel.java +++ b/src/main/java/com/leewyatt/rxcontrols/controls/RXCarousel.java @@ -29,13 +29,13 @@ import com.leewyatt.rxcontrols.animation.carousel.CarouselAnimation; import com.leewyatt.rxcontrols.enums.DisplayMode; import com.leewyatt.rxcontrols.pane.RXCarouselPane; import com.leewyatt.rxcontrols.utils.RXResources; +import com.sun.javafx.css.converters.BooleanConverter; +import com.sun.javafx.css.converters.DurationConverter; +import com.sun.javafx.css.converters.EnumConverter; import javafx.beans.property.*; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.css.*; -import javafx.css.converter.BooleanConverter; -import javafx.css.converter.DurationConverter; -import javafx.css.converter.EnumConverter; import javafx.scene.SubScene; import javafx.scene.control.Control; import javafx.scene.control.Skin; diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXDigit.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXDigit.java index f80a759..fd444b7 100644 --- a/src/main/java/com/leewyatt/rxcontrols/controls/RXDigit.java +++ b/src/main/java/com/leewyatt/rxcontrols/controls/RXDigit.java @@ -25,14 +25,14 @@ package com.leewyatt.rxcontrols.controls; import com.leewyatt.rxcontrols.skins.RXDigitSkin; -// import com.sun.javafx.css.converters.PaintConverter; +import com.sun.javafx.css.converters.PaintConverter; import javafx.beans.property.SimpleIntegerProperty; import javafx.css.*; import javafx.scene.control.Control; import javafx.scene.control.Skin; import javafx.scene.paint.Color; import javafx.scene.paint.Paint; -import javafx.css.converter.PaintConverter; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXFillButton.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXFillButton.java index 160cdc2..710841a 100644 --- a/src/main/java/com/leewyatt/rxcontrols/controls/RXFillButton.java +++ b/src/main/java/com/leewyatt/rxcontrols/controls/RXFillButton.java @@ -24,15 +24,15 @@ */ package com.leewyatt.rxcontrols.controls; +import com.leewyatt.rxcontrols.animation.fillbutton.*; import com.leewyatt.rxcontrols.skins.RXFillButtonSkin; import com.leewyatt.rxcontrols.utils.RXResources; -import com.leewyatt.rxcontrols.animation.fillbutton.*; +import com.sun.javafx.css.converters.EnumConverter; +import com.sun.javafx.css.converters.PaintConverter; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ChangeListener; import javafx.css.*; -import javafx.css.converter.EnumConverter; -import javafx.css.converter.PaintConverter; import javafx.geometry.Pos; import javafx.scene.Node; import javafx.scene.control.Skin; diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXHighlightText.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXHighlightText.java index 022903f..5fdac54 100644 --- a/src/main/java/com/leewyatt/rxcontrols/controls/RXHighlightText.java +++ b/src/main/java/com/leewyatt/rxcontrols/controls/RXHighlightText.java @@ -25,10 +25,10 @@ package com.leewyatt.rxcontrols.controls; import com.leewyatt.rxcontrols.utils.RXResources; +import com.sun.javafx.css.converters.EnumConverter; +import com.sun.javafx.css.converters.SizeConverter; import javafx.beans.property.*; import javafx.css.*; -import javafx.css.converter.EnumConverter; -import javafx.css.converter.SizeConverter; import javafx.scene.control.Control; import javafx.scene.control.Skin; import javafx.scene.text.TextAlignment; diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXLineButton.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXLineButton.java index 8fb31d8..88ff33a 100644 --- a/src/main/java/com/leewyatt/rxcontrols/controls/RXLineButton.java +++ b/src/main/java/com/leewyatt/rxcontrols/controls/RXLineButton.java @@ -29,12 +29,12 @@ import com.leewyatt.rxcontrols.animation.lineButton.LineAnimRise; import com.leewyatt.rxcontrols.animation.lineButton.LineAnimation; import com.leewyatt.rxcontrols.skins.RXLineButtonSkin; import com.leewyatt.rxcontrols.utils.RXResources; +import com.sun.javafx.css.converters.EnumConverter; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ChangeListener; import javafx.css.*; -import javafx.css.converter.EnumConverter; import javafx.geometry.Pos; import javafx.scene.Node; import javafx.scene.control.Skin; diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXLrcView.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXLrcView.java index 9c1dbb3..6846992 100644 --- a/src/main/java/com/leewyatt/rxcontrols/controls/RXLrcView.java +++ b/src/main/java/com/leewyatt/rxcontrols/controls/RXLrcView.java @@ -27,15 +27,15 @@ package com.leewyatt.rxcontrols.controls; import com.leewyatt.rxcontrols.pojo.LrcDoc; import com.leewyatt.rxcontrols.skins.RXLrcViewSkin; import com.leewyatt.rxcontrols.utils.RXResources; +import com.sun.javafx.css.converters.DurationConverter; +import com.sun.javafx.css.converters.SizeConverter; +import com.sun.javafx.css.converters.StringConverter; import javafx.beans.property.DoubleProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.StringProperty; import javafx.beans.value.WritableValue; import javafx.css.*; -import javafx.css.converter.DurationConverter; -import javafx.css.converter.SizeConverter; -import javafx.css.converter.StringConverter; import javafx.scene.control.Control; import javafx.scene.control.Skin; import javafx.util.Duration; diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXPasswordField.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXPasswordField.java index d318658..69eccfc 100644 --- a/src/main/java/com/leewyatt/rxcontrols/controls/RXPasswordField.java +++ b/src/main/java/com/leewyatt/rxcontrols/controls/RXPasswordField.java @@ -25,13 +25,13 @@ package com.leewyatt.rxcontrols.controls; import com.leewyatt.rxcontrols.enums.DisplayMode; -import com.leewyatt.rxcontrols.utils.RXResources; import com.leewyatt.rxcontrols.skins.RXPasswordFieldSkin; +import com.leewyatt.rxcontrols.utils.RXResources; +import com.sun.javafx.css.converters.EnumConverter; +import com.sun.javafx.css.converters.StringConverter; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.css.*; -import javafx.css.converter.EnumConverter; -import javafx.css.converter.StringConverter; import javafx.scene.AccessibleAttribute; import javafx.scene.AccessibleRole; import javafx.scene.control.PasswordField; diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXTextField.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXTextField.java index 4fd9e65..6dedf98 100644 --- a/src/main/java/com/leewyatt/rxcontrols/controls/RXTextField.java +++ b/src/main/java/com/leewyatt/rxcontrols/controls/RXTextField.java @@ -28,13 +28,13 @@ import com.leewyatt.rxcontrols.enums.DisplayMode; import com.leewyatt.rxcontrols.event.RXActionEvent; import com.leewyatt.rxcontrols.skins.RXTextFieldSkin; import com.leewyatt.rxcontrols.utils.RXResources; +import com.sun.javafx.css.converters.EnumConverter; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectPropertyBase; import javafx.css.CssMetaData; import javafx.css.Styleable; import javafx.css.StyleableObjectProperty; import javafx.css.StyleableProperty; -import javafx.css.converter.EnumConverter; import javafx.event.EventHandler; import javafx.scene.control.Skin; import javafx.scene.control.TextField; diff --git a/src/main/java/com/leewyatt/rxcontrols/controls/RXTranslationButton.java b/src/main/java/com/leewyatt/rxcontrols/controls/RXTranslationButton.java index 148d82f..88db97f 100644 --- a/src/main/java/com/leewyatt/rxcontrols/controls/RXTranslationButton.java +++ b/src/main/java/com/leewyatt/rxcontrols/controls/RXTranslationButton.java @@ -24,13 +24,13 @@ */ package com.leewyatt.rxcontrols.controls; -import com.leewyatt.rxcontrols.utils.RXResources; import com.leewyatt.rxcontrols.skins.RXTranslationButtonSkin; +import com.leewyatt.rxcontrols.utils.RXResources; +import com.sun.javafx.css.converters.EnumConverter; import javafx.css.CssMetaData; import javafx.css.Styleable; import javafx.css.StyleableObjectProperty; import javafx.css.StyleableProperty; -import javafx.css.converter.EnumConverter; import javafx.scene.control.Label; import javafx.scene.control.Skin; diff --git a/src/main/java/com/leewyatt/rxcontrols/skins/RXPaginationSkin.java b/src/main/java/com/leewyatt/rxcontrols/skins/RXPaginationSkin.java index e41206e..ec17a18 100644 --- a/src/main/java/com/leewyatt/rxcontrols/skins/RXPaginationSkin.java +++ b/src/main/java/com/leewyatt/rxcontrols/skins/RXPaginationSkin.java @@ -25,12 +25,12 @@ package com.leewyatt.rxcontrols.skins; import com.leewyatt.rxcontrols.controls.RXPagination; +import com.sun.javafx.scene.control.skin.PaginationSkin; import javafx.collections.ListChangeListener; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.Pagination; import javafx.scene.control.TextField; -import javafx.scene.control.skin.PaginationSkin; import javafx.scene.layout.HBox; /** diff --git a/src/main/java/com/leewyatt/rxcontrols/skins/RXPasswordFieldSkin.java b/src/main/java/com/leewyatt/rxcontrols/skins/RXPasswordFieldSkin.java index 3e44a4d..78cedba 100644 --- a/src/main/java/com/leewyatt/rxcontrols/skins/RXPasswordFieldSkin.java +++ b/src/main/java/com/leewyatt/rxcontrols/skins/RXPasswordFieldSkin.java @@ -26,13 +26,13 @@ package com.leewyatt.rxcontrols.skins; import com.leewyatt.rxcontrols.controls.RXPasswordField; import com.leewyatt.rxcontrols.enums.DisplayMode; +import com.sun.javafx.scene.control.skin.TextFieldSkin; import javafx.beans.InvalidationListener; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ChangeListener; import javafx.css.SimpleStyleableStringProperty; import javafx.scene.Cursor; import javafx.scene.control.TextField; -import javafx.scene.control.skin.TextFieldSkin; import javafx.scene.input.MouseButton; import javafx.scene.layout.Pane; import javafx.scene.layout.Region; diff --git a/src/main/java/com/leewyatt/rxcontrols/skins/RXTextFieldSkin.java b/src/main/java/com/leewyatt/rxcontrols/skins/RXTextFieldSkin.java index 25e40e9..6fe92d8 100644 --- a/src/main/java/com/leewyatt/rxcontrols/skins/RXTextFieldSkin.java +++ b/src/main/java/com/leewyatt/rxcontrols/skins/RXTextFieldSkin.java @@ -27,9 +27,9 @@ package com.leewyatt.rxcontrols.skins; import com.leewyatt.rxcontrols.controls.RXTextField; import com.leewyatt.rxcontrols.enums.DisplayMode; import com.leewyatt.rxcontrols.event.RXActionEvent; +import com.sun.javafx.scene.control.skin.TextFieldSkin; import javafx.beans.value.ChangeListener; import javafx.scene.Cursor; -import javafx.scene.control.skin.TextFieldSkin; import javafx.scene.layout.Pane; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java deleted file mode 100644 index 78a43cb..0000000 --- a/src/main/java/module-info.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2021 LeeWyatt - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ -module rxcontrols { - requires javafx.controls; - requires java.xml; - - exports com.leewyatt.rxcontrols.animation.carousel; - exports com.leewyatt.rxcontrols.animation.fillbutton; - exports com.leewyatt.rxcontrols.animation.lineButton; - exports com.leewyatt.rxcontrols.controls; - exports com.leewyatt.rxcontrols.enums; - exports com.leewyatt.rxcontrols.event; - exports com.leewyatt.rxcontrols.pane; - exports com.leewyatt.rxcontrols.pojo; - exports com.leewyatt.rxcontrols.skins; - exports com.leewyatt.rxcontrols.utils; -} \ No newline at end of file diff --git a/src/test/resources/fxml/main.fxml b/src/test/resources/fxml/main.fxml index f5c0d84..7175d6b 100644 --- a/src/test/resources/fxml/main.fxml +++ b/src/test/resources/fxml/main.fxml @@ -18,7 +18,7 @@ - + diff --git a/src/test/resources/fxml/pane_about.fxml b/src/test/resources/fxml/pane_about.fxml index fbfb307..48ea99e 100644 --- a/src/test/resources/fxml/pane_about.fxml +++ b/src/test/resources/fxml/pane_about.fxml @@ -13,7 +13,7 @@ - + diff --git a/src/test/resources/fxml/pane_media.fxml b/src/test/resources/fxml/pane_media.fxml index febca3c..133fa29 100644 --- a/src/test/resources/fxml/pane_media.fxml +++ b/src/test/resources/fxml/pane_media.fxml @@ -14,7 +14,7 @@ - + diff --git a/src/test/resources/fxml/pane_svgview.fxml b/src/test/resources/fxml/pane_svgview.fxml index 5888d60..7485661 100644 --- a/src/test/resources/fxml/pane_svgview.fxml +++ b/src/test/resources/fxml/pane_svgview.fxml @@ -4,7 +4,7 @@ - +