From 9d5157989f480d9afa1810ec1e695cf9123828b8 Mon Sep 17 00:00:00 2001 From: hzzz Date: Thu, 19 Jul 2018 14:06:41 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-9856=E3=80=9010.0=E4=BA=8C=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92=E3=80=91=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=AF=86=E7=A0=81=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=97=B6=E6=8F=90=E7=A4=BA=E4=B8=8D=E6=98=8E=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/actions/file/SwitchExistEnv.java | 2 +- .../java/com/fr/design/mainframe/TemplatePane.java | 2 +- .../src/main/java/com/fr/env/RemoteEnvPane.java | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index a3d940fc3c..dcfb954d59 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java @@ -125,7 +125,7 @@ public class SwitchExistEnv extends MenuDef { } }); } catch (AuthException exception) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"Fine-Designer_Basic_Remote_Connect_Auth_Failed", "Failed"}), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"Fine-Designer_Basic_Remote_Connect_Auth_Failed"}), null, 0, UIManager.getIcon("OptionPane.errorIcon")); } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java index e9bdce2675..6da82863eb 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java @@ -153,7 +153,7 @@ public class TemplatePane extends JPanel implements MouseListener { } setJLabel(selectedName); } catch (AuthException e) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"Fine-Designer_Basic_Remote_Connect_Auth_Failed", "Failed"}), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"Fine-Designer_Basic_Remote_Connect_Auth_Failed"}), null, 0, UIManager.getIcon("OptionPane.errorIcon")); return false; } 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 68945319f8..7087c97856 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -16,12 +16,14 @@ import com.fr.general.Inter; import com.fr.stable.StringUtils; import com.fr.third.guava.base.Strings; import com.fr.workspace.WorkContext; +import com.fr.workspace.connect.AuthException; import com.fr.workspace.connect.WorkspaceConnection; import javax.swing.BorderFactory; import javax.swing.BoxLayout; import javax.swing.JDialog; import javax.swing.JFileChooser; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTextPane; import javax.swing.SwingConstants; @@ -488,8 +490,13 @@ public class RemoteEnvPane extends BasicBeanPane { WorkspaceConnection connection = remoteEnv.getConnection(); DesignerEnvManager.getEnvManager().setCertificatePath(connection.getCertPath()); DesignerEnvManager.getEnvManager().setCertificatePass(connection.getCertSecretKey()); - - return WorkContext.getConnector().testConnection(connection); + try { + return WorkContext.getConnector().testConnection(connection); + } catch (AuthException e) { + message.setText(Inter.getLocText("Fine-Designer_Basic_Remote_Connect_Auth_Failed")); + uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); + return null; + } } @Override