From bd155c3c0b9ed16be818b19597768ca0cee7c95a Mon Sep 17 00:00:00 2001 From: "Yuan.Wang" Date: Tue, 19 Nov 2024 10:28:30 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-140121=20FBP=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=AC=AC=E4=B8=89=E6=9C=9F-Activator=E7=9A=84?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=AD=90=E7=B1=BB=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/EnvSwitcherSubmitTask.java | 2 +- .../src/main/java/com/fr/start/Designer.java | 2 +- .../java/com/fr/start/Designer4Debug.java | 2 +- .../main/java/com/fr/start/MainDesigner.java | 21 +++---------------- .../strongest/WidgetThemeListenerStarter.java | 7 ++++--- 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/EnvSwitcherSubmitTask.java b/designer-base/src/main/java/com/fr/design/EnvSwitcherSubmitTask.java index 33edfc66cb..2b0856408b 100644 --- a/designer-base/src/main/java/com/fr/design/EnvSwitcherSubmitTask.java +++ b/designer-base/src/main/java/com/fr/design/EnvSwitcherSubmitTask.java @@ -162,7 +162,7 @@ public class EnvSwitcherSubmitTask extends AbstractDesignerMetric { /** * 循环处理 JSON, 并降序排序 * - * @param moduleUsed 模块用时 {@link com.fr.module.engine.FineModule} + * @param moduleUsed 模块用时 * @param entries 降序排序的树集合 */ private void sortBySelfUsed(JSONObject moduleUsed, TreeSet entries) { diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java index c2ec299ea2..1784abd1db 100644 --- a/designer-realize/src/main/java/com/fr/start/Designer.java +++ b/designer-realize/src/main/java/com/fr/start/Designer.java @@ -49,6 +49,6 @@ public class Designer { * @param args 参数 */ private static void runNonGuardianDesigner(String[] args) { - MainDesigner.main(args); + //MainDesigner.main(args); } } diff --git a/designer-realize/src/main/java/com/fr/start/Designer4Debug.java b/designer-realize/src/main/java/com/fr/start/Designer4Debug.java index 6704b9c8cc..95ebdda722 100644 --- a/designer-realize/src/main/java/com/fr/start/Designer4Debug.java +++ b/designer-realize/src/main/java/com/fr/start/Designer4Debug.java @@ -6,6 +6,6 @@ package com.fr.start; public class Designer4Debug { public static void main(String... args) { - org.swingexplorer.Launcher.main(new String[]{"com.fr.start.MainDesigner"}); + //org.swingexplorer.Launcher.main(new String[]{"com.fr.start.MainDesigner"}); } } diff --git a/designer-realize/src/main/java/com/fr/start/MainDesigner.java b/designer-realize/src/main/java/com/fr/start/MainDesigner.java index 2fb67a0991..1262253cd3 100644 --- a/designer-realize/src/main/java/com/fr/start/MainDesigner.java +++ b/designer-realize/src/main/java/com/fr/start/MainDesigner.java @@ -2,6 +2,7 @@ package com.fr.start; import com.fanruan.gui.UiInspector; +import com.fanruan.product.ProductConstants; import com.fine.theme.icon.LazyIcon; import com.fr.base.function.UITerminator; import com.fr.base.vcs.DesignerMode; @@ -13,10 +14,7 @@ import com.fr.design.actions.server.ServerConfigManagerAction; import com.fr.design.actions.server.TemplateThemeManagerAction; import com.fr.design.actions.server.WidgetManagerAction; import com.fr.design.base.mode.DesignModeContext; -import com.fr.design.carton.latency.DesignerLatencyMetric; -import com.fr.design.carton.SwitchForSwingChecker; import com.fr.design.constants.DesignerLaunchStatus; -import com.fr.design.deeplink.DeepLinkManager; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.file.MultiTemplateTabPane; @@ -48,7 +46,6 @@ import com.fr.design.menu.ShortCut; import com.fr.design.module.ChartEmptyDataStyleAction; import com.fr.design.module.ChartPreStyleAction; import com.fr.design.module.DesignModuleFactory; -import com.fr.design.monitor.DesignerLifecycleMonitorContext; import com.fr.design.notification.ui.NotificationCenterPane; import com.fr.design.share.SharableManager; import com.fr.design.ui.util.UIUtil; @@ -56,26 +53,14 @@ import com.fr.design.utils.DesignUtils; import com.fr.design.utils.DesignerPort; import com.fr.design.utils.concurrent.ThreadFactoryBuilder; import com.fr.env.utils.DesignerInteractionHistory; -import com.fr.event.Event; -import com.fr.event.EventDispatcher; -import com.fr.event.Listener; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; -import com.fr.log.SystemOutLoggerProvider; -import com.fr.module.Module; -import com.fr.module.ModuleContext; -import com.fr.module.engine.event.LifecycleErrorEvent; import com.fr.runtime.FineRuntime; -import com.fanruan.product.ProductConstants; import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; -import com.fr.stable.lifecycle.FineLifecycleFatalError; import com.fr.stable.xml.XMLTools; -import com.fr.start.common.DesignerStartupContext; import com.fr.start.common.SplashCommon; -import com.fr.start.module.StartupArgs; import com.fr.start.preload.PreLoadService; -import com.fr.start.server.ServerTray; import com.fr.van.chart.map.server.ChartMapEditorAction; import com.fr.workspace.WorkContext; @@ -115,7 +100,7 @@ public class MainDesigner extends BaseDesigner { * * @param args 参数 */ - public static void main(String[] args) { +/* public static void main(String[] args) { DesignerStartupContext.getRecorder().start(); // 设置一下默认的logger，启动后再Reset FineLoggerFactory.setLogger(SystemOutLoggerProvider.getInstance()); @@ -162,7 +147,7 @@ public class MainDesigner extends BaseDesigner { DesignerLatencyMetric.getInstance().start(); installUIDevModeTools(); - } + }*/ /** * 进入UI开发者模式 diff --git a/designer-realize/src/main/java/com/fr/strongest/WidgetThemeListenerStarter.java b/designer-realize/src/main/java/com/fr/strongest/WidgetThemeListenerStarter.java index 8d2522350a..70174d86fc 100644 --- a/designer-realize/src/main/java/com/fr/strongest/WidgetThemeListenerStarter.java +++ b/designer-realize/src/main/java/com/fr/strongest/WidgetThemeListenerStarter.java @@ -1,5 +1,6 @@ package com.fr.strongest; +import com.fanruan.ComponentUtils; import com.finebi.cbb.utils.StringUtils; import com.fr.base.io.BaseBook; import com.fr.design.constants.DesignerLaunchStatus; @@ -11,7 +12,6 @@ import com.fr.event.Event; import com.fr.event.EventDispatcher; import com.fr.event.Listener; import com.fr.event.Null; -import com.fr.module.ModuleContext; import com.fr.widgettheme.control.attr.WidgetDisplayEnhanceMarkAttr; /** @@ -22,7 +22,8 @@ import com.fr.widgettheme.control.attr.WidgetDisplayEnhanceMarkAttr; * Created on 2023/11/13 */ public class WidgetThemeListenerStarter { - private WidgetThemeListenerStarter(){} + private WidgetThemeListenerStarter() { + } /** * 启动对模版控件主题显示的监听开关 @@ -43,7 +44,7 @@ public class WidgetThemeListenerStarter { dealWithJTemplate4Attr(temp); } }; - if (ModuleContext.isDesignerStartup()) { + if (ComponentUtils.isDesignerStart()) { EventDispatcher.listen(JTemplateEvent.BEFORE_TEMPLATE_INIT, attrListener); } }