From fcff569bf0f97dd565cb9bcbcd97ced16ce4ebfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=A6=E9=87=8C=E4=B8=8D=E7=9F=A5=E8=BA=AB=E6=98=AF?= =?UTF-8?q?=E5=AE=A2?= Date: Tue, 19 Sep 2023 08:43:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(frame):=20=E6=8E=A5=E5=8F=A3=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6=20(#750)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: unknowIfGuestInDream --- .../com/tlcsdm/core/javafx/bind/FxBindingBuilder.java | 2 +- .../tlcsdm/core/javafx/bind/FxBooleanBindingBuilder.java | 2 +- .../com/tlcsdm/core/javafx/control/ShadowScrollPane.java | 9 ++++----- frame/src/main/java/com/tlcsdm/frame/Sample.java | 3 ++- frame/src/main/java/com/tlcsdm/frame/SampleBase.java | 2 +- .../main/java/com/tlcsdm/frame/model/EmptySample.java | 2 +- .../tlcsdm/smc/codeDev/ecm/AbstractU2XFamilyScript.java | 8 +++++--- .../java/com/tlcsdm/smc/codeDev/ecm/C1MEcmScript.java | 6 +++--- .../java/com/tlcsdm/smc/codeDev/ecm/U2AEcmScript.java | 2 +- .../java/com/tlcsdm/smc/codeDev/ecm/U2CEcmScript.java | 2 +- 10 files changed, 20 insertions(+), 18 deletions(-) diff --git a/core/src/main/java/com/tlcsdm/core/javafx/bind/FxBindingBuilder.java b/core/src/main/java/com/tlcsdm/core/javafx/bind/FxBindingBuilder.java index 2099153dc..245ed1f3f 100644 --- a/core/src/main/java/com/tlcsdm/core/javafx/bind/FxBindingBuilder.java +++ b/core/src/main/java/com/tlcsdm/core/javafx/bind/FxBindingBuilder.java @@ -32,7 +32,7 @@ /** * @author unknowIfGuestInDream */ -public interface FxBindingBuilder { +public sealed interface FxBindingBuilder permits FxBooleanBindingBuilder { Binding build(); } diff --git a/core/src/main/java/com/tlcsdm/core/javafx/bind/FxBooleanBindingBuilder.java b/core/src/main/java/com/tlcsdm/core/javafx/bind/FxBooleanBindingBuilder.java index e7205d6ad..dd7b147e2 100644 --- a/core/src/main/java/com/tlcsdm/core/javafx/bind/FxBooleanBindingBuilder.java +++ b/core/src/main/java/com/tlcsdm/core/javafx/bind/FxBooleanBindingBuilder.java @@ -32,7 +32,7 @@ /** * @author unknowIfGuestInDream */ -public abstract class FxBooleanBindingBuilder implements FxBindingBuilder { +public abstract non-sealed class FxBooleanBindingBuilder implements FxBindingBuilder { @SuppressWarnings("exports") @Override diff --git a/core/src/main/java/com/tlcsdm/core/javafx/control/ShadowScrollPane.java b/core/src/main/java/com/tlcsdm/core/javafx/control/ShadowScrollPane.java index 770f578b4..527b500ef 100644 --- a/core/src/main/java/com/tlcsdm/core/javafx/control/ShadowScrollPane.java +++ b/core/src/main/java/com/tlcsdm/core/javafx/control/ShadowScrollPane.java @@ -39,7 +39,6 @@ * Add a drop shadow to the top of the scroll pane. * * @author unknowIfGuestInDream - * @date 2023/8/27 17:35 */ public class ShadowScrollPane extends ScrollPane { @@ -63,9 +62,8 @@ private void init() { setHbarPolicy(ScrollBarPolicy.NEVER); shadow.setManaged(false); - shadow.setStyle("-fx-pref-height: 10;" + - "-fx-background-color: black;" + - "-fx-effect: dropshadow(gaussian, rgba(0, 0, 0, .75), 20, 0.19, 0, 6);"); + shadow.setStyle("-fx-pref-height: 10;" + "-fx-background-color: black;" + + "-fx-effect: dropshadow(gaussian, rgba(0, 0, 0, .75), 20, 0.19, 0, 6);"); shadow.getStyleClass().add("shadow"); shadow.visibleProperty().bind(showShadowProperty()); shadow.setMouseTransparent(true); @@ -108,7 +106,8 @@ protected void layoutChildren() { Insets insets = getInsets(); double w = getWidth(); double offset = computeOffset(); - shadow.resizeRelocate(-10, insets.getTop() - shadow.prefHeight(-1) - SHADOW_HEIGHT + offset, w + 20, shadow.prefHeight(-1) - 1); + shadow.resizeRelocate(-10, insets.getTop() - shadow.prefHeight(-1) - SHADOW_HEIGHT + offset, w + 20, + shadow.prefHeight(-1) - 1); lastOffset = offset; } } diff --git a/frame/src/main/java/com/tlcsdm/frame/Sample.java b/frame/src/main/java/com/tlcsdm/frame/Sample.java index e0fdeb528..dc70c85a4 100644 --- a/frame/src/main/java/com/tlcsdm/frame/Sample.java +++ b/frame/src/main/java/com/tlcsdm/frame/Sample.java @@ -27,6 +27,7 @@ package com.tlcsdm.frame; +import com.tlcsdm.frame.model.EmptySample; import javafx.scene.Node; import javafx.scene.image.ImageView; import javafx.stage.Stage; @@ -34,7 +35,7 @@ /** * @author unknowIfGuestInDream */ -public interface Sample { +public sealed interface Sample permits EmptySample, SampleBase { /** * 组件id diff --git a/frame/src/main/java/com/tlcsdm/frame/SampleBase.java b/frame/src/main/java/com/tlcsdm/frame/SampleBase.java index 0b6e92293..a47481980 100644 --- a/frame/src/main/java/com/tlcsdm/frame/SampleBase.java +++ b/frame/src/main/java/com/tlcsdm/frame/SampleBase.java @@ -70,7 +70,7 @@ * * @author unknowIfGuestInDream */ -public abstract class SampleBase extends Application implements Sample { +public abstract non-sealed class SampleBase extends Application implements Sample { protected Map userData = new LinkedHashMap<>(); protected String aesSeed = "3f4eefd3525675154a5e3a0183d8087b"; diff --git a/frame/src/main/java/com/tlcsdm/frame/model/EmptySample.java b/frame/src/main/java/com/tlcsdm/frame/model/EmptySample.java index 249372b9e..5dd544360 100644 --- a/frame/src/main/java/com/tlcsdm/frame/model/EmptySample.java +++ b/frame/src/main/java/com/tlcsdm/frame/model/EmptySample.java @@ -36,7 +36,7 @@ /** * @author unknowIfGuestInDream */ -public class EmptySample implements Sample { +public final class EmptySample implements Sample { private final String name; public EmptySample(String name) { diff --git a/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/AbstractU2XFamilyScript.java b/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/AbstractU2XFamilyScript.java index d1d4129d2..8c8beb10b 100644 --- a/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/AbstractU2XFamilyScript.java +++ b/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/AbstractU2XFamilyScript.java @@ -43,7 +43,7 @@ * @author unknowIfGuestInDream * @date 2023/5/4 14:53 */ -public abstract class AbstractU2XFamilyScript extends AbstractEcmScript { +public abstract sealed class AbstractU2XFamilyScript extends AbstractEcmScript permits U2AEcmScript, U2CEcmScript { @Override protected Map dealErrorSourceData(ExcelReader reader, int rowNum, String product) { @@ -124,7 +124,9 @@ protected void handlerErrorSourceMap(Map errorSource, String pro /** * function数据后置处理 */ - protected void handlerOperationSupport(Map operation, String funcSupCondition, boolean optMaskintStatus) { - GroovyUtil.invokeMethod(getGroovyPath(), "handlerOperationSupport", operation, funcSupCondition, optMaskintStatus); + protected void handlerOperationSupport(Map operation, String funcSupCondition, + boolean optMaskintStatus) { + GroovyUtil.invokeMethod(getGroovyPath(), "handlerOperationSupport", operation, funcSupCondition, + optMaskintStatus); } } diff --git a/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/C1MEcmScript.java b/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/C1MEcmScript.java index 69e59eeaa..530e45f4b 100644 --- a/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/C1MEcmScript.java +++ b/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/C1MEcmScript.java @@ -44,12 +44,12 @@ import java.util.Map; /** - * C1M的ECM脚本 + * C1M的ECM脚本. * * @author unknowIfGuestInDream * @date 2023/3/26 21:17 */ -public class C1MEcmScript extends AbstractEcmScript { +public final class C1MEcmScript extends AbstractEcmScript { @Override protected void initDefaultValue() { @@ -196,7 +196,7 @@ private void handlerErrorSourceMap(Map errorSource) { * 处理使能条件的 * 信息, 默认是support = true下的 */ private void handlerOperationSupport(Map operation, String funcSupCondition, - boolean optMaskintStatus) { + boolean optMaskintStatus) { // Do nothing } diff --git a/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/U2AEcmScript.java b/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/U2AEcmScript.java index 596607dee..85e1f185a 100644 --- a/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/U2AEcmScript.java +++ b/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/U2AEcmScript.java @@ -40,7 +40,7 @@ * @author unknowIfGuestInDream * @date 2023/3/26 21:17 */ -public class U2AEcmScript extends AbstractU2XFamilyScript { +public final class U2AEcmScript extends AbstractU2XFamilyScript { @Override protected void initDefaultValue() { diff --git a/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/U2CEcmScript.java b/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/U2CEcmScript.java index 4aa80ebca..011ab7ca1 100644 --- a/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/U2CEcmScript.java +++ b/smc/src/main/java/com/tlcsdm/smc/codeDev/ecm/U2CEcmScript.java @@ -38,7 +38,7 @@ * @author unknowIfGuestInDream * @date 2023/3/26 21:17 */ -public class U2CEcmScript extends AbstractU2XFamilyScript { +public final class U2CEcmScript extends AbstractU2XFamilyScript { @Override protected void initDefaultValue() {