From eb99b89c1e1a8eaf597a1168e777c935aa7fd829 Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Fri, 3 Aug 2018 10:59:51 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-10263=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E6=9D=83=E9=99=90=E9=AA=8C=E6=94=B6=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?1=EF=BC=8C2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/env/RemoteEnvPane.java   | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

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 a49779ea4..e66eb699d 100644
--- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
+++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
@@ -1,5 +1,7 @@
 package com.fr.env;
 
+import com.fr.base.FRContext;
+import com.fr.base.ServerConfig;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.border.UITitledBorder;
@@ -12,7 +14,7 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.scrollruler.ModLineBorder;
-
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.third.guava.base.Strings;
 import com.fr.workspace.WorkContext;
@@ -193,6 +195,10 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
             fillIndividualField();
         }
     };
+    /**
+     * 测试链接对话框确定取消按钮面板
+     */
+    private JPanel dialogDownPane = new JPanel();
 
 
     public RemoteEnvPane() {
@@ -381,6 +387,16 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                 new double[]{PREFERRED, PREFERRED, PREFERRED, PREFERRED},
                 new double[]{FILL}
         ));
+
+        setDefaultAppAndServlet();
+    }
+
+    /**
+     * 设置 app 和 servlet 默认值
+     */
+    private void setDefaultAppAndServlet() {
+        webAppNameInput.setText(FRContext.getCommonOperator().getAppName());
+        servletNameInput.setText(ServerConfig.getInstance().getServletName());
     }
 
 
@@ -512,21 +528,28 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                     } else {
                         message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed"));
                         uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
+
                     }
                 } catch (InterruptedException | ExecutionException e) {
+                    FineLoggerFactory.getLogger().error(e, e.getMessage());
                     message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed"));
                     uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
                 }
+                dialogDownPane.remove(cancelButton);
+                dialogDownPane.revalidate();
+                dialogDownPane.repaint();
             }
         };
         worker.execute();
         initMessageDialog();
         okButton.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 dialog.dispose();
             }
         });
         cancelButton.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 dialog.dispose();
                 worker.cancel(true);
@@ -534,6 +557,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
         });
 
         dialog.addWindowListener(new WindowAdapter() {
+            @Override
             public void windowClosed(WindowEvent e) {
                 worker.cancel(true);
             }
@@ -554,17 +578,17 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
         okButton.setEnabled(false);
         JPanel jp = new JPanel();
         JPanel upPane = new JPanel();
-        JPanel downPane = new JPanel();
+        dialogDownPane = new JPanel();
         uiLabel = new UILabel(UIManager.getIcon("OptionPane.informationIcon"));
         upPane.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 10));
         upPane.add(uiLabel);
         upPane.add(message);
-        downPane.setLayout(new FlowLayout(FlowLayout.CENTER, 6, 0));
-        downPane.add(okButton);
-        downPane.add(cancelButton);
+        dialogDownPane.setLayout(new FlowLayout(FlowLayout.CENTER, 6, 0));
+        dialogDownPane.add(okButton);
+        dialogDownPane.add(cancelButton);
         jp.setLayout(new BoxLayout(jp, BoxLayout.Y_AXIS));
         jp.add(upPane);
-        jp.add(downPane);
+        jp.add(dialogDownPane);
         dialog.add(jp);
         dialog.setResizable(false);
         dialog.setLocationRelativeTo(SwingUtilities.getWindowAncestor(RemoteEnvPane.this));