Merge pull request #508 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0

* commit 'b224ba62795436f8c94dc972eb2c6286e16aea2e':
  REPORT-11335 设计器数据库会显示上一个的记录

designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java

@@ -35,6 +35,7 @@ public class JDBCDefPane extends JPanel {
 	public static final String DRIVER_TYPE = "driver_type";
 	public static final String USER_NAME = "user_name";
     public static final int TIME_MULTIPLE = 1000;
+	private static final String EMPTY_DB = StringUtils.EMPTY;
 
 	private static Map<String, DriverURLName[]> jdbcMap = new HashMap<String, DriverURLName[]>();
 
@@ -64,7 +65,7 @@ public class JDBCDefPane extends JPanel {
 	private UITextField userNameTextField;
 	private JPasswordField passwordTextField;
 	// 请不要改动dbtype,只应该最后添加
-	private final String[] dbtype = {"", "Oracle", "DB2", "SQL Server", "MySQL", "Sybase", "Access", "Derby", "Postgre","SQLite","Inceptor", "Others"};
+	private final String[] dbtype = {EMPTY_DB, "Oracle", "DB2", "SQL Server", "MySQL", "Sybase", "Access", "Derby", "Postgre","SQLite","Inceptor", "Others"};
 
 	// carl:DBCP的一些属性
 	private IntegerEditor DBCP_INITIAL_SIZE = new IntegerEditor();
@@ -182,6 +183,9 @@ public class JDBCDefPane extends JPanel {
 					break;
 				}
 			}
+			if (!out) {
+				this.dbtypeComboBox.setSelectedItem(EMPTY_DB);
+			}
 		}
 		this.driverComboBox.setSelectedItem(jdbcDatabase.getDriver());
 		this.urlTextField.setText(jdbcDatabase.getURL());