From aa2f1279688fdf34d033b177bfbfe091b7a69c74 Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Sun, 11 Jun 2017 22:11:22 +0800
Subject: [PATCH] bug fix

---
 .../actions/server/ConnectionListAction.java     | 11 ++++++++++-
 .../data/datapane/connect/JDBCDefPane.java       | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java b/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java
index a91ab6af1..b8c42c978 100644
--- a/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java
+++ b/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java
@@ -9,6 +9,7 @@ import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.datapane.connect.ConnectionManagerPane;
 import com.fr.design.data.datapane.connect.ConnectionShowPane;
 import com.fr.design.data.datapane.connect.DatabaseConnectionPane;
+import com.fr.design.data.datapane.connect.JDBCDefPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
@@ -33,7 +34,15 @@ public class ConnectionListAction extends UpdateAction {
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
         this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_web/connection.png"));
-        this.setSearchText(new DatabaseConnectionPane.JDBC());
+        this.setSearchText(getContainer());
+    }
+
+    private JPanel getContainer() {
+        JPanel panel = new JPanel();
+        panel.add(new DatabaseConnectionPane.JDBC());
+        panel.add(new DatabaseConnectionPane.JNDI());
+        panel.add(new JDBCDefPane().getAllComponents());
+        return panel;
     }
 
     public static final MenuKeySet DEFINE_DATA_CONNECTION = new MenuKeySet() {
diff --git a/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java
index 07c5b9100..d836f849a 100644
--- a/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java
+++ b/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java
@@ -1,21 +1,21 @@
 package com.fr.design.data.datapane.connect;
 
-import com.fr.design.constants.UIConstants;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.pool.DBCPConnectionPoolAttr;
 import com.fr.design.border.UITitledBorder;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.editor.editor.IntegerEditor;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.ActionLabel;
 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.gui.ilable.ActionLabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.dialog.BasicPane;
-import com.fr.design.editor.editor.IntegerEditor;
 import com.fr.file.filter.ChooseFileFilter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
@@ -158,6 +158,11 @@ public class JDBCDefPane extends JPanel {
 		});
 	}
 
+	public JPanel getAllComponents() {
+		this.add(new DBCPAttrPane());
+		return this;
+	}
+
 	public void populate(JDBCDatabaseConnection jdbcDatabase) {
 		if (jdbcDatabase == null) {
 			jdbcDatabase = new JDBCDatabaseConnection();
@@ -315,7 +320,7 @@ public class JDBCDefPane extends JPanel {
 		return new DBCPAttrPane().showWindow(SwingUtilities.getWindowAncestor(JDBCDefPane.this));
 	}
 
-	class DBCPAttrPane extends BasicPane {
+	public class DBCPAttrPane extends BasicPane {
 		public DBCPAttrPane() {
 			JPanel defaultPane = this;
 
@@ -374,4 +379,5 @@ public class JDBCDefPane extends JPanel {
 		private String driver;
 		private String url;
 	}
+
 }
\ No newline at end of file