From 80b9c03c0f2dd76e518a84e0fd662f4b41eb5756 Mon Sep 17 00:00:00 2001 From: "Yuan.Wang" <1536296691@qq.com> Date: Sat, 10 Oct 2020 11:52:56 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-38778=20=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=8F=8F=E8=BF=B0=E3=80=82=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?SnapChat=E7=9A=84=E5=B7=A5=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/PromptWindow.java | 9 +++++--- .../com/fr/design/menu/SnapChatMenuDef.java | 15 +++---------- .../fr/design/menu/SnapChatUpdateAction.java | 13 ++---------- .../design/notification/SnapChatFactory.java | 21 +++++++++++++++++++ 4 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/notification/SnapChatFactory.java diff --git a/designer-base/src/main/java/com/fr/design/mainframe/PromptWindow.java b/designer-base/src/main/java/com/fr/design/mainframe/PromptWindow.java index 4dc85d1bfc..dc7fc1f63a 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/PromptWindow.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/PromptWindow.java @@ -1,17 +1,20 @@ package com.fr.design.mainframe; +import javax.swing.JWindow; + /** * @Author: Yuan.Wang * @Date: 2020/10/9 + * 只关心Window的显示和隐藏操作时可以实现该接口 */ public interface PromptWindow { /** * 显示弹窗 - * */ + */ void showWindow(); /** - * 影藏弹窗 - * */ + * 隐藏弹窗 + */ void hideWindow(); } diff --git a/designer-base/src/main/java/com/fr/design/menu/SnapChatMenuDef.java b/designer-base/src/main/java/com/fr/design/menu/SnapChatMenuDef.java index 762bb513c3..88757b6891 100644 --- a/designer-base/src/main/java/com/fr/design/menu/SnapChatMenuDef.java +++ b/designer-base/src/main/java/com/fr/design/menu/SnapChatMenuDef.java @@ -5,6 +5,7 @@ import com.fr.design.gui.imenu.UIScrollMenu; import com.fr.design.notification.AbstractSnapChat; import com.fr.design.notification.SnapChat; import com.fr.design.notification.SnapChatConfig; +import com.fr.design.notification.SnapChatFactory; import com.fr.design.notification.SnapChatKey; import javax.swing.JMenu; @@ -20,21 +21,11 @@ import java.awt.image.BufferedImage; * created by Harrison on 2020/03/16 **/ public class SnapChatMenuDef extends MenuDef implements SnapChat { - + private SnapChatKey uniqueKey; private SnapChatMenuUI menuUI = new SnapChatMenuUI(this); - private SnapChat snapChat = new AbstractSnapChat() { - @Override - public SnapChatKey key() { - return uniqueKey; - } + private SnapChat snapChat = SnapChatFactory.createSnapChat(true, uniqueKey); - @Override - public boolean defaultStatus() { - return true; - } - }; - public SnapChatMenuDef(String name, SnapChatKey uniqueKey) { super(name); this.uniqueKey = uniqueKey; diff --git a/designer-base/src/main/java/com/fr/design/menu/SnapChatUpdateAction.java b/designer-base/src/main/java/com/fr/design/menu/SnapChatUpdateAction.java index 45645167d3..71fbc95a7d 100644 --- a/designer-base/src/main/java/com/fr/design/menu/SnapChatUpdateAction.java +++ b/designer-base/src/main/java/com/fr/design/menu/SnapChatUpdateAction.java @@ -5,6 +5,7 @@ import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.notification.AbstractSnapChat; import com.fr.design.notification.SnapChat; import com.fr.design.notification.SnapChatConfig; +import com.fr.design.notification.SnapChatFactory; import com.fr.design.notification.SnapChatKey; import java.awt.event.ActionEvent; @@ -16,17 +17,7 @@ public abstract class SnapChatUpdateAction extends UpdateAction implements SnapC private SnapChatKey uniqueKey; - private SnapChat snapChat = new AbstractSnapChat() { - @Override - public SnapChatKey key() { - return uniqueKey; - } - - @Override - public boolean defaultStatus() { - return false; - } - }; + private SnapChat snapChat = SnapChatFactory.createSnapChat(false, uniqueKey); public SnapChatUpdateAction(SnapChatKey uniqueKey) { this.uniqueKey = uniqueKey; diff --git a/designer-base/src/main/java/com/fr/design/notification/SnapChatFactory.java b/designer-base/src/main/java/com/fr/design/notification/SnapChatFactory.java new file mode 100644 index 0000000000..c685e0f342 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/notification/SnapChatFactory.java @@ -0,0 +1,21 @@ +package com.fr.design.notification; + +/** + * @Author: Yuan.Wang + * @Date: 2020/10/10 + */ +public class SnapChatFactory { + public static SnapChat createSnapChat(boolean defaultStatus, SnapChatKey snapChatKey) { + return new AbstractSnapChat() { + @Override + public boolean defaultStatus() { + return defaultStatus; + } + + @Override + public SnapChatKey key() { + return snapChatKey; + } + }; + } +}