Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~alex.sung/design into release/10.0

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

@@ -35,12 +35,12 @@ 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 final String OTHER_DB = "Others";
 
 	private static Map<String, DriverURLName[]> jdbcMap = new HashMap<String, DriverURLName[]>();
 
 	static {
-		jdbcMap.put("Others", new DriverURLName[]{new DriverURLName("sun.jdbc.odbc.JdbcOdbcDriver", "jdbc:odbc:"),
+		jdbcMap.put(OTHER_DB, new DriverURLName[]{new DriverURLName("sun.jdbc.odbc.JdbcOdbcDriver", "jdbc:odbc:"),
 				new DriverURLName("org.hsqldb.jdbcDriver", "jdbc:hsqldb:file:[PATH_TO_DB_FILES]"), new DriverURLName("com.inet.tds.TdsDriver", "jdbc:inetdae7:localhost:1433/"),
 				new DriverURLName("COM.cloudscape.JDBCDriver", "jdbc:cloudscape:/cloudscape/"),
 				new DriverURLName("com.internetcds.jdbc.tds.Driver", "jdbc:freetds:sqlserver://localhost/")});
@@ -65,7 +65,7 @@ public class JDBCDefPane extends JPanel {
 	private UITextField userNameTextField;
 	private JPasswordField passwordTextField;
 	// 请不要改动dbtype,只应该最后添加
-	private final String[] dbtype = {EMPTY_DB, "Oracle", "DB2", "SQL Server", "MySQL", "Sybase", "Access", "Derby", "Postgre","SQLite","Inceptor", "Others"};
+	private final String[] dbtype = {"Oracle", "DB2", "SQL Server", "MySQL", "Sybase", "Access", "Derby", "Postgre","SQLite","Inceptor", OTHER_DB};
 
 	// carl:DBCP的一些属性
 	private IntegerEditor DBCP_INITIAL_SIZE = new IntegerEditor();
@@ -184,7 +184,7 @@ public class JDBCDefPane extends JPanel {
 				}
 			}
 			if (!out) {
-				this.dbtypeComboBox.setSelectedItem(EMPTY_DB);
+				this.dbtypeComboBox.setSelectedItem(OTHER_DB);
 			}
 		}
 		this.driverComboBox.setSelectedItem(jdbcDatabase.getDriver());