From 9538343cc8b7de5b56a9c897ab60f56fca15e04a Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Fri, 6 Mar 2020 15:36:41 +0800
Subject: [PATCH] REPORT-27732 && REPORT-27743 REPORT-27457

---
 .../mainframe/loghandler/LogDetailPane.java   |  3 ++-
 .../main/java/com/fr/env/RemoteEnvPane.java   | 25 ++++++++-----------
 .../java/com/fr/file/FILEChooserPane.java     |  6 ++++-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogDetailPane.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogDetailPane.java
index 5ea260f46..0ed638616 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogDetailPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogDetailPane.java
@@ -6,6 +6,7 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.gui.GUICoreUtils;
 
 public class LogDetailPane extends JPanel{
@@ -20,7 +21,7 @@ public class LogDetailPane extends JPanel{
 		fr.setSize(600, 400);
 		GUICoreUtils.centerWindow(fr);
 		fr.setResizable(false);
-		fr.setTitle("日志");
+		fr.setTitle(Toolkit.i18nText("Fine-Design_Basic_Log"));
 		fr.setIconImage(BaseUtils.readImageWithCache("com/fr/design/images/buttonicon/history.png"));
 		fr.getContentPane().setLayout(new BorderLayout());
 		fr.getContentPane().add(this, BorderLayout.CENTER);
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 4871bb769..2e0c65cb9 100644
--- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
+++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
@@ -10,12 +10,14 @@ import com.fr.design.env.RemoteDesignerWorkspaceInfo;
 import com.fr.design.fun.DesignerEnvProcessor;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ipasswordfield.UIPassWordField;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
 import com.fr.design.scrollruler.ModLineBorder;
 import com.fr.license.exception.RegistEditionException;
 import com.fr.log.FineLoggerFactory;
@@ -25,20 +27,12 @@ import com.fr.workspace.WorkContext;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
 import com.fr.workspace.engine.exception.WorkspaceAuthException;
 
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
-import javax.swing.JDialog;
-import javax.swing.JFileChooser;
-import javax.swing.JPanel;
-import javax.swing.JTextPane;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.SwingWorker;
-import javax.swing.ToolTipManager;
-import javax.swing.UIManager;
+import javax.swing.*;
 import javax.swing.border.EmptyBorder;
+import javax.swing.border.MatteBorder;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.plaf.ColorUIResource;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -295,10 +289,13 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
 
         contentPanel.add(configPanel, BorderLayout.NORTH);
         contentPanel.add(accountPanel, BorderLayout.CENTER);
-
+        JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        panel.add(contentPanel, BorderLayout.NORTH);
+        panel.add(testPanel, BorderLayout.CENTER);
+        panel.setPreferredSize(new Dimension(440, 600));
+        UIScrollPane scrollPane = new UIScrollPane(panel);
         this.setLayout(new BorderLayout());
-        this.add(contentPanel, BorderLayout.NORTH);
-        this.add(testPanel, BorderLayout.CENTER);
+        this.add(scrollPane);
     }
 
     @Override
diff --git a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
index ac76405d9..01d0cf251 100644
--- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
+++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
@@ -502,7 +502,11 @@ public class FILEChooserPane extends BasicPane {
         String fileNameWithOutExtension = fileName.substring(0, lastDotIndex);
         String fileNameExtension = fileName.substring(lastDotIndex);
         FileExtension fileExtension = FileExtension.parse(fileNameExtension);
-        if (StringUtils.isEmpty(fileName) || StringUtils.isEmpty(filterExtension) || fileFilter.containsExtension(fileExtension.getExtension())) {
+        boolean accept = StringUtils.isEmpty(fileName)
+                        || StringUtils.isEmpty(filterExtension)
+                        || fileFilter.containsExtension(fileExtension.getExtension())
+                        || !ComparatorUtils.equals(fileNameExtension, filterExtension);
+        if (accept) {
             return fileName;
         }
         return fileNameWithOutExtension + filterExtension;