💥 Huge Update [Part 2]
Disclaimer: I recently switched to Linux for production because I was tired of Bugdows but because they use different line endings IntelliJ is showing me that all files are changed, also the ones with identical content. I re-normalized the project and added a .gitattributes file. I'm not sure how GitHub will visualize this commit, if it's messed sorry in advance... but don't worry, as always all changes are listed here 😉 ⬆️ Upgraded VirtualizedFX to version 11.2.1 Demo 🚧 Temporarily "disabled" or non-functional some showcases ✅ Added new tests MaterialFX Beans Package ✨ Added convenience properties for Java's functions ✨ Added convenience property to represent a NumberRange ✨ Added many new beans ♻️ NumberRange: implemented hashCode, equals and toString, added two new methods to convert a range on integers to a List or a Set 🚚 Renamed RipplePosition ti PositionBean and moved to this package Collections Package ✨ TransformableList is a new kind of ObservableList that combines JavaFX's FilteredList and SortedList functionalities into one ✨ TransformableListWrapper is an ObservableList which wraps both the source list and the transformable list in the same class. This makes using TransformableLists less verbose as modifications to the source list can be made directly from this wrapper Controls Package 🔥 Removed AbstractMFXNotificationPane 🔥 Removed MFXNotification 🔥 Removed SimpleMFXNotificationPane ✨ Added a new cell to contain notifications ✨ FilterPane, a new control that allows to build Predicate filters interactively ✨ MFXNotificationCenter, a new control that allows to display multiple notifications. It is basically an icon that opens a popup which contains not only the list of notifications but also controls to manage them ✨ MFXPopup, extension of PopupControl to easily set the popup's content and position it by using HPos and VPos enumerations. It also introduces a hover functionality ✨ MFXSimpleNotification, a simple implementation of INotification Effects Package ✨ ConsumerTransition, an implementation of Transition that uses a consumer to perform some action when the interpolate method is called ✨ Interpolators, a new enumerator that offers some new interpolators for JavaFX's animations Enums Package ♻️ Moved all MaterialFX enumerators to this top level package ✨ ChainMode, a new enumerator mainly used by PredicateUtils to chain two predicates ✨ NotificationCounterStyle, a new enumerator to specify MFXNotificationCenter's counter style ✨ NotificationPos, a new enumerator to specify at which position a notification system should place the notification ✨ NotificationState, a new enumerator to represent the read state of a notification Factories Package ♻️ Moved all MaterialFX factories to this top level package ✨ InsetsFactory, a new factory tp build JavaFX's Insets objects Filter Package 💥 The filter API has been completely remade and now it's super flexible, super useful, super amazin haha. I won't describe it here as there are a LOT of new classes and concepts to be described so I recommend you to read AbstractFilter, FilterBean and BiPredicateBean documentations, usage examples can be also found in the demo (not yet at time of writing) and in the documentation of MFXFilterPane 🚧 MFXFilterDialog has been completely commented, will be reworked for the new API Font Package ✨ Added new resources Notifications Package 💥 The notification API has been completely remade. Now there are to notification systems, one is very similar to the old one but it is limited to one notification at a time at a given position. This restriction helper to keep the system simple and efficient. To show multiple notifications at one time I recommend the usage of MFXNotificationCenterSystem which uses a MFXNotificationCenter to show the notifications. Or, you could implement you own notification system since the notification API now offers some base classes to build on top. AbstractMFXNotificationSystem and INotificationSystem specify the base features all notification systems should have, INotification specifies the base features all notifications should have Skin Package No notable change aside from new skins for the new controls and minor changes due to classes renamed/moved Utils Package ✨ FunctionalStringConverter, a functional alternative to JavaFX's StringConverter ✨ ReusableScheduledExecutor, a wrapper class to make a ScheduledExecutorService reusable. To stop/restart a ScheduledExecutorService it's needed to keep a reference to the ScheduledFuture task but this often result in boilerplate code, this wrapper fixes this ✨ EnumStringConverter, an implementation of JavaFX's StringConverter to work with enumerators ✨ Added a new method to ExecutionUtils ✨ FXCollectors, a class that contains some new collectors for JavaFX's observable collections ✨ PredicateUtils, utils for Predicates ✨ StringUtils, added a new method to convert an elapsed time in seconds to a String ♻️ AnimationUtils, added some new methods to PauseTransitionBuilder and KeyFrames classes 🐛 ExceptionUtils, fixed getStackTraceString method as StringWriters are not reusable Resources ✨ Added new CSS files for new controls ♻️ MFXColors.css, added a new color Signed-off-by: Alessadro Parisi <alessandro.parisi406@gmail.com> Signed-off-by: palexdev <alessandro.parisi406@gmail.com>
This commit is contained in:
parent
9dc00340a2
commit
160bc46473
34
.gitattributes
vendored
Normal file
34
.gitattributes
vendored
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
# Java sources
|
||||||
|
*.java text diff=java
|
||||||
|
*.kt text diff=java
|
||||||
|
*.groovy text diff=java
|
||||||
|
*.scala text diff=java
|
||||||
|
*.gradle text diff=java
|
||||||
|
*.gradle.kts text diff=java
|
||||||
|
|
||||||
|
# These files are text and should be normalized (Convert crlf => lf)
|
||||||
|
*.css text diff=css
|
||||||
|
*.scss text diff=css
|
||||||
|
*.sass text
|
||||||
|
*.df text
|
||||||
|
*.htm text diff=html
|
||||||
|
*.html text diff=html
|
||||||
|
*.js text
|
||||||
|
*.jsp text
|
||||||
|
*.jspf text
|
||||||
|
*.jspx text
|
||||||
|
*.properties text
|
||||||
|
*.tld text
|
||||||
|
*.tag text
|
||||||
|
*.tagx text
|
||||||
|
*.xml text
|
||||||
|
|
||||||
|
# These files are binary and should be left untouched
|
||||||
|
# (binary is a macro for -text -diff)
|
||||||
|
*.class binary
|
||||||
|
*.dll binary
|
||||||
|
*.ear binary
|
||||||
|
*.jar binary
|
||||||
|
*.so binary
|
||||||
|
*.war binary
|
||||||
|
*.jks binary
|
0
.github/workflows/gradle.yml
vendored
Normal file → Executable file
0
.github/workflows/gradle.yml
vendored
Normal file → Executable file
0
.gitignore
vendored
Normal file → Executable file
0
.gitignore
vendored
Normal file → Executable file
0
.run/MaterialFX [build].run.xml
Normal file → Executable file
0
.run/MaterialFX [build].run.xml
Normal file → Executable file
0
.run/MaterialFX [clean].run.xml
Normal file → Executable file
0
.run/MaterialFX [clean].run.xml
Normal file → Executable file
0
.run/MaterialFX [jlinkZip].run.xml
Normal file → Executable file
0
.run/MaterialFX [jlinkZip].run.xml
Normal file → Executable file
0
.run/MaterialFX [materialfx_uploadArchives].run.xml
Normal file → Executable file
0
.run/MaterialFX [materialfx_uploadArchives].run.xml
Normal file → Executable file
0
.run/MaterialFX [run].run.xml
Normal file → Executable file
0
.run/MaterialFX [run].run.xml
Normal file → Executable file
0
.run/MaterialFX [testrun].run.xml
Normal file → Executable file
0
.run/MaterialFX [testrun].run.xml
Normal file → Executable file
0
ROADMAP.md
Normal file → Executable file
0
ROADMAP.md
Normal file → Executable file
0
build.gradle
Normal file → Executable file
0
build.gradle
Normal file → Executable file
2
demo/build.gradle
Normal file → Executable file
2
demo/build.gradle
Normal file → Executable file
@ -24,7 +24,7 @@ dependencies {
|
|||||||
implementation 'org.kordamp.ikonli:ikonli-core:12.2.0'
|
implementation 'org.kordamp.ikonli:ikonli-core:12.2.0'
|
||||||
implementation 'org.kordamp.ikonli:ikonli-javafx:12.2.0'
|
implementation 'org.kordamp.ikonli:ikonli-javafx:12.2.0'
|
||||||
implementation 'org.kordamp.ikonli:ikonli-fontawesome5-pack:12.2.0'
|
implementation 'org.kordamp.ikonli:ikonli-fontawesome5-pack:12.2.0'
|
||||||
implementation 'io.github.palexdev:virtualizedfx:11.1.3'
|
implementation 'io.github.palexdev:virtualizedfx:11.2.1'
|
||||||
implementation project(':materialfx')
|
implementation project(':materialfx')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
0
demo/libs/scenicview.jar
Normal file → Executable file
0
demo/libs/scenicview.jar
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/Demo.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/Demo.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/MFXDemoResourcesLoader.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/MFXDemoResourcesLoader.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/TestDemo.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/TestDemo.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/ComboBoxesDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/ComboBoxesDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/DatePickersDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/DatePickersDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/DemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/DemoController.java
Normal file → Executable file
30
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/DialogsController.java
Normal file → Executable file
30
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/DialogsController.java
Normal file → Executable file
@ -19,17 +19,13 @@
|
|||||||
package io.github.palexdev.materialfx.demo.controllers;
|
package io.github.palexdev.materialfx.demo.controllers;
|
||||||
|
|
||||||
import io.github.palexdev.materialfx.controls.MFXButton;
|
import io.github.palexdev.materialfx.controls.MFXButton;
|
||||||
import io.github.palexdev.materialfx.controls.MFXNotification;
|
|
||||||
import io.github.palexdev.materialfx.controls.MFXStageDialog;
|
import io.github.palexdev.materialfx.controls.MFXStageDialog;
|
||||||
import io.github.palexdev.materialfx.controls.SimpleMFXNotificationPane;
|
|
||||||
import io.github.palexdev.materialfx.controls.base.AbstractMFXDialog;
|
import io.github.palexdev.materialfx.controls.base.AbstractMFXDialog;
|
||||||
import io.github.palexdev.materialfx.controls.enums.ButtonType;
|
|
||||||
import io.github.palexdev.materialfx.controls.enums.DialogType;
|
|
||||||
import io.github.palexdev.materialfx.controls.factories.MFXAnimationFactory;
|
|
||||||
import io.github.palexdev.materialfx.controls.factories.MFXDialogFactory;
|
|
||||||
import io.github.palexdev.materialfx.effects.DepthLevel;
|
import io.github.palexdev.materialfx.effects.DepthLevel;
|
||||||
import io.github.palexdev.materialfx.notifications.NotificationPos;
|
import io.github.palexdev.materialfx.enums.ButtonType;
|
||||||
import io.github.palexdev.materialfx.notifications.NotificationsManager;
|
import io.github.palexdev.materialfx.enums.DialogType;
|
||||||
|
import io.github.palexdev.materialfx.factories.MFXAnimationFactory;
|
||||||
|
import io.github.palexdev.materialfx.factories.MFXDialogFactory;
|
||||||
import javafx.application.Platform;
|
import javafx.application.Platform;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.fxml.Initializable;
|
import javafx.fxml.Initializable;
|
||||||
@ -37,9 +33,7 @@ import javafx.geometry.Insets;
|
|||||||
import javafx.geometry.Pos;
|
import javafx.geometry.Pos;
|
||||||
import javafx.scene.layout.HBox;
|
import javafx.scene.layout.HBox;
|
||||||
import javafx.scene.layout.Pane;
|
import javafx.scene.layout.Pane;
|
||||||
import javafx.scene.layout.Region;
|
|
||||||
import javafx.stage.Modality;
|
import javafx.stage.Modality;
|
||||||
import javafx.util.Duration;
|
|
||||||
|
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.util.ResourceBundle;
|
import java.util.ResourceBundle;
|
||||||
@ -270,9 +264,10 @@ public class DialogsController implements Initializable {
|
|||||||
action3.setDepthLevel(DepthLevel.LEVEL1);
|
action3.setDepthLevel(DepthLevel.LEVEL1);
|
||||||
close.setDepthLevel(DepthLevel.LEVEL1);
|
close.setDepthLevel(DepthLevel.LEVEL1);
|
||||||
|
|
||||||
action1.setOnAction(event -> NotificationsManager.send(NotificationPos.BOTTOM_RIGHT, createNotification("Action 1 Performed")));
|
// TODO remake
|
||||||
|
/* action1.setOnAction(event -> NotificationsManager.send(NotificationPos.BOTTOM_RIGHT, createNotification("Action 1 Performed")));
|
||||||
action2.setOnAction(event -> NotificationsManager.send(NotificationPos.BOTTOM_RIGHT, createNotification("Action 2 Performed")));
|
action2.setOnAction(event -> NotificationsManager.send(NotificationPos.BOTTOM_RIGHT, createNotification("Action 2 Performed")));
|
||||||
action3.setOnAction(event -> NotificationsManager.send(NotificationPos.BOTTOM_RIGHT, createNotification("Action 3 Performed")));
|
action3.setOnAction(event -> NotificationsManager.send(NotificationPos.BOTTOM_RIGHT, createNotification("Action 3 Performed")));*/
|
||||||
dialog.addCloseButton(close);
|
dialog.addCloseButton(close);
|
||||||
|
|
||||||
HBox box = new HBox(20, action1, action2, action3, close);
|
HBox box = new HBox(20, action1, action2, action3, close);
|
||||||
@ -280,15 +275,4 @@ public class DialogsController implements Initializable {
|
|||||||
box.setPadding(new Insets(20, 5, 20, 5));
|
box.setPadding(new Insets(20, 5, 20, 5));
|
||||||
return box;
|
return box;
|
||||||
}
|
}
|
||||||
|
|
||||||
private MFXNotification createNotification(String text) {
|
|
||||||
Region notificationPane = new SimpleMFXNotificationPane(
|
|
||||||
"Dialogs Actions Test",
|
|
||||||
"",
|
|
||||||
text
|
|
||||||
);
|
|
||||||
MFXNotification notification = new MFXNotification(notificationPane, true, true);
|
|
||||||
notification.setHideAfterDuration(Duration.seconds(3));
|
|
||||||
return notification;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/FontResourcesDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/FontResourcesDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/InfoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/InfoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/LabelsDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/LabelsDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/ListViewsDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/ListViewsDemoController.java
Normal file → Executable file
36
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/NotificationsController.java
Normal file → Executable file
36
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/NotificationsController.java
Normal file → Executable file
@ -18,19 +18,8 @@
|
|||||||
|
|
||||||
package io.github.palexdev.materialfx.demo.controllers;
|
package io.github.palexdev.materialfx.demo.controllers;
|
||||||
|
|
||||||
import io.github.palexdev.materialfx.controls.MFXDialog;
|
import io.github.palexdev.materialfx.enums.NotificationPos;
|
||||||
import io.github.palexdev.materialfx.controls.MFXNotification;
|
|
||||||
import io.github.palexdev.materialfx.controls.SimpleMFXNotificationPane;
|
|
||||||
import io.github.palexdev.materialfx.controls.base.AbstractMFXDialog;
|
|
||||||
import io.github.palexdev.materialfx.controls.enums.DialogType;
|
|
||||||
import io.github.palexdev.materialfx.controls.factories.MFXDialogFactory;
|
|
||||||
import io.github.palexdev.materialfx.notifications.NotificationPos;
|
|
||||||
import io.github.palexdev.materialfx.notifications.NotificationsManager;
|
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.scene.layout.Region;
|
|
||||||
import javafx.scene.paint.Color;
|
|
||||||
import javafx.util.Duration;
|
|
||||||
import org.kordamp.ikonli.javafx.FontIcon;
|
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
@ -83,27 +72,10 @@ public class NotificationsController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void showNotification(NotificationPos pos) {
|
private void showNotification(NotificationPos pos) {
|
||||||
MFXNotification notification = buildNotification();
|
// TODO remake
|
||||||
NotificationsManager.send(pos, notification);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private MFXNotification buildNotification() {
|
/* private Region getRandomTemplate() {
|
||||||
Region template = getRandomTemplate();
|
|
||||||
MFXNotification notification = new MFXNotification(template, true, true);
|
|
||||||
notification.setHideAfterDuration(Duration.seconds(3));
|
|
||||||
|
|
||||||
if (template instanceof SimpleMFXNotificationPane) {
|
|
||||||
SimpleMFXNotificationPane pane = (SimpleMFXNotificationPane) template;
|
|
||||||
pane.setCloseHandler(closeEvent -> notification.hideNotification());
|
|
||||||
} else {
|
|
||||||
MFXDialog dialog = (MFXDialog) template;
|
|
||||||
dialog.setCloseHandler(closeEvent -> notification.hideNotification());
|
|
||||||
}
|
|
||||||
|
|
||||||
return notification;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Region getRandomTemplate() {
|
|
||||||
final int rand = random.nextInt(4);
|
final int rand = random.nextInt(4);
|
||||||
|
|
||||||
switch (rand) {
|
switch (rand) {
|
||||||
@ -144,5 +116,5 @@ public class NotificationsController {
|
|||||||
default:
|
default:
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
2
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/ProgressBarsDemoController.java
Normal file → Executable file
2
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/ProgressBarsDemoController.java
Normal file → Executable file
@ -20,7 +20,7 @@ package io.github.palexdev.materialfx.demo.controllers;
|
|||||||
|
|
||||||
import io.github.palexdev.materialfx.beans.NumberRange;
|
import io.github.palexdev.materialfx.beans.NumberRange;
|
||||||
import io.github.palexdev.materialfx.controls.MFXProgressBar;
|
import io.github.palexdev.materialfx.controls.MFXProgressBar;
|
||||||
import io.github.palexdev.materialfx.controls.factories.MFXAnimationFactory;
|
import io.github.palexdev.materialfx.factories.MFXAnimationFactory;
|
||||||
import io.github.palexdev.materialfx.utils.AnimationUtils;
|
import io.github.palexdev.materialfx.utils.AnimationUtils;
|
||||||
import io.github.palexdev.materialfx.utils.AnimationUtils.KeyFrames;
|
import io.github.palexdev.materialfx.utils.AnimationUtils.KeyFrames;
|
||||||
import javafx.animation.Animation;
|
import javafx.animation.Animation;
|
||||||
|
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/ProgressSpinnersDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/ProgressSpinnersDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/ScrollPaneDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/ScrollPaneDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/SlidersDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/SlidersDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/StepperDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/StepperDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/TableViewsDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/TableViewsDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/TextFieldsDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/TextFieldsDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/TogglesController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/TogglesController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/TreeviewsDemoController.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/controllers/TreeviewsDemoController.java
Normal file → Executable file
9
demo/src/main/java/io/github/palexdev/materialfx/demo/model/FilterablePerson.java
Normal file → Executable file
9
demo/src/main/java/io/github/palexdev/materialfx/demo/model/FilterablePerson.java
Normal file → Executable file
@ -18,13 +18,13 @@
|
|||||||
|
|
||||||
package io.github.palexdev.materialfx.demo.model;
|
package io.github.palexdev.materialfx.demo.model;
|
||||||
|
|
||||||
import io.github.palexdev.materialfx.filter.IFilterable;
|
|
||||||
import javafx.beans.property.IntegerProperty;
|
import javafx.beans.property.IntegerProperty;
|
||||||
import javafx.beans.property.SimpleIntegerProperty;
|
import javafx.beans.property.SimpleIntegerProperty;
|
||||||
import javafx.beans.property.SimpleStringProperty;
|
import javafx.beans.property.SimpleStringProperty;
|
||||||
import javafx.beans.property.StringProperty;
|
import javafx.beans.property.StringProperty;
|
||||||
|
|
||||||
public class FilterablePerson implements IFilterable {
|
// TODO remove?
|
||||||
|
public class FilterablePerson {
|
||||||
private final StringProperty firstName = new SimpleStringProperty();
|
private final StringProperty firstName = new SimpleStringProperty();
|
||||||
private final StringProperty lastName = new SimpleStringProperty();
|
private final StringProperty lastName = new SimpleStringProperty();
|
||||||
private final StringProperty address = new SimpleStringProperty();
|
private final StringProperty address = new SimpleStringProperty();
|
||||||
@ -85,11 +85,6 @@ public class FilterablePerson implements IFilterable {
|
|||||||
this.age.set(age);
|
this.age.set(age);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toFilterString() {
|
|
||||||
return getFirstName() + getLastName() + getAddress() + getAge();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return getFirstName() + " " + getLastName();
|
return getFirstName() + " " + getLastName();
|
||||||
|
10
demo/src/main/java/io/github/palexdev/materialfx/demo/model/Machine.java
Normal file → Executable file
10
demo/src/main/java/io/github/palexdev/materialfx/demo/model/Machine.java
Normal file → Executable file
@ -18,13 +18,14 @@
|
|||||||
|
|
||||||
package io.github.palexdev.materialfx.demo.model;
|
package io.github.palexdev.materialfx.demo.model;
|
||||||
|
|
||||||
import io.github.palexdev.materialfx.filter.IFilterable;
|
|
||||||
import javafx.beans.property.ObjectProperty;
|
import javafx.beans.property.ObjectProperty;
|
||||||
import javafx.beans.property.SimpleObjectProperty;
|
import javafx.beans.property.SimpleObjectProperty;
|
||||||
import javafx.beans.property.SimpleStringProperty;
|
import javafx.beans.property.SimpleStringProperty;
|
||||||
import javafx.beans.property.StringProperty;
|
import javafx.beans.property.StringProperty;
|
||||||
|
|
||||||
public class Machine implements IFilterable {
|
|
||||||
|
// TODO review?
|
||||||
|
public class Machine {
|
||||||
|
|
||||||
public enum State {
|
public enum State {
|
||||||
ONLINE, OFFLINE
|
ONLINE, OFFLINE
|
||||||
@ -89,9 +90,4 @@ public class Machine implements IFilterable {
|
|||||||
public void setState(State state) {
|
public void setState(State state) {
|
||||||
this.state.set(state);
|
this.state.set(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toFilterString() {
|
|
||||||
return getName() + " " + getIp() + " " + getOwner() + " " + getState().name();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
0
demo/src/main/java/io/github/palexdev/materialfx/demo/model/Person.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/model/Person.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/model/SimplePerson.java
Normal file → Executable file
0
demo/src/main/java/io/github/palexdev/materialfx/demo/model/SimplePerson.java
Normal file → Executable file
0
demo/src/main/java/module-info.java
Normal file → Executable file
0
demo/src/main/java/module-info.java
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ButtonsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ButtonsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/CheckBoxesDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/CheckBoxesDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ComboBoxesDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ComboBoxesDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/DatePickersDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/DatePickersDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/Demo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/Demo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/DialogsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/DialogsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/FontResourcesDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/FontResourcesDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/InfoDialog.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/InfoDialog.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/LabelsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/LabelsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ListViewsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ListViewsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/NotificationsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/NotificationsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ProgressBarsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ProgressBarsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ProgressSpinnersDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ProgressSpinnersDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/RadioButtonsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/RadioButtonsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ScrollPanesDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ScrollPanesDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/SlidersDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/SlidersDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/StepperDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/StepperDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/TableViewsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/TableViewsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/TextFieldsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/TextFieldsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ToggleButtonsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/ToggleButtonsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/TreeViewsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/TreeViewsDemo.fxml
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/assets/logo.png
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/assets/logo.png
Normal file → Executable file
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/assets/welcome1.wav
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/assets/welcome1.wav
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/assets/welcome2.wav
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/assets/welcome2.wav
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ButtonsDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ButtonsDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/CheckBoxesDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/CheckBoxesDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ComboBoxesDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ComboBoxesDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/Common.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/Common.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/CustomDatePicker.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/CustomDatePicker.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/DatePickersDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/DatePickersDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/Demo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/Demo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/InfoDialog.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/InfoDialog.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ListViewsDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ListViewsDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/MFXColors.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/MFXColors.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ProgressBarDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ProgressBarDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ProgressSpinnersDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ProgressSpinnersDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/RadioButtonsDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/RadioButtonsDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ScrollPanesDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ScrollPanesDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/SlidersDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/SlidersDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/StepperDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/StepperDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/TestDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/TestDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/TextFieldsDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/TextFieldsDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ToggleButtonsDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/css/ToggleButtonsDemo.css
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/Comfortaa/Comfortaa-Bold.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/Comfortaa/Comfortaa-Bold.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/Comfortaa/Comfortaa-Light.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/Comfortaa/Comfortaa-Light.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/Comfortaa/Comfortaa-Medium.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/Comfortaa/Comfortaa-Medium.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/Comfortaa/Comfortaa-Regular.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/Comfortaa/Comfortaa-Regular.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/Comfortaa/Comfortaa-SemiBold.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/Comfortaa/Comfortaa-SemiBold.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/Comfortaa/Comfortaa-VariableFont_wght.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/Comfortaa/Comfortaa-VariableFont_wght.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-Bold.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-Bold.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-BoldItalic.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-BoldItalic.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-ExtraBold.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-ExtraBold.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-Italic.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-Italic.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-Light.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-Light.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-LightItalic.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-LightItalic.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-Regular.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-Regular.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-SemiBold.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-SemiBold.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-SemiBoldItalic.ttf
Normal file → Executable file
0
demo/src/main/resources/io/github/palexdev/materialfx/demo/fonts/OpenSans/OpenSans-SemiBoldItalic.ttf
Normal file → Executable file
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user