Author: daceywang
Date: Wed Apr 1 11:48:49 2009
New Revision: 2965
Modified:
trunk/src/ca/sqlpower/architect/swingui/DefaultColumnPanel.java
Log:
By default, the default column name is set to "New_Column".So if user set
the default column name to empty string, then the name of new created
column will be set to the empty string, i.e, whatever the user set for the
default column name.
Modified: trunk/src/ca/sqlpower/architect/swingui/DefaultColumnPanel.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/DefaultColumnPanel.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/DefaultColumnPanel.java Wed
Apr 1 11:48:49 2009
@@ -27,6 +27,7 @@
import java.awt.event.ComponentEvent;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
+import java.sql.Types;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
@@ -218,11 +219,11 @@
public boolean applyChanges() {
logger.debug("DefaultColumnPanel applyChanges");
logger.debug(colName.getText().trim().equals(""));
- if (!colName.getText().trim().equals("")) {
- SQLColumn.setDefaultName(colName.getText());
- }
+ SQLColumn.setDefaultName(colName.getText());
if (colType.getSelectedItem() != null) {
SQLColumn.setDefaultType(((SQLType)colType.getSelectedItem()).getType());
+ } else {
+ SQLColumn.setDefaultType(Types.INTEGER);
}
SQLColumn.setDefaultPrec((Integer)colPrec.getValue());
SQLColumn.setDefaultScale((Integer)colScale.getValue());