Skip to content

Commit 53fb74f

Browse files
salmonbsalmonb
authored
Merge pull request #18 from kadampabookings/teavm
TeaVM support
2 parents 418bdc6 + f60e45b commit 53fb74f

File tree

150 files changed

+1713
-812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+1713
-812
lines changed

‎pom.xml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
<module>webfx-stack-authn-login-ui-gateway-mojoauth-plugin</module>
6464
<module>webfx-stack-authn-login-ui-gateway-password-plugin</module>
6565
<module>webfx-stack-authn-login-ui-gateway-webviewbased</module>
66-
<module>webfx-stack-authn-login-ui-gateway-webviewbased-gwt</module>
6766
<module>webfx-stack-authn-login-ui-gateway-webviewbased-openjfx</module>
67+
<module>webfx-stack-authn-login-ui-gateway-webviewbased-web</module>
6868
<module>webfx-stack-authn-login-ui-portal</module>
6969
<module>webfx-stack-authn-logout-client</module>
7070
<module>webfx-stack-authn-logout-server</module>
@@ -78,6 +78,8 @@
7878
<module>webfx-stack-authn-server-portal</module>
7979
<module>webfx-stack-authz-client</module>
8080
<module>webfx-stack-authz-server</module>
81+
<module>webfx-stack-cloud-deepl-client</module>
82+
<module>webfx-stack-cloud-deepl-server-plugin</module>
8183
<module>webfx-stack-cloud-image</module>
8284
<module>webfx-stack-cloud-image-client</module>
8385
<module>webfx-stack-cloud-image-cloudinary</module>
@@ -89,16 +91,16 @@
8991
<module>webfx-stack-com-bus-json</module>
9092
<module>webfx-stack-com-bus-json-client</module>
9193
<module>webfx-stack-com-bus-json-client-websocket</module>
92-
<module>webfx-stack-com-bus-json-client-websocket-java</module>
94+
<module>webfx-stack-com-bus-json-client-websocket-jre</module>
9395
<module>webfx-stack-com-bus-json-client-websocket-web</module>
9496
<module>webfx-stack-com-bus-json-server</module>
9597
<module>webfx-stack-com-bus-json-vertx</module>
9698
<module>webfx-stack-com-bus-simple</module>
9799
<module>webfx-stack-com-serial</module>
98100
<module>webfx-stack-com-websocket</module>
99-
<module>webfx-stack-com-websocket-gwt-j2cl-native</module>
100-
<module>webfx-stack-com-websocket-gwt-j2cl-sockjs</module>
101-
<module>webfx-stack-com-websocket-java</module>
101+
<module>webfx-stack-com-websocket-elemental2-native</module>
102+
<module>webfx-stack-com-websocket-elemental2-sockjs</module>
103+
<module>webfx-stack-com-websocket-jre</module>
102104
<module>webfx-stack-db-datascope</module>
103105
<module>webfx-stack-db-datasource</module>
104106
<module>webfx-stack-db-query</module>
@@ -111,7 +113,7 @@
111113
<module>webfx-stack-db-querypush-remote</module>
112114
<module>webfx-stack-db-querypush-server</module>
113115
<module>webfx-stack-db-querypush-server-simple</module>
114-
<module>webfx-stack-db-querysubmit-java-jdbc</module>
116+
<module>webfx-stack-db-querysubmit-jre-jdbc</module>
115117
<module>webfx-stack-db-querysubmit-vertx</module>
116118
<module>webfx-stack-db-submit</module>
117119
<module>webfx-stack-db-submit-buscall</module>
@@ -159,7 +161,7 @@
159161
<module>webfx-stack-shareddata</module>
160162
<module>webfx-stack-shareddata-ast</module>
161163
<module>webfx-stack-shareddata-cache</module>
162-
<module>webfx-stack-shareddata-cache-cachestorage-gwt-j2cl</module>
164+
<module>webfx-stack-shareddata-cache-cachestorage-elemental2</module>
163165
<module>webfx-stack-shareddata-cache-localstorage-plugin</module>
164166
<module>webfx-stack-shareddata-cache-serial</module>
165167
<module>webfx-stack-shareddata-cache-storage</module>

‎webfx-stack-authn-login-ui-gateway-magiclink-plugin/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,25 @@
3535

3636
<dependency>
3737
<groupId>dev.webfx</groupId>
38-
<artifactId>webfx-extras-controlfactory</artifactId>
38+
<artifactId>webfx-extras-async</artifactId>
3939
<version>0.1.0-SNAPSHOT</version>
4040
</dependency>
4141

4242
<dependency>
4343
<groupId>dev.webfx</groupId>
44-
<artifactId>webfx-extras-i18n</artifactId>
44+
<artifactId>webfx-extras-controlfactory</artifactId>
4545
<version>0.1.0-SNAPSHOT</version>
4646
</dependency>
4747

4848
<dependency>
4949
<groupId>dev.webfx</groupId>
50-
<artifactId>webfx-extras-i18n-controls</artifactId>
50+
<artifactId>webfx-extras-i18n</artifactId>
5151
<version>0.1.0-SNAPSHOT</version>
5252
</dependency>
5353

5454
<dependency>
5555
<groupId>dev.webfx</groupId>
56-
<artifactId>webfx-extras-operation</artifactId>
56+
<artifactId>webfx-extras-i18n-controls</artifactId>
5757
<version>0.1.0-SNAPSHOT</version>
5858
</dependency>
5959

‎webfx-stack-authn-login-ui-gateway-magiclink-plugin/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/magiclink/MagicLinkUi.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import dev.webfx.extras.controlfactory.MaterialFactoryMixin;
44
import dev.webfx.extras.i18n.I18n;
55
import dev.webfx.extras.i18n.controls.I18nControls;
6-
import dev.webfx.extras.operation.OperationUtil;
6+
import dev.webfx.extras.async.AsyncSpinner;
77
import dev.webfx.extras.styles.bootstrap.Bootstrap;
88
import dev.webfx.extras.validation.ValidationSupport;
99
import dev.webfx.kit.util.properties.FXProperties;
@@ -127,12 +127,12 @@ private void onFailure(Throwable e) {
127127
uiLoginView.getActionButton().setDisable(false);
128128
uiLoginView.getActionButton().setOnAction(event -> {
129129
Object credentials = new RenewMagicLinkCredentials(tokenProperty.get());
130-
OperationUtil.turnOnButtonsWaitMode(uiLoginView.getActionButton());
130+
AsyncSpinner.displayButtonSpinner(uiLoginView.getActionButton());
131131
new AuthenticationRequest()
132132
.setUserCredentials(credentials)
133133
.executeAsync()
134134
.inUiThread()
135-
.onComplete(ar -> OperationUtil.turnOffButtonsWaitMode(uiLoginView.getActionButton()))
135+
.onComplete(ar -> AsyncSpinner.hideButtonSpinner(uiLoginView.getActionButton()))
136136
.onFailure(failure -> Console.log("Fail to renew Magik Link:" + failure.getMessage()))
137137
.onSuccess(ignored -> {
138138
uiLoginView.setMainMessage(PasswordI18nKeys.LinkSent, Bootstrap.TEXT_SUCCESS);

‎webfx-stack-authn-login-ui-gateway-magiclink-plugin/src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
requires javafx.base;
77
requires javafx.controls;
88
requires javafx.graphics;
9+
requires webfx.extras.async;
910
requires webfx.extras.controlfactory;
1011
requires webfx.extras.i18n;
1112
requires webfx.extras.i18n.controls;
12-
requires webfx.extras.operation;
1313
requires webfx.extras.styles.bootstrap;
1414
requires webfx.extras.validation;
1515
requires webfx.kit.util;

‎webfx-stack-authn-login-ui-gateway-password-plugin/pom.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,25 @@
3535

3636
<dependency>
3737
<groupId>dev.webfx</groupId>
38-
<artifactId>webfx-extras-controlfactory</artifactId>
38+
<artifactId>webfx-extras-async</artifactId>
3939
<version>0.1.0-SNAPSHOT</version>
4040
</dependency>
4141

4242
<dependency>
4343
<groupId>dev.webfx</groupId>
44-
<artifactId>webfx-extras-i18n</artifactId>
44+
<artifactId>webfx-extras-controlfactory</artifactId>
4545
<version>0.1.0-SNAPSHOT</version>
4646
</dependency>
4747

4848
<dependency>
4949
<groupId>dev.webfx</groupId>
50-
<artifactId>webfx-extras-i18n-controls</artifactId>
50+
<artifactId>webfx-extras-i18n</artifactId>
5151
<version>0.1.0-SNAPSHOT</version>
5252
</dependency>
5353

5454
<dependency>
5555
<groupId>dev.webfx</groupId>
56-
<artifactId>webfx-extras-operation</artifactId>
56+
<artifactId>webfx-extras-i18n-controls</artifactId>
5757
<version>0.1.0-SNAPSHOT</version>
5858
</dependency>
5959

@@ -75,6 +75,12 @@
7575
<version>0.1.0-SNAPSHOT</version>
7676
</dependency>
7777

78+
<dependency>
79+
<groupId>dev.webfx</groupId>
80+
<artifactId>webfx-extras-util-layout</artifactId>
81+
<version>0.1.0-SNAPSHOT</version>
82+
</dependency>
83+
7884
<dependency>
7985
<groupId>dev.webfx</groupId>
8086
<artifactId>webfx-extras-util-scene</artifactId>

‎webfx-stack-authn-login-ui-gateway-password-plugin/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/password/PasswordUiLoginGateway.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.webfx.stack.authn.login.ui.spi.impl.gateway.password;
22

3+
import dev.webfx.extras.i18n.I18nKeys;
34
import dev.webfx.extras.util.scene.SceneUtil;
45
import dev.webfx.kit.util.properties.FXProperties;
56
import dev.webfx.platform.uischeduler.UiScheduler;
@@ -26,9 +27,7 @@ public final class PasswordUiLoginGateway extends UiLoginGatewayBase implements
2627
private static Consumer<String> CREATE_ACCOUNT_EMAIL_CONSUMER;
2728

2829
private UILoginView uiLoginView;
29-
3030
private UiLoginPortalCallback uiLoginPortalcallback;
31-
3231
// SignInMode = true => username/password, false => magic link
3332
private final Property<Boolean> signInModeProperty = new SimpleObjectProperty<>(true);
3433

@@ -55,28 +54,26 @@ public Node createLoginUi(UiLoginPortalCallback callback) {
5554
uiLoginView = new UILoginView(CREATE_ACCOUNT_EMAIL_CONSUMER);
5655
uiLoginView.initializeComponents();
5756

58-
59-
FXProperties.runNowAndOnPropertiesChange(() -> {
60-
boolean signIn = signInModeProperty.getValue();
61-
if (!signIn) {
62-
uiLoginView.transformPaneToForgetPasswordState(callback);
63-
}
64-
else {
57+
FXProperties.runNowAndOnPropertyChange(signIn -> {
58+
if (signIn)
6559
uiLoginView.transformPaneToInitialState(callback);
66-
}
60+
else
61+
uiLoginView.transformPaneToForgetPasswordState(callback);
6762
}, signInModeProperty);
6863
FXProperties.runNowAndOnPropertiesChange(this::prepareShowing, uiLoginView.getContainer().sceneProperty());
6964
return uiLoginView.getContainer();
7065
}
7166

7267
private void resetUXToLogin() {
7368
signInModeProperty.setValue(true);
74-
//We wait one second to reset the UXLogin (otherwise it change to quickly, and we notice it on the UI if we have go to the password page to the home page (which take 1s), this change occurs between the two, and we don't want it to be noticed
75-
UiScheduler.scheduleDelay(1000,()->uiLoginView.transformPaneToInitialState(uiLoginPortalcallback));
69+
// We wait for 1 s to reset the UXLogin, otherwise it changes too quickly, and we notice it on the UI if we go
70+
// from the password page to the home page (which take 1 s) => this change occurs between the two, which is
71+
// noticeable, and we don't want it.
72+
UiScheduler.scheduleDelay(1000, () -> uiLoginView.transformPaneToInitialState(uiLoginPortalcallback));
7673
}
7774

7875
public void prepareShowing() {
79-
I18nControls.bindI18nProperties(uiLoginView.getActionButton(), signInModeProperty.getValue() ? "Continue" : "SendLink>>");
76+
I18nControls.bindI18nProperties(uiLoginView.getActionButton(), signInModeProperty.getValue() ? PasswordI18nKeys.Continue : I18nKeys.appendArrows(PasswordI18nKeys.SendLink));
8077
// Resetting the default button (required for JavaFX if displayed a second time)
8178
ButtonFactory.resetDefaultButton(uiLoginView.getActionButton());
8279
SceneUtil.autoFocusIfEnabled(uiLoginView.getEmailTextField());

0 commit comments

Comments
 (0)