From 5732dd4c93e1e3fc77f5eea07d6f9d235d6966f0 Mon Sep 17 00:00:00 2001 From: Harrison Date: Wed, 15 Nov 2023 20:04:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20REPORT-106669=20=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=9F=8B=E7=82=B9=E8=A1=A5=E5=85=85=20=E3=80=90=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E9=83=A8=E5=88=86=E5=9F=8B=E7=82=B9=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E3=80=82=E3=80=91=20-=20=E6=B7=BB=E5=8A=A0=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E3=80=81=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20-=20=E6=A8=A1=E5=9D=97=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=86=E5=8C=96=20-=20=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=20PerformancePoint=20=E4=BD=9C=E4=B8=BA=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E8=AF=8A=E6=96=AD=E8=BE=85=E5=8A=A9=E7=B1=BB=E3=80=82=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=20PerformancePointTest=20=E4=BD=9C=E4=B8=BA=20DEMO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/EnvChangeEntrance.java | 30 +++++++++++++++---- .../module/DesignerWorkspaceActivator.java | 27 +++++++++++++++++ 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java index 1f3055d40a..090a0bd639 100644 --- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java +++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java @@ -1,9 +1,6 @@ package com.fr.design; import com.fr.common.report.ReportState; -import com.fr.design.env.processor.RemoteDesignerWorkspaceInfoProcessor; -import com.fr.design.mainframe.manager.clip.TemplateTreeClipboard; -import com.fr.design.plugin.remind.PluginErrorDesignReminder; import com.fr.design.data.DesignTableDataManager; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; @@ -14,13 +11,16 @@ import com.fr.design.env.DesignerWorkspaceInfoContext; import com.fr.design.env.DesignerWorkspaceType; import com.fr.design.env.RemoteDesignerWorkspaceInfo; import com.fr.design.env.RemoteWorkspace; +import com.fr.design.env.processor.RemoteDesignerWorkspaceInfoProcessor; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.SaveSomeTemplatePane; import com.fr.design.file.TemplateTreePane; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; +import com.fr.design.mainframe.manager.clip.TemplateTreeClipboard; import com.fr.design.notification.NotificationCenter; +import com.fr.design.plugin.remind.PluginErrorDesignReminder; import com.fr.design.utils.DesignUtils; import com.fr.design.versioncheck.VersionCheckUtils; import com.fr.env.EnvListPane; @@ -31,6 +31,7 @@ import com.fr.invoke.Reflect; import com.fr.json.JSONArray; import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; +import com.fr.performance.profile.PerformancePoint; import com.fr.process.ProcessEventPipe; import com.fr.process.engine.core.CarryMessageEvent; import com.fr.process.engine.core.FineProcessContext; @@ -41,12 +42,14 @@ import com.fr.start.server.ServerTray; import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContextCallback; import com.fr.workspace.Workspace; +import com.fr.workspace.WorkspaceSwitchProcess; import com.fr.workspace.base.WorkspaceAPI; import com.fr.workspace.connect.WorkspaceConnectionInfo; import com.fr.workspace.engine.base.FineObjectPool; import com.fr.workspace.engine.channel.http.FunctionalHttpRequest; import com.fr.workspace.engine.exception.WorkspaceConnectionException; import com.fr.workspace.engine.rpc.WorkspaceProxyPool; +import static javax.swing.JOptionPane.QUESTION_MESSAGE; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; @@ -58,12 +61,11 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Optional; import java.util.Set; -import java.util.HashSet; - -import static javax.swing.JOptionPane.QUESTION_MESSAGE; public class EnvChangeEntrance { private static final String BRANCH_TAG = "#"; @@ -132,6 +134,9 @@ public class EnvChangeEntrance { * @return 是否成功 */ private boolean switch2Env(final String envName, PopTipStrategy strategy) { + + PerformancePoint performancePoint = PerformancePoint.create(); + DesignerEnvManager envManager = DesignerEnvManager.getEnvManager(); DesignerWorkspaceInfo selectedEnv = customUserName(envManager.getWorkspaceInfo(envName)); DesignerWorkspaceInfoContext.setWorkspaceInfo(selectedEnv); @@ -165,6 +170,8 @@ public class EnvChangeEntrance { } catch (Exception exception) { // 失败的处理 WorkspaceExceptionHandler.getInstance().handleInSwitch(exception, selectedEnv); + // 记录切换耗时 + recordSwitchElapsed(performancePoint); return false; } TemplateTreePane.getInstance().refreshDockingView(); @@ -175,9 +182,20 @@ public class EnvChangeEntrance { NotificationCenter.getInstance().clearAllNotifications(); //切换环境后，清空粘贴板里面的内容 TemplateTreeClipboard.getInstance().reset(); + // 记录切换耗时 + recordSwitchElapsed(performancePoint); return true; } + private static void recordSwitchElapsed(PerformancePoint performancePoint) { + + performancePoint.end(elapsed -> { + WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProgress(); + Optional.ofNullable(process) + .ifPresent((e) -> e.recordSwitchElapsed(elapsed)); + }); + } + /** * 切换到其他环境 * diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java index 858eca4977..e8e2e0f121 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java @@ -6,10 +6,15 @@ import com.fr.design.file.HistoryTemplateListCache; import com.fr.event.Event; import com.fr.event.Listener; import com.fr.module.Activator; +import com.fr.module.ModuleContext; +import com.fr.module.engine.FineModule; import com.fr.start.server.FineEmbedServer; +import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; import com.fr.workspace.WorkspaceEvent; +import com.fr.workspace.WorkspaceSwitchProcess; +import java.util.Optional; import java.util.concurrent.ExecutorService; /** @@ -35,6 +40,17 @@ public class DesignerWorkspaceActivator extends Activator { public void on(Event event, Workspace current) { stopSub(EnvBasedModule.class); + recordModuleStop(); + } + + private void recordModuleStop() { + + WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProgress(); + Optional.ofNullable(process) + .ifPresent((e) -> e.recordModuleStopUsed(() -> { + FineModule module = (FineModule) ModuleContext.getModule(EnvBasedModule.class); + return module.profileStop(); + })); } }); /*切换环境后，重新启动所有相关模块，最先执行*/ @@ -44,6 +60,17 @@ public class DesignerWorkspaceActivator extends Activator { public void on(Event event, Workspace current) { startSub(EnvBasedModule.class); + recordModuleStart(); + } + + private void recordModuleStart() { + + WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProgress(); + Optional.ofNullable(process) + .ifPresent((e) -> e.recordModuleStartUsed(() -> { + FineModule module = (FineModule) ModuleContext.getModule(EnvBasedModule.class); + return module.profile(); + })); } }); /*切换环境前，存储一下打开的所有文件对象，要先于 关闭相关模块部分 被触发*/ From 102194f7b336202c36eb8994743f06b4dbad522c Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 16 Nov 2023 09:57:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20REPORT-106669=20=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=9F=8B=E7=82=B9=E8=A1=A5=E5=85=85=20-=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/DesignerWorkspaceActivator.java | 80 ++++++++++--------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java index e8e2e0f121..3813edcdbd 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java @@ -22,6 +22,46 @@ import java.util.concurrent.ExecutorService; */ public class DesignerWorkspaceActivator extends Activator { + private final Listener stopModuleAction = new Listener(Integer.MIN_VALUE) { + + @Override + public void on(Event event, Workspace current) { + + stopSub(EnvBasedModule.class); + recordModuleStop(); + } + + private void recordModuleStop() { + + WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProgress(); + Optional.ofNullable(process) + .ifPresent((e) -> e.recordModuleStopUsed(() -> { + FineModule module = (FineModule) ModuleContext.getModule(EnvBasedModule.class); + return module.profileStop(); + })); + } + }; + + private final Listener startModuleAction = new Listener(Integer.MAX_VALUE) { + + @Override + public void on(Event event, Workspace current) { + + startSub(EnvBasedModule.class); + recordModuleStart(); + } + + private void recordModuleStart() { + + WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProgress(); + Optional.ofNullable(process) + .ifPresent((e) -> e.recordModuleStartUsed(() -> { + FineModule module = (FineModule) ModuleContext.getModule(EnvBasedModule.class); + return module.profile(); + })); + } + }; + @Override public void start() { @@ -34,45 +74,9 @@ public class DesignerWorkspaceActivator extends Activator { private void registerEnvListener() { /*切换环境前，关闭所有相关模块，最后执行*/ - listenEvent(WorkspaceEvent.BeforeSwitch, new Listener(Integer.MIN_VALUE) { - - @Override - public void on(Event event, Workspace current) { - - stopSub(EnvBasedModule.class); - recordModuleStop(); - } - - private void recordModuleStop() { - - WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProgress(); - Optional.ofNullable(process) - .ifPresent((e) -> e.recordModuleStopUsed(() -> { - FineModule module = (FineModule) ModuleContext.getModule(EnvBasedModule.class); - return module.profileStop(); - })); - } - }); + listenEvent(WorkspaceEvent.BeforeSwitch, stopModuleAction); /*切换环境后，重新启动所有相关模块，最先执行*/ - listenEvent(WorkspaceEvent.AfterSwitch, new Listener(Integer.MAX_VALUE) { - - @Override - public void on(Event event, Workspace current) { - - startSub(EnvBasedModule.class); - recordModuleStart(); - } - - private void recordModuleStart() { - - WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProgress(); - Optional.ofNullable(process) - .ifPresent((e) -> e.recordModuleStartUsed(() -> { - FineModule module = (FineModule) ModuleContext.getModule(EnvBasedModule.class); - return module.profile(); - })); - } - }); + listenEvent(WorkspaceEvent.AfterSwitch, startModuleAction); /*切换环境前，存储一下打开的所有文件对象，要先于 关闭相关模块部分 被触发*/ listenEvent(WorkspaceEvent.BeforeSwitch, new Listener(Integer.MAX_VALUE) { From d38aa7607be273eb241bff1ddc5bc6447aa15c94 Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 16 Nov 2023 15:07:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20REPORT-106669=20=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=9F=8B=E7=82=B9=E8=A1=A5=E5=85=85=20-=20=E5=B0=86=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=93=8D=E4=BD=9C=E5=8C=85=E4=B8=8A=E4=B8=80=E5=B1=82?= =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E5=9C=A8=E5=A4=96=E5=B1=82=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E8=AE=B0=E5=BD=95=E5=92=8C=E8=A7=A6=E5=8F=91=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E3=80=82=E4=B8=8D=E7=84=B6=E6=8F=92=E4=BB=B6=E6=9C=89?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E8=AE=B0=E5=BD=95=E4=B8=8D=E5=88=B0=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/EnvChangeEntrance.java | 109 +++++++++++++----- 1 file changed, 79 insertions(+), 30 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java index 090a0bd639..91b23007ef 100644 --- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java +++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java @@ -127,53 +127,105 @@ public class EnvChangeEntrance { } } + /** * 切换到新环境 * * @param envName 新工作环境名称 + * @param strategy 提示策略 * @return 是否成功 */ private boolean switch2Env(final String envName, PopTipStrategy strategy) { PerformancePoint performancePoint = PerformancePoint.create(); + boolean switchStatus = doSwitch2Env(envName, strategy); + // 记录切换耗时 + recordSwitchElapsed(performancePoint); + // 触发切换埋点 + triggerSwitchMetric(switchStatus); + return switchStatus; + } - DesignerEnvManager envManager = DesignerEnvManager.getEnvManager(); - DesignerWorkspaceInfo selectedEnv = customUserName(envManager.getWorkspaceInfo(envName)); - DesignerWorkspaceInfoContext.setWorkspaceInfo(selectedEnv); - WorkspaceConnectionInfo connectionInfo = selectedEnv.getConnection(); + /** + * 由云端运维，触发切换埋点 + * 内部空实现 + * + * @param switchStatus 切换状态 + */ + private void triggerSwitchMetric(boolean switchStatus) { + } + /** + * 切换到新环境 + * 1. 先获取选中的环境 + * 2. 生成工作目录 + * 3. 验证工作目录 + * 4. 触发切换操作 + * 5. 触发可能存在异常的切换后动作 + * 6. 触发切换后动作 + * + * @param envName 新工作环境名称 + * @return 是否成功 + */ + private boolean doSwitch2Env(final String envName, PopTipStrategy strategy) { + + DesignerWorkspaceInfo selectedEnv = getSelectedEnv(envName); try { Workspace workspace = DesignerWorkspaceGenerator.generate(selectedEnv); - boolean checkValid = workspace != null && selectedEnv.checkValid(); - if (!checkValid) { + if (notValid(workspace, selectedEnv)) { return false; } - //如果是相同环境 - if (isSameEnv(workspace)) { - //目前切换到相同环境需要更新一下名字，后续如果有别的操作直接往里面加就行了 - switch2SameEnv(envName); - } else { - //切换到新环境，做下封装 - switch2OtherEnv(workspace, envName); - } - // REPORT-25688如果是war包部署的服务器，给与提示 - if (WorkContext.getCurrent().isWarDeploy()) { - FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Basic_War_Deploy_Tip"), - Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.INFORMATION_MESSAGE); - } - //REPORT-13810如果只是添加了工作目录,没有切换,这里ToolArea也是要显示新建的工作目录 - JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); - if (JTemplate.isValid(template)) { - template.refreshToolArea(); - } - PluginErrorDesignReminder.getInstance().remindStartFailedPlugins(); + doSwitchAction(envName, workspace); + afterSwitchWithEx(); } catch (Exception exception) { // 失败的处理 WorkspaceExceptionHandler.getInstance().handleInSwitch(exception, selectedEnv); - // 记录切换耗时 - recordSwitchElapsed(performancePoint); return false; } + afterSwitch(); + return true; + } + + private DesignerWorkspaceInfo getSelectedEnv(String envName) { + + DesignerEnvManager envManager = DesignerEnvManager.getEnvManager(); + DesignerWorkspaceInfo selectedEnv = customUserName(envManager.getWorkspaceInfo(envName)); + DesignerWorkspaceInfoContext.setWorkspaceInfo(selectedEnv); + return selectedEnv; + } + + private static boolean notValid(Workspace workspace, DesignerWorkspaceInfo selectedEnv) throws Exception { + boolean checkValid = workspace != null && selectedEnv.checkValid(); + return !checkValid; + } + + private void doSwitchAction(String envName, Workspace workspace) { + + //如果是相同环境 + if (isSameEnv(workspace)) { + //目前切换到相同环境需要更新一下名字，后续如果有别的操作直接往里面加就行了 + switch2SameEnv(envName); + } else { + //切换到新环境，做下封装 + switch2OtherEnv(workspace, envName); + } + } + + private static void afterSwitchWithEx() { + // REPORT-25688如果是war包部署的服务器，给与提示 + if (WorkContext.getCurrent().isWarDeploy()) { + FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Basic_War_Deploy_Tip"), + Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.INFORMATION_MESSAGE); + } + //REPORT-13810如果只是添加了工作目录,没有切换,这里ToolArea也是要显示新建的工作目录 + JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); + if (JTemplate.isValid(template)) { + template.refreshToolArea(); + } + PluginErrorDesignReminder.getInstance().remindStartFailedPlugins(); + } + + private static void afterSwitch() { TemplateTreePane.getInstance().refreshDockingView(); DesignModelAdapter model = DesignModelAdapter.getCurrentModelAdapter(); if (model != null) { @@ -182,9 +234,6 @@ public class EnvChangeEntrance { NotificationCenter.getInstance().clearAllNotifications(); //切换环境后，清空粘贴板里面的内容 TemplateTreeClipboard.getInstance().reset(); - // 记录切换耗时 - recordSwitchElapsed(performancePoint); - return true; } private static void recordSwitchElapsed(PerformancePoint performancePoint) { From ab2aec1b5f0144f9bcaf5c74e66abc1e916803d7 Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 16 Nov 2023 16:32:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20REPORT-106669=20=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=9F=8B=E7=82=B9=E8=A1=A5=E5=85=85=20-=20=E8=80=83=E8=99=91?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=BB=B6=E8=BF=9F=E5=8A=A0=E8=BD=BD=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=EF=BC=8C=E6=8D=A2=E4=B8=80=E7=A7=8D=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E8=AE=B0=E5=BD=95=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/EnvChangeEntrance.java | 29 ++++++++++++------- .../module/DesignerWorkspaceActivator.java | 4 +-- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java index 91b23007ef..8eb4a9afb7 100644 --- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java +++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java @@ -137,22 +137,28 @@ public class EnvChangeEntrance { */ private boolean switch2Env(final String envName, PopTipStrategy strategy) { + WorkspaceSwitchProcess lastProcess = WorkContext.getSwitcher().getProcess(); PerformancePoint performancePoint = PerformancePoint.create(); + boolean switchStatus = doSwitch2Env(envName, strategy); - // 记录切换耗时 - recordSwitchElapsed(performancePoint); - // 触发切换埋点 - triggerSwitchMetric(switchStatus); + + WorkspaceSwitchProcess currentProcess = WorkContext.getSwitcher().getProcess(); + // 如果相同，代表根本没切换 == + if (lastProcess != currentProcess) { + // 记录切换耗时 + recordSwitchInfos(performancePoint, switchStatus); + // 触发切换埋点 + triggerSwitchMetric(); + } return switchStatus; } /** * 由云端运维，触发切换埋点 * 内部空实现 - * - * @param switchStatus 切换状态 + * 见 实现 */ - private void triggerSwitchMetric(boolean switchStatus) { + private void triggerSwitchMetric() { } /** @@ -236,12 +242,15 @@ public class EnvChangeEntrance { TemplateTreeClipboard.getInstance().reset(); } - private static void recordSwitchElapsed(PerformancePoint performancePoint) { + private static void recordSwitchInfos(PerformancePoint performancePoint, boolean switchSuccess) { performancePoint.end(elapsed -> { - WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProgress(); + WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProcess(); Optional.ofNullable(process) - .ifPresent((e) -> e.recordSwitchElapsed(elapsed)); + .ifPresent((e) -> { + e.recordSwitchElapsed(elapsed); + e.setSwitchSuccess(switchSuccess); + }); }); } diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java index 3813edcdbd..2fd4a532c8 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java @@ -33,7 +33,7 @@ public class DesignerWorkspaceActivator extends Activator { private void recordModuleStop() { - WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProgress(); + WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProcess(); Optional.ofNullable(process) .ifPresent((e) -> e.recordModuleStopUsed(() -> { FineModule module = (FineModule) ModuleContext.getModule(EnvBasedModule.class); @@ -53,7 +53,7 @@ public class DesignerWorkspaceActivator extends Activator { private void recordModuleStart() { - WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProgress(); + WorkspaceSwitchProcess process = WorkContext.getSwitcher().getProcess(); Optional.ofNullable(process) .ifPresent((e) -> e.recordModuleStartUsed(() -> { FineModule module = (FineModule) ModuleContext.getModule(EnvBasedModule.class);