From f04b2e44f06d000cbcb97256e61d338bdcfec8ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=2EYing-=E5=BA=94=E5=BF=97=E6=B5=A9?= Date: Fri, 19 May 2023 15:06:11 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-94530=20=E3=80=90=E4=BA=8C=E5=BC=80?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=91=E8=BD=AC=E6=8D=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E6=8E=A5=E5=8F=A3--=E8=B0=83=E6=95=B4=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E6=8E=A5=E5=8F=A3=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/EnvChangeEntrance.java | 3 ++- .../env/RemoteDesignerWorkspaceInfo.java | 20 --------------- ...tRemoteDesignerWorkspaceInfoProcessor.java | 6 ++--- .../RemoteDesignerWorkspaceInfoProcessor.java | 25 +++++++++++++++++++ .../main/java/com/fr/env/RemoteEnvPane.java | 3 ++- 5 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/env/processor/RemoteDesignerWorkspaceInfoProcessor.java 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 1aa6008fe..0f577d852 100644 --- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java +++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java @@ -1,6 +1,7 @@ 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; @@ -111,7 +112,7 @@ public class EnvChangeEntrance { if (workspaceInfo == null || workspaceInfo.getType() == DesignerWorkspaceType.Local) { return workspaceInfo; } - RemoteDesignerWorkspaceInfo.RemoteDesignerWorkspaceInfoProcessor processor = ExtraDesignClassManager.getInstance().getSingle(RemoteDesignerWorkspaceInfo.RemoteDesignerWorkspaceInfoProcessor.XML_TAG); + RemoteDesignerWorkspaceInfoProcessor processor = ExtraDesignClassManager.getInstance().getSingle(RemoteDesignerWorkspaceInfoProcessor.XML_TAG); if (processor == null) { return workspaceInfo; } diff --git a/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java b/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java index 2ff139e04..39abe75cf 100644 --- a/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java +++ b/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java @@ -191,24 +191,4 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo { WorkContext.getConnector().validateVT(connection); return true; } - - /** - * 远程设计自定义用户名接口 - * - * @author John.Ying - * @since 11.0 - * Created on 2023/5/17 - */ - public interface RemoteDesignerWorkspaceInfoProcessor extends Immutable { - - String XML_TAG = "RemoteDesignerWorkspaceInfoProcessor"; - - int CURRENT_LEVEL = 1; - - /** - * 根据链接信息自定义用户名 - */ - WorkspaceConnectionInfo customUserName(WorkspaceConnectionInfo workspaceInfo); - - } } diff --git a/designer-base/src/main/java/com/fr/design/env/processor/AbstractRemoteDesignerWorkspaceInfoProcessor.java b/designer-base/src/main/java/com/fr/design/env/processor/AbstractRemoteDesignerWorkspaceInfoProcessor.java index 3c93d4f98..6917f1745 100644 --- a/designer-base/src/main/java/com/fr/design/env/processor/AbstractRemoteDesignerWorkspaceInfoProcessor.java +++ b/designer-base/src/main/java/com/fr/design/env/processor/AbstractRemoteDesignerWorkspaceInfoProcessor.java @@ -1,7 +1,5 @@ package com.fr.design.env.processor; - -import com.fr.design.env.RemoteDesignerWorkspaceInfo; import com.fr.stable.fun.mark.API; @@ -12,8 +10,8 @@ import com.fr.stable.fun.mark.API; * @since 11.0 * Created on 2023/5/17 */ -@API(level = RemoteDesignerWorkspaceInfo.RemoteDesignerWorkspaceInfoProcessor.CURRENT_LEVEL) -public abstract class AbstractRemoteDesignerWorkspaceInfoProcessor implements RemoteDesignerWorkspaceInfo.RemoteDesignerWorkspaceInfoProcessor { +@API(level = RemoteDesignerWorkspaceInfoProcessor.CURRENT_LEVEL) +public abstract class AbstractRemoteDesignerWorkspaceInfoProcessor implements RemoteDesignerWorkspaceInfoProcessor { @Override public int currentAPILevel() { return CURRENT_LEVEL; diff --git a/designer-base/src/main/java/com/fr/design/env/processor/RemoteDesignerWorkspaceInfoProcessor.java b/designer-base/src/main/java/com/fr/design/env/processor/RemoteDesignerWorkspaceInfoProcessor.java new file mode 100644 index 000000000..b74d21159 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/env/processor/RemoteDesignerWorkspaceInfoProcessor.java @@ -0,0 +1,25 @@ +package com.fr.design.env.processor; + +import com.fr.stable.fun.mark.Immutable; +import com.fr.workspace.connect.WorkspaceConnectionInfo; + +/** + * 远程设计自定义用户名接口 + * px:为了二开插件开的接口，不建议实现，后面可能会变动 + * + * @author John.Ying + * @since 11.0 + * Created on 2023/5/17 + */ +public interface RemoteDesignerWorkspaceInfoProcessor extends Immutable { + + String XML_TAG = "RemoteDesignerWorkspaceInfoProcessor"; + + int CURRENT_LEVEL = 1; + + /** + * 根据链接信息自定义用户名 + */ + WorkspaceConnectionInfo customUserName(WorkspaceConnectionInfo workspaceInfo); + +} diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java index b6dd07ce8..7be733b2b 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -5,6 +5,7 @@ import com.fr.design.ExtraDesignClassManager; import com.fr.design.beans.BasicBeanPane; import com.fr.design.border.UITitledBorder; import com.fr.design.env.RemoteDesignerWorkspaceInfo; +import com.fr.design.env.processor.RemoteDesignerWorkspaceInfoProcessor; import com.fr.design.fun.DesignerEnvProcessor; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icheckbox.UICheckBox; @@ -581,7 +582,7 @@ public class RemoteEnvPane extends BasicBeanPane { final RemoteDesignerWorkspaceInfo remoteEnv = updateBean(); WorkspaceConnectionInfo originalConnection = remoteEnv.getConnection(); final WorkspaceConnectionInfo connection; - RemoteDesignerWorkspaceInfo.RemoteDesignerWorkspaceInfoProcessor processor = ExtraDesignClassManager.getInstance().getSingle(RemoteDesignerWorkspaceInfo.RemoteDesignerWorkspaceInfoProcessor.XML_TAG); + RemoteDesignerWorkspaceInfoProcessor processor = ExtraDesignClassManager.getInstance().getSingle(RemoteDesignerWorkspaceInfoProcessor.XML_TAG); if (processor != null) { connection = processor.customUserName(originalConnection); } else {