From 20f8de54d6089da90214b8e538284358df9075b7 Mon Sep 17 00:00:00 2001
From: pengda <pengda@fanruan.com>
Date: Wed, 21 Apr 2021 10:57:51 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-51292=20mongodb=E6=8F=92=E4=BB=B6-featur?=
 =?UTF-8?q?e=E5=88=86=E6=94=AF=E4=B8=8B=E7=82=B9=E5=87=BB=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=E5=90=8E=E4=BF=9D=E5=AD=98=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datapane/connect/DatabaseConnectionPane.java   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
index 3e1e1f5315..61988cc69a 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
@@ -73,6 +73,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     private UIComboBox charSetComboBox;
     private String originalCharSet = null;
 
+    private JPanel mainPanel;
     // Database pane
     public DatabaseConnectionPane() {
         this.initComponents();
@@ -248,7 +249,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     @Override
     public void populateBean(com.fr.data.impl.Connection ob) {
         populateSubDatabaseConnectionBean((E) ob);
-        if (mainPanel() instanceof JDBCDefPane) {
+        if (mainPanel instanceof JDBCDefPane) {
             return;
         }
         this.originalCharSet = ob.getOriginalCharsetName();
@@ -264,7 +265,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     @Override
     public com.fr.data.impl.Connection updateBean() {
         E ob = updateSubDatabaseConnectionBean();
-        if (mainPanel() instanceof JDBCDefPane) {
+        if (mainPanel instanceof JDBCDefPane) {
             return ob;
         }
         ob.setOriginalCharsetName(this.originalCharSet);
@@ -306,13 +307,14 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         testPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 3, 4));
 
         // Center
-        northPane.add(mainPanel(), BorderLayout.CENTER);
+        mainPanel = mainPanel();
+        northPane.add(mainPanel, BorderLayout.CENTER);
         JPanel advancedPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
         advancedPanel.setBorder(BorderFactory.createTitledBorder(
                 new ModLineBorder(ModLineBorder.TOP),
                 Toolkit.i18nText("Fine-Design_Basic_Advanced")
         ));
-        if (mainPanel() instanceof JDBCDefPane) {
+        if (mainPanel instanceof JDBCDefPane) {
             ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
             actionLabel.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent evt) {
@@ -340,7 +342,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     }
 
     private JDialog createJDialog() {
-        return JDBC.getAdvancedAttrPane() != null ? JDBC.getAdvancedAttrPane().showWindow(SwingUtilities.getWindowAncestor(mainPanel())) : null;
+        return JDBC.getAdvancedAttrPane() != null ? JDBC.getAdvancedAttrPane().showWindow(SwingUtilities.getWindowAncestor(mainPanel)) : null;
     }
 
     private void initDialogPane() {
@@ -420,7 +422,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         private static JNDIDefPane jndiDefPane = new JNDIDefPane();
 
         @Override
-        protected JPanel mainPanel() {
+        protected JPanel  mainPanel() {
             return jndiDefPane;
         }