Author: daceywang
Date: Wed Apr 1 10:06:55 2009
New Revision: 2964
Added:
trunk/src/ca/sqlpower/architect/swingui/DefaultColumnPanel.java
trunk/src/ca/sqlpower/architect/swingui/DefaultColumnUserSettings.java
Modified:
trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java
trunk/src/ca/sqlpower/architect/swingui/ColumnEditPanel.java
trunk/src/ca/sqlpower/architect/swingui/PreferencesEditor.java
trunk/src/ca/sqlpower/architect/swingui/messages.properties
Log:
1. Move the focusThenSelectAll method for JSpinner and renamed it to
SPSUtils.java so it can be used outside of Architect for JSpinner 2.Added
DefaultColumnPanel for user set the default column properties.
Modified: trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java (original)
+++ trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java Wed Apr 1
10:06:55 2009
@@ -59,6 +59,7 @@
import javax.swing.tree.TreePath;
import org.apache.log4j.Logger;
+import org.hsqldb.Types;
import ca.sqlpower.architect.ArchitectSession;
import ca.sqlpower.architect.CoreUserSettings;
@@ -111,6 +112,7 @@
import ca.sqlpower.architect.swingui.olap.action.ImportSchemaAction;
import ca.sqlpower.architect.swingui.olap.action.OLAPEditAction;
import ca.sqlpower.architect.swingui.olap.action.OLAPSchemaManagerAction;
+import ca.sqlpower.sqlobject.SQLColumn;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLDatabase;
import ca.sqlpower.sqlobject.undo.NotifyingUndoManager;
@@ -267,6 +269,16 @@
session.getUserSettings().getSwingSettings().setBoolean(ArchitectSwingUserSettings.SHOW_WELCOMESCREEN,
prefs.getBoolean(ArchitectSwingUserSettings.SHOW_WELCOMESCREEN, true));
+
SQLColumn.setDefaultName(prefs.get(DefaultColumnUserSettings.DEFAULT_COLUMN_NAME, "New
Column"));
+
SQLColumn.setDefaultType(prefs.getInt(DefaultColumnUserSettings.DEFAULT_COLUMN_TYPE,
Types.INTEGER));
+
SQLColumn.setDefaultPrec(prefs.getInt(DefaultColumnUserSettings.DEFAULT_COLUMN_PREC,
10));
+
SQLColumn.setDefaultScale(prefs.getInt(DefaultColumnUserSettings.DEFAULT_COLUMN_SCALE,
0));
+
SQLColumn.setDefaultInPK(prefs.getBoolean(DefaultColumnUserSettings.DEFAULT_COLUMN_INPK,
false));
+
SQLColumn.setDefaultNullable(prefs.getBoolean(DefaultColumnUserSettings.DEFAULT_COLUMN_NULLABLE,
false));
+
SQLColumn.setDefaultAutoInc(prefs.getBoolean(DefaultColumnUserSettings.DEFAULT_COLUMN_AUTOINC,
false));
+
SQLColumn.setDefaultRemarks(prefs.get(DefaultColumnUserSettings.DEFAULT_COLUMN_REMARKS, ""));
+
SQLColumn.setDefaultForDefaultValue(prefs.get(DefaultColumnUserSettings.DEFAULT_COLUMN_DEFAULT_VALUE, ""));
+
addComponentListener(new ComponentListener() {
public void componentHidden(ComponentEvent e) {
}
@@ -743,6 +755,16 @@
us.write();
prefs.put(ArchitectSession.PREFS_PL_INI_PATH,
session.getContext().getPlDotIniPath());
+
+ prefs.put(DefaultColumnUserSettings.DEFAULT_COLUMN_NAME,
SQLColumn.getDefaultName());
+ prefs.putInt(DefaultColumnUserSettings.DEFAULT_COLUMN_TYPE,
SQLColumn.getDefaultType());
+ prefs.putInt(DefaultColumnUserSettings.DEFAULT_COLUMN_PREC,
SQLColumn.getDefaultPrec());
+ prefs.putInt(DefaultColumnUserSettings.DEFAULT_COLUMN_SCALE,
SQLColumn.getDefaultScale());
+ prefs.putBoolean(DefaultColumnUserSettings.DEFAULT_COLUMN_INPK,
SQLColumn.isDefaultInPK());
+
prefs.putBoolean(DefaultColumnUserSettings.DEFAULT_COLUMN_NULLABLE,
SQLColumn.isDefaultNullable());
+ prefs.putBoolean(DefaultColumnUserSettings.DEFAULT_COLUMN_AUTOINC,
SQLColumn.isDefaultAutoInc());
+ prefs.put(DefaultColumnUserSettings.DEFAULT_COLUMN_REMARKS,
SQLColumn.getDefaultRemarks());
+ prefs.put(DefaultColumnUserSettings.DEFAULT_COLUMN_DEFAULT_VALUE,
SQLColumn.getDefaultForDefaultValue());
try {
session.getContext().getPlDotIni().write(new
File(session.getContext().getPlDotIniPath()));
} catch (IOException e) {
Modified: trunk/src/ca/sqlpower/architect/swingui/ColumnEditPanel.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/ColumnEditPanel.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/ColumnEditPanel.java Wed Apr 1
10:06:55 2009
@@ -70,6 +70,7 @@
import ca.sqlpower.sqlobject.SQLObjectUtils;
import ca.sqlpower.sqlobject.SQLType;
import ca.sqlpower.swingui.DataEntryPanel;
+import ca.sqlpower.swingui.SPSUtils;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
@@ -243,7 +244,7 @@
panel.add(colPrec = createPrecisionEditor(), cc.xy(2, row));
componentEnabledMap.put(colPrec, cb);
colPrec.addChangeListener(checkboxEnabler);
- focusThenSelectAll(colPrec);
+ SPSUtils.makeJSpinnerSelectAllTextOnFocus(colPrec);
cb = new JCheckBox();
if (cols.size() > 1) {
@@ -252,7 +253,7 @@
panel.add(colScale = createScaleEditor(), cc.xy(5, row++));
componentEnabledMap.put(colScale, cb);
colScale.addChangeListener(checkboxEnabler);
- focusThenSelectAll(colScale);
+ SPSUtils.makeJSpinnerSelectAllTextOnFocus(colScale);
layout.appendRow(RowSpec.decode("5dlu"));
row++;
@@ -443,7 +444,15 @@
updateComponent(colDefaultValue, col.getDefaultValue());
// TODO handle checkboxes
- colInPK.setSelected(col.getPrimaryKeySeq() != null);
+ if (col.getParentTable() == null) {
+ colInPK.setSelected(SQLColumn.isDefaultInPK());
+ logger.debug("new constructed column");
+ } else {
+ colInPK.setSelected(col.isPrimaryKey());
+ logger.debug("existing column");
+ }
+ logger.debug("Selected" + colInPK.isSelected());
+
colAutoInc.setSelected(col.isAutoIncrement());
updateComponent(colAutoIncSequenceName,
col.getAutoIncrementSequenceName());
@@ -811,36 +820,6 @@
}
};
- /**
- * When the spinner's textfield gains focus,it will be selected all.
- * The reason why not directly use .getTextField().selectAll() is it
- * doesn't work with JSpinner (though it's supposed to),So it is a bug
- * in java which they haven't solved yet. URL to this bug :
- * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4699955
- */
- private void focusThenSelectAll(JSpinner spinner) {
- JSpinner.DefaultEditor editor =
(JSpinner.DefaultEditor)spinner.getEditor();
- editor.getTextField().addFocusListener(new FocusAdapter() {
- public void focusGained(FocusEvent e) {
- if (logger.isDebugEnabled()) {
- logger.debug("Focus Gained: " + e);
- }
- if (e.getSource() instanceof JTextComponent) {
- final JTextComponent textComponent =
((JTextComponent)e.getSource());
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- textComponent.selectAll();
- }
- });
- }
- }
-
- public void focusLost(FocusEvent e) {
- if(logger.isDebugEnabled()) {
- logger.debug("Focus Lost:" + e);
- }
- }
- });
- }
+
}
Added: trunk/src/ca/sqlpower/architect/swingui/DefaultColumnPanel.java
==============================================================================
--- (empty file)
+++ trunk/src/ca/sqlpower/architect/swingui/DefaultColumnPanel.java Wed
Apr 1 10:06:55 2009
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2009, SQL Power Group Inc.
+ *
+ * This file is part of Power*Architect.
+ *
+ * Power*Architect is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Power*Architect is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package ca.sqlpower.architect.swingui;
+
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSpinner;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.UIManager;
+
+import org.apache.log4j.Logger;
+
+import ca.sqlpower.sqlobject.SQLColumn;
+import ca.sqlpower.sqlobject.SQLType;
+import ca.sqlpower.swingui.DataEntryPanel;
+import ca.sqlpower.swingui.SPSUtils;
+
+import com.jgoodies.forms.layout.CellConstraints;
+import com.jgoodies.forms.layout.FormLayout;
+import com.jgoodies.forms.layout.RowSpec;
+
+public class DefaultColumnPanel extends JPanel implements ActionListener,
DataEntryPanel {
+ private static final Logger logger =
Logger.getLogger(DefaultColumnPanel.class);
+
+ private static final Font TITLE_FONT =
UIManager.getFont("Label.font").deriveFont(Font.BOLD, 15f);
+
+ private JTextField colName;
+
+ private JComboBox colType;
+
+ private JSpinner colPrec;
+
+ private JSpinner colScale;
+
+ private JCheckBox colInPK;
+
+ private JCheckBox colNullable;
+
+ private JCheckBox colAutoInc;
+
+ private JTextArea colRemarks;
+
+ private JTextArea colDefault;
+
+ public DefaultColumnPanel(ArchitectSwingSessionContext context) {
+ setUp();
+ revertToUserSettings();
+ }
+
+ public void setUp(){
+ FormLayout layout = new FormLayout(
+ "30dlu, pref:grow, 20dlu, pref:grow, 30dlu",
+ "");
+ layout.setColumnGroups(new int[][] { { 2, 4 } } );
+ CellConstraints cc = new CellConstraints();
+
+ this.setLayout(layout);
+
+ int row = 1;
+
+ layout.appendRow(RowSpec.decode("10dlu"));
+ row++;
+
+ layout.appendRow(RowSpec.decode("p"));
+
add(makeTitle(Messages.getString("DefaultColumnPanel.explaination")),
cc.xyw(2, row++, 3)); //$NON-NLS-1$
+
+ layout.appendRow(RowSpec.decode("15dlu"));
+ row++;
+
+ layout.appendRow(RowSpec.decode("p"));
+ add(new
JLabel(Messages.getString("DefaultColumnPanel.name")),cc.xy(2,row));
+ add(new JLabel(Messages.getString("DefaultColumnPanel.type")),
cc.xy(4, row++)); //$NON-NLS-1$
+
+ layout.appendRow(RowSpec.decode("5dlu"));
+ row++;
+
+ layout.appendRow(RowSpec.decode("p"));
+ add(colName = new JTextField(), cc.xy(2, row));
+ colName.addComponentListener(new ComponentAdapter() {
+ @Override
+ public void componentShown(ComponentEvent e) {
+ colName.requestFocusInWindow();
+ }
+ });
+ colName.addFocusListener(new FocusAdapter() {
+ public void focusGained(FocusEvent e) {
+ if(logger.isDebugEnabled()) {
+ logger.debug("focus Gained : " + e);
+ }
+ colName.selectAll();
+ }
+ });
+
+ add(colType = new JComboBox(SQLType.getTypes()), cc.xy(4, row++));
+ colType.setSelectedItem(null);
+
+ layout.appendRow(RowSpec.decode("15dlu"));
+ row++;
+
+ layout.appendRow(RowSpec.decode("p"));
+ add(new
JLabel(Messages.getString("DefaultColumnPanel.precision")), cc.xy(2, row));
//$NON-NLS-1$
+ add(new JLabel(Messages.getString("DefaultColumnPanel.scale")),
cc.xy(4, row++)); //$NON-NLS-1$
+
+ layout.appendRow(RowSpec.decode("5dlu"));
+ row++;
+
+ layout.appendRow(RowSpec.decode("p"));
+ add(colPrec = new JSpinner(new SpinnerNumberModel(0, 0,
Integer.MAX_VALUE, 1)), cc.xy(2, row));
+ SPSUtils.makeJSpinnerSelectAllTextOnFocus(colPrec);
+
+ add(colScale = new JSpinner(new SpinnerNumberModel(0, 0,
Integer.MAX_VALUE, 1)), cc.xy(4, row++));
+ SPSUtils.makeJSpinnerSelectAllTextOnFocus(colScale);
+
+ layout.appendRow(RowSpec.decode("15dlu"));
+ row++;
+
+ layout.appendRow(RowSpec.decode("p"));
+ add(colInPK = new
JCheckBox(Messages.getString("DefaultColumnPanel.inPrimaryKey")), cc.xyw(2,
row++, 3)); //$NON-NLS-1$
+ colInPK.addActionListener(this);
+
+ layout.appendRow(RowSpec.decode("15dlu"));
+ row++;
+
+ layout.appendRow(RowSpec.decode("p"));
+ add(colNullable = new
JCheckBox(Messages.getString("DefaultColumnPanel.allowsNulls")), cc.xyw(2,
row++, 3)); //$NON-NLS-1$
+ colNullable.addActionListener(this);
+
+ layout.appendRow(RowSpec.decode("15dlu"));
+ row++;
+
+ layout.appendRow(RowSpec.decode("p"));
+ add(colAutoInc = new
JCheckBox(Messages.getString("DefaultColumnPanel.autoIncrement")),
cc.xyw(2, row++, 3)); //$NON-NLS-1$
+ colAutoInc.addActionListener(this);
+
+ layout.appendRow(RowSpec.decode("15dlu"));
+ row++;
+
+ layout.appendRow(RowSpec.decode("p"));
+ add(new JLabel(Messages.getString("DefaultColumnPanel.remarks")),
cc.xyw(2, row++, 4)); //$NON-NLS-1$
+
+ layout.appendRow(RowSpec.decode("5dlu"));
+ row++;
+
+ layout.appendRow(RowSpec.decode("p"));
+ add(new JScrollPane(colRemarks = new JTextArea()), cc.xyw(2,
row++, 3, "fill, fill"));
+ colRemarks.setRows(8);
+ colRemarks.setLineWrap(true);
+ colRemarks.setWrapStyleWord(true);
+
+ layout.appendRow(RowSpec.decode("15dlu"));
+ row++;
+
+ layout.appendRow(RowSpec.decode("p"));
+ add(new
JLabel(Messages.getString("DefaultColumnPanel.default")),cc.xyw(2, row++,
4));
+
+ layout.appendRow(RowSpec.decode("5dlu"));
+ row++;
+
+ layout.appendRow(RowSpec.decode("p"));
+ add(new JScrollPane(colDefault = new JTextArea()),cc.xyw(2, row++,
3));
+ colDefault.setLineWrap(false);
+
+ layout.appendRow(RowSpec.decode("15dlu"));
+ row++;
+
+ //TODO only give focus to column name if it's enabled?
+ colName.requestFocus();
+ colName.selectAll();
+
+ }
+
+ protected void revertToUserSettings() {
+ logger.debug("Reverting to default settings");
+ colName.setText(SQLColumn.getDefaultName());
+ colPrec.setValue(SQLColumn.getDefaultPrec());
+
colType.setSelectedItem(SQLType.getType(SQLColumn.getDefaultType()));
+ colScale.setValue(SQLColumn.getDefaultScale());
+ colInPK.setSelected(SQLColumn.isDefaultInPK());
+ colNullable.setSelected(SQLColumn.isDefaultNullable());
+ colAutoInc.setSelected(SQLColumn.isDefaultAutoInc());
+ colRemarks.setText(SQLColumn.getDefaultRemarks());
+ colDefault.setText(SQLColumn.getDefaultForDefaultValue());
+ updateComponents();
+ }
+
+ public boolean applyChanges() {
+ logger.debug("DefaultColumnPanel applyChanges");
+ logger.debug(colName.getText().trim().equals(""));
+ if (!colName.getText().trim().equals("")) {
+ SQLColumn.setDefaultName(colName.getText());
+ }
+ if (colType.getSelectedItem() != null) {
+
SQLColumn.setDefaultType(((SQLType)colType.getSelectedItem()).getType());
+ }
+ SQLColumn.setDefaultPrec((Integer)colPrec.getValue());
+ SQLColumn.setDefaultScale((Integer)colScale.getValue());
+ SQLColumn.setDefaultInPK(colInPK.isSelected());
+ SQLColumn.setDefaultNullable(colNullable.isSelected());
+ SQLColumn.setDefaultAutoInc(colAutoInc.isSelected());
+ SQLColumn.setDefaultRemarks(colRemarks.getText());
+ SQLColumn.setDefaultForDefaultValue(colDefault.getText());
+ return true;
+ }
+
+ public void discardChanges() {
+ revertToUserSettings();
+ }
+
+ public JComponent getPanel() {
+ return this;
+ }
+
+ public boolean hasUnsavedChanges() {
+ // TODO return whether this pane has been changed
+ return true;
+ }
+
+ private Component makeTitle(String string) {
+ JLabel label = new JLabel(string);
+ label.setFont(TITLE_FONT);
+ return label;
+ }
+
+ /**
+ * Implementation of ActionListener.
+ */
+ public void actionPerformed(ActionEvent e) {
+ logger.debug("action event " + e); //$NON-NLS-1$
+ updateComponents();
+ }
+
+
+ /**
+ * Examines the components and makes sure they're in a consistent state
+ * (they are legal with respect to the model).
+ */
+ private void updateComponents() {
+ // allow nulls is free unless column is in PK
+ if (colInPK.isSelected()) {
+ colNullable.setEnabled(false);
+ } else {
+ colNullable.setEnabled(true);
+ }
+
+ // primary key is free unless column allows nulls
+ if (colNullable.isSelected()) {
+ colInPK.setEnabled(false);
+ } else {
+ colInPK.setEnabled(true);
+ }
+
+ if (colInPK.isSelected() && colNullable.isSelected()) {
+ // this should not be physically possible
+ colNullable.setSelected(false);
+ colNullable.setEnabled(false);
+ }
+ if (colAutoInc.isSelected()) {
+ colDefault.setText(""); //$NON-NLS-1$
+ colDefault.setEnabled(false);
+ } else {
+ colDefault.setEnabled(true);
+ }
+ }
+
+}
Added:
trunk/src/ca/sqlpower/architect/swingui/DefaultColumnUserSettings.java
==============================================================================
--- (empty file)
+++ trunk/src/ca/sqlpower/architect/swingui/DefaultColumnUserSettings.java
Wed Apr 1 10:06:55 2009
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2009, SQL Power Group Inc.
+ *
+ * This file is part of Power*Architect.
+ *
+ * Power*Architect is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Power*Architect is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package ca.sqlpower.architect.swingui;
+
+import ca.sqlpower.architect.AbstractUserSetting;
+
+public class DefaultColumnUserSettings extends AbstractUserSetting {
+
+ // ----------PROPERTY LIST KEYS-------------
+
+ public static final String DEFAULT_COLUMN_NAME
= "DefaultColumnUserSettings.DEFAULT_COLUMN_NAME";
+
+ public static final String DEFAULT_COLUMN_TYPE
= "DefaultColumnUserSettings.DEFAULT_COLUMN_TYPE";
+
+ public static final String DEFAULT_COLUMN_PREC
= "DefaultColumnUserSettings.DEFAULT_COLUMN_PREC";
+
+ public static final String DEFAULT_COLUMN_SCALE
= "DefaultColumnUserSettings.DEFAULT_COLUMN_SCALE";
+
+ public static final String DEFAULT_COLUMN_INPK
= "DefaultColumnUserSettings.DEFAULT_COLUMN_INPK";
+
+ public static final String DEFAULT_COLUMN_NULLABLE
= "DefaultColumnUserSettings.DEFAULT_COLUMN_NULLABLE";
+
+ public static final String DEFAULT_COLUMN_AUTOINC
= "DefaultColumnUserSettings.DEFAULT_COLUMN_AUTOINC";
+
+ public static final String DEFAULT_COLUMN_REMARKS
= "DefaultColumnUserSettings.DEFAULT_COLUMN_REMARKS";
+
+ public static final String DEFAULT_COLUMN_DEFAULT_VALUE
= "DefaultColumnUserSettings.DEFAULT_COLUMN_DEFAULT_VALUE";
+
+ // ----------CONSTRUCTORS/FACTORIES--------------
+
+ public DefaultColumnUserSettings() {
+ super();
+ }
+
+}
Modified: trunk/src/ca/sqlpower/architect/swingui/PreferencesEditor.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/PreferencesEditor.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/PreferencesEditor.java Wed Apr
1 10:06:55 2009
@@ -92,6 +92,10 @@
dsTypeEditor.addTab(Messages.getString("PreferencesEditor.propertiesSection"),
architectPropPanel);
tp.add(Messages.getString("PreferencesEditor.jdbcDriversSection"),
dsTypeEditor.getPanel()); //$NON-NLS-1$
+
+ final DefaultColumnPanel defaultColumnPanel = new
DefaultColumnPanel(context);
+
tp.add(Messages.getString("PreferencesEditor.defaultColumnSection"),defaultColumnPanel);
+
JDefaultButton okButton = new
JDefaultButton(DataEntryPanelBuilder.OK_BUTTON_LABEL);
@@ -99,6 +103,7 @@
public void actionPerformed(ActionEvent evt) {
prefPanel.applyChanges();
dsTypeEditor.applyChanges();
+ defaultColumnPanel.applyChanges();
d.setVisible(false);
}
});
@@ -107,6 +112,7 @@
public void actionPerformed(ActionEvent evt) {
prefPanel.discardChanges();
dsTypeEditor.discardChanges();
+ defaultColumnPanel.discardChanges();
d.setVisible(false);
}
};
Modified: trunk/src/ca/sqlpower/architect/swingui/messages.properties
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/messages.properties (original)
+++ trunk/src/ca/sqlpower/architect/swingui/messages.properties Wed Apr 1
10:06:55 2009
@@ -173,6 +173,16 @@
DDLExportPanel.targetCatalog=Target Catalog
DDLExportPanel.targetDatabase=(Target Database)
DDLExportPanel.targetSchema=Target Schema
+DefaultColumnPanel.allowsNulls=Column Allows Nulls By Default
+DefaultColumnPanel.autoIncrement=Column Auto Increment By Default
+DefaultColumnPanel.default=Value By Default
+DefaultColumnPanel.explaination=Edit Default Column Properties
+DefaultColumnPanel.inPrimaryKey=Column In Primary Key By Default
+DefaultColumnPanel.name=Column Name By Default
+DefaultColumnPanel.precision=Column Precision By Default
+DefaultColumnPanel.remarks=Column Reamrks By Default
+DefaultColumnPanel.scale=Column Scale By Default
+DefaultColumnPanel.type=Column Type By Default
IndexColumnTable.ascendingDescendingTableColumnName=Asc/Des
IndexColumnTable.columnTableColumnName=Column
IndexColumnTable.indexTableColumnName=In Index
@@ -218,6 +228,7 @@
PlayPen.straightenLinesActionName=Straighten Lines
PreferencesEditor.generalSection=General
PreferencesEditor.jdbcDriversSection=JDBC Drivers
+PreferencesEditor.defaultColumnSection=Default Column Settings
PreferencesEditor.kettleSection=Kettle
PreferencesEditor.userPreferencesDialogTitle=User Preferences
PreferencesPanel.browseButton=Browse...
