Skip to content

Commit

Permalink
..
Browse files Browse the repository at this point in the history
  • Loading branch information
@leewyatt
leewyatt committed Oct 27, 2021
1 parent 7344801 commit 1e326ac
Show file tree
Hide file tree
Showing 17 changed files with 29 additions and 118 deletions.
60 changes: 5 additions & 55 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,14 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>

<groupId>com.github.leewyatt</groupId>
<artifactId>rxcontrols</artifactId>
<version>11.0.0-alpha</version>
<version>8.0.0-alpha</version>
<packaging>jar</packaging>
<dependencies>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>11</version>
</dependency>
<!-- test files use fxml -->
<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-fxml -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>11</version>
<scope>test</scope>
</dependency>

<!-- test files use webview -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>11</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
Expand All @@ -48,34 +22,10 @@
<version>3.8.1</version>
<configuration>
<encoding>UTF-8</encoding>
<source>11</source>
<target>11</target>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>

<!-- <build>-->
<!-- <resources>-->
<!-- <resource>-->
<!-- <directory>src/main/resources</directory>-->
<!-- <includes>-->
<!-- <include>**/*</include>-->
<!-- </includes>-->
<!-- <filtering>false</filtering>-->
<!-- </resource>-->
<!-- </resources>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-compiler-plugin</artifactId>-->
<!-- <version>3.8.1</version>-->
<!-- <configuration>-->
<!-- <source>11</source>-->
<!-- <target>11</target>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->

</project>
6 changes: 3 additions & 3 deletions src/main/java/com/leewyatt/rxcontrols/controls/RXAudioSpectrum.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@

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;
Expand All @@ -35,9 +38,6 @@
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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/leewyatt/rxcontrols/controls/RXAvatar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@

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;
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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/leewyatt/rxcontrols/controls/RXButtonBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/leewyatt/rxcontrols/controls/RXCarousel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/leewyatt/rxcontrols/controls/RXDigit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
package com.leewyatt.rxcontrols.controls;

import com.leewyatt.rxcontrols.skins.RXDigitSkin;
import com.sun.javafx.css.converters.PaintConverter;
import javafx.beans.property.SimpleIntegerProperty;
import javafx.css.*;
import javafx.css.converter.PaintConverter;
import javafx.scene.control.Control;
import javafx.scene.control.Skin;
import javafx.scene.paint.Color;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/leewyatt/rxcontrols/controls/RXFillButton.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
import com.leewyatt.rxcontrols.animation.fillbutton.*;
import com.leewyatt.rxcontrols.skins.RXFillButtonSkin;
import com.leewyatt.rxcontrols.utils.RXResources;
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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/leewyatt/rxcontrols/controls/RXHighlightText.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/leewyatt/rxcontrols/controls/RXLineButton.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
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;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/leewyatt/rxcontrols/controls/RXLrcView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/leewyatt/rxcontrols/controls/RXPasswordField.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
import com.leewyatt.rxcontrols.enums.DisplayMode;
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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/leewyatt/rxcontrols/controls/RXTextField.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/leewyatt/rxcontrols/controls/RXTranslationButton.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@

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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/leewyatt/rxcontrols/skins/RXPaginationSkin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/leewyatt/rxcontrols/skins/RXPasswordFieldSkin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@

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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/leewyatt/rxcontrols/skins/RXTextFieldSkin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
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;
Expand Down
39 changes: 0 additions & 39 deletions src/main/java/module-info.java
View file

This file was deleted.

0 comments on commit 1e326ac

Please sign in to comment.