From 464498dfa7e01be75c418dd14a63809aadd44dbc Mon Sep 17 00:00:00 2001 From: ju Date: Thu, 5 Jul 2018 11:27:40 +0800 Subject: [PATCH 1/3] REPORT-9423 --- designer-base/src/com/fr/design/env/RemoteWorkspace.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/designer-base/src/com/fr/design/env/RemoteWorkspace.java b/designer-base/src/com/fr/design/env/RemoteWorkspace.java index 9007ac5aa..49f0595e7 100644 --- a/designer-base/src/com/fr/design/env/RemoteWorkspace.java +++ b/designer-base/src/com/fr/design/env/RemoteWorkspace.java @@ -1,8 +1,7 @@ package com.fr.design.env; import com.fr.env.operator.decision.DecisionOperator; -import com.fr.general.Inter; -import com.fr.report.util.RemoteDesignAuthenticateUtils; +import com.fr.locale.InterProviderFactory; import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; import com.fr.workspace.connect.WorkspaceClient; @@ -41,8 +40,8 @@ public class RemoteWorkspace implements Workspace { @Override public String getDescription() { - - return userName + "@" + "[" + Inter.getLocText("Fine-Designer_Basic_Remote_Env") + "]"; + + return InterProviderFactory.getProvider().getLocText("Fine-Designer_Basic_Remote_Env"); } @Override From 0236bf4c9de46ed67e50dbdea035846d0be94337 Mon Sep 17 00:00:00 2001 From: ju Date: Thu, 5 Jul 2018 13:52:09 +0800 Subject: [PATCH 2/3] REPORT-9423 --- designer-base/src/com/fr/env/EnvListPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/com/fr/env/EnvListPane.java b/designer-base/src/com/fr/env/EnvListPane.java index 57fea46de..3cd8b3c8c 100644 --- a/designer-base/src/com/fr/env/EnvListPane.java +++ b/designer-base/src/com/fr/env/EnvListPane.java @@ -58,7 +58,7 @@ public class EnvListPane extends JListControlPane { */ @Override public NameableCreator[] createNameableCreators() { - NameableCreator local = new NameObjectCreator(Inter.getLocText("Env-Local_Directory"), "com/fr/design/images/data/bind/localconnect.png", + NameableCreator local = new NameObjectCreator(Inter.getLocText("FR-Engine-Local_Workspace"), "com/fr/design/images/data/bind/localconnect.png", LocalDesignerWorkspaceInfo.class, LocalEnvPane.class); NameableCreator remote = new NameObjectCreator(Inter.getLocText("Env-Remote_Server"), "com/fr/design/images/data/bind/distanceconnect.png", RemoteDesignerWorkspaceInfo.class, RemoteEnvPane.class); From 279904b60508c99917a249552845324fc5fc8fd1 Mon Sep 17 00:00:00 2001 From: ju Date: Thu, 5 Jul 2018 14:39:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-9423=20=E8=B7=9F=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E7=9B=B8=E5=85=B3=E7=9A=84=E9=80=BB=E8=BE=91=E5=92=8C?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=83=BD=E7=A7=BB=E5=8A=A8=E5=88=B0=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/env/RemoteWorkspace.java | 18 +----------------- .../com/fr/design/mainframe/DesignerFrame.java | 9 ++++++++- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/designer-base/src/com/fr/design/env/RemoteWorkspace.java b/designer-base/src/com/fr/design/env/RemoteWorkspace.java index 49f0595e7..4994dcc5f 100644 --- a/designer-base/src/com/fr/design/env/RemoteWorkspace.java +++ b/designer-base/src/com/fr/design/env/RemoteWorkspace.java @@ -1,7 +1,6 @@ package com.fr.design.env; import com.fr.env.operator.decision.DecisionOperator; -import com.fr.locale.InterProviderFactory; import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; import com.fr.workspace.connect.WorkspaceClient; @@ -16,20 +15,11 @@ public class RemoteWorkspace implements Workspace { private final WorkspaceClient client; private final String address; - - private final String userName; - + RemoteWorkspace(WorkspaceClient client, WorkspaceConnection connection) { this.client = client; this.address = connection.getUrl(); - this.userName = connection.getUserName(); - } - - @Override - public String getName() { - - return userName; } @Override @@ -37,13 +27,7 @@ public class RemoteWorkspace implements Workspace { return address; } - - @Override - public String getDescription() { - return InterProviderFactory.getProvider().getLocText("Fine-Designer_Basic_Remote_Env"); - } - @Override public boolean isWarDeploy() { diff --git a/designer-base/src/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/com/fr/design/mainframe/DesignerFrame.java index f4766b798..13b40ef53 100644 --- a/designer-base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer-base/src/com/fr/design/mainframe/DesignerFrame.java @@ -12,6 +12,7 @@ import com.fr.design.actions.core.ActionFactory; import com.fr.design.constants.UIConstants; import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.datapane.TableDataTreePane; +import com.fr.design.env.DesignerWorkspaceInfo; import com.fr.design.event.DesignerOpenedListener; import com.fr.design.event.TargetModifiedEvent; import com.fr.design.event.TargetModifiedListener; @@ -40,6 +41,7 @@ import com.fr.file.FileNodeFILE; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; import com.fr.general.Inter; +import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginContext; import com.fr.plugin.injectable.PluginModule; @@ -654,7 +656,12 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta String envName = DesignerEnvManager.getEnvManager().getCurEnvName(); Workspace workspace = WorkContext.getCurrent(); if (workspace != null) { - defaultTitleSB.append(workspace.getDescription()); + if (workspace.isLocal()) { + defaultTitleSB.append("@").append(envName).append("[").append(InterProviderFactory.getProvider().getLocText("FR-Engine-Local_Workspace")).append("]"); + } else { + DesignerWorkspaceInfo info = DesignerEnvManager.getEnvManager().getWorkspaceInfo(envName); + defaultTitleSB.append(info.getName()).append("@").append(envName).append("[").append(InterProviderFactory.getProvider().getLocText("Fine-Designer_Basic_Remote_Env")).append("]"); + } if (editingTemplate != null) { String path = editingTemplate.getEditingFILE().getPath(); if (!editingTemplate.getEditingFILE().exists()) {