From 33c86b3f23900f627bba73536ad8238593f15e0a Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 1 Dec 2022 11:14:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-85960=20=E8=B5=B7=E5=A7=8B=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9C=80=E8=BF=91=E6=89=93=E5=BC=80?= =?UTF-8?q?=E7=9A=84fvs=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=A4=B1=E8=B4=A5=20=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=8A=A9=E6=89=8B=E6=89=93=E5=BC=80=E6=A8=A1=E6=9D=BF=E6=97=B6?= =?UTF-8?q?=E4=BC=9A=E8=8E=B7=E5=8F=96=20path,=20=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=98=AF=E4=BD=BF=E7=94=A8=E7=A9=BA=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=89=93=E5=BC=80=EF=BC=8C=E5=88=99=E4=BC=9A=20npe,?= =?UTF-8?q?=20=E5=9C=A8=E4=B8=BBJAR=E5=85=BC=E5=AE=B9=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JNullTemplate.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JNullTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JNullTemplate.java index d10df810a2..e4eb797404 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JNullTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JNullTemplate.java @@ -204,4 +204,9 @@ public class JNullTemplate extends JTemplate { public int getToolBarHeight() { return 0; } + + @Override + public String getPath() { + return null; + } } From 7d1591436a936a8579da856b79d6f586381a3837 Mon Sep 17 00:00:00 2001 From: "John.Ying" Date: Thu, 1 Dec 2022 14:24:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-85960=20=E8=B5=B7=E5=A7=8B=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9C=80=E8=BF=91=E6=89=93=E5=BC=80?= =?UTF-8?q?=E7=9A=84fvs=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/carton/EventDispatchThreadHangMonitor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java b/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java index 56ccaa2c48..118c0858ef 100644 --- a/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java +++ b/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java @@ -314,7 +314,7 @@ public final class EventDispatchThreadHangMonitor extends EventQueue { * 将swing中默认的EventQueue换成自己的 */ public static void initMonitoring() { - Toolkit.getDefaultToolkit().getSystemEventQueue().push(INSTANCE); + SwingUtilities.invokeLater(() -> Toolkit.getDefaultToolkit().getSystemEventQueue().push(INSTANCE)); } /** From c19949c130d37df20acf63ecb11ece136a682120 Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 1 Dec 2022 15:23:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-86023=20=E8=B5=B7=E5=A7=8B=E9=A1=B5?= =?UTF-8?q?=E5=85=88=E8=BF=9B=E5=85=A5=E6=9C=AC=E5=9C=B0=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E5=86=8D=E8=BF=9B=E5=85=A5=E6=AC=A1=E7=AE=A1=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E7=9B=AE=E5=BD=95=EF=BC=8C=E4=BC=9A=E6=9C=89=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E9=80=89=E9=A1=B9=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=98=AF=E4=B8=8D=E4=BC=9A=E5=88=B7=E6=96=B0=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=A0=8F=E7=9A=84=E3=80=82=E8=BF=99=E9=87=8C=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E3=80=82=20(=E5=90=90=E6=A7=BD=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=EF=BC=9A=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=9C=89?= =?UTF-8?q?=E7=82=B9=E5=A4=AA=E6=95=A3=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JNullTemplate.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JNullTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JNullTemplate.java index e4eb797404..656344b186 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JNullTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JNullTemplate.java @@ -209,4 +209,9 @@ public class JNullTemplate extends JTemplate { public String getPath() { return null; } + + @Override + public void refreshToolArea() { + DesignerContext.getDesignerFrame().resetToolkitByPlus(this); + } } From a687873a777e4bf176f870b6670f7bc3aad1ffdd Mon Sep 17 00:00:00 2001 From: "John.Ying" Date: Thu, 1 Dec 2022 15:30:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-85960=20=E8=B5=B7=E5=A7=8B=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9C=80=E8=BF=91=E6=89=93=E5=BC=80?= =?UTF-8?q?=E7=9A=84fvs=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=A4=B1=E8=B4=A5--=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/carton/EventDispatchThreadHangMonitor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java b/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java index 118c0858ef..a7bf03b407 100644 --- a/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java +++ b/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java @@ -1,6 +1,7 @@ package com.fr.design.carton; import com.fr.concurrent.FineExecutors; +import com.fr.design.ui.util.UIUtil; import com.fr.json.JSONObject; import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; @@ -314,7 +315,7 @@ public final class EventDispatchThreadHangMonitor extends EventQueue { * 将swing中默认的EventQueue换成自己的 */ public static void initMonitoring() { - SwingUtilities.invokeLater(() -> Toolkit.getDefaultToolkit().getSystemEventQueue().push(INSTANCE)); + UIUtil.invokeLaterIfNeeded(() -> Toolkit.getDefaultToolkit().getSystemEventQueue().push(INSTANCE)); } /** From 8c91578dc48063685179ccd8ddb82aa7ae1c186e Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Thu, 1 Dec 2022 15:55:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-84965=20=E6=8F=92=E4=BB=B6-=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86-=E6=8F=92=E4=BB=B6id=E9=87=8C?= =?UTF-8?q?=E6=9C=89=E4=B8=8B=E5=88=92=E7=BA=BF=EF=BC=8C=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4=20?= =?UTF-8?q?=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E8=A7=A3=E6=9E=90'=5F'=E6=97=B6=EF=BC=8C=E4=BB=85?= =?UTF-8?q?=E8=80=83=E8=99=91=E6=9C=89=E4=B8=80=E4=B8=AA'=5F'=20=E3=80=90?= =?UTF-8?q?=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=9C=80=E5=90=8E=E5=87=BA=E7=8E=B0=E7=9A=84'=5F'=E5=88=86?= =?UTF-8?q?=E9=9A=94id=E5=92=8Cversion=20=E3=80=90review=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=E3=80=91=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/extra/PluginUtils.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java b/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java index 521821eadf..f12f8f8446 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java @@ -10,8 +10,8 @@ import com.fr.json.JSONObject; import com.fr.log.FineLoggerFactory; import com.fr.plugin.PluginVerifyException; import com.fr.plugin.basic.version.Version; -import com.fr.plugin.basic.version.VersionIntervalType; import com.fr.plugin.basic.version.VersionIntervalFactory; +import com.fr.plugin.basic.version.VersionIntervalType; import com.fr.plugin.context.PluginContext; import com.fr.plugin.context.PluginMarker; import com.fr.plugin.error.PluginBaseErrorCode; @@ -23,7 +23,7 @@ import com.fr.stable.ProductConstants; import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; -import javax.swing.*; +import javax.swing.JOptionPane; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -47,9 +47,10 @@ public class PluginUtils { public static PluginMarker createPluginMarker(String pluginInfo) { - //todo 判空 - String[] plugin = pluginInfo.split("_"); - return PluginMarker.create(plugin[0], plugin[1]); + int splitIndex = pluginInfo.lastIndexOf("_"); + String pluginID = pluginInfo.substring(0, splitIndex); + String version = pluginInfo.substring(splitIndex + 1); + return PluginMarker.create(pluginID, version); } public static JSONObject getLatestPluginInfo(String pluginID) throws Exception {