Revision: 3945
Author: [email protected]
Date: Wed Sep 8 09:07:07 2010
Log: Fix core class import to outer gui/enterprise/OLAP components
(DefaultColumnUserSettings)
http://code.google.com/p/power-architect/source/detail?r=3945
Modified:
/trunk/src/main/java/ca/sqlpower/architect/ArchitectSessionContextImpl.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/DefaultColumnUserSettings.java
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/ArchitectSessionContextImpl.java
Mon Jul 12 14:17:47 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/ArchitectSessionContextImpl.java
Wed Sep 8 09:07:07 2010
@@ -22,7 +22,6 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.sql.Types;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
@@ -31,7 +30,6 @@
import org.apache.log4j.Logger;
-import ca.sqlpower.architect.swingui.DefaultColumnUserSettings;
import ca.sqlpower.enterprise.client.SPServerInfo;
import ca.sqlpower.enterprise.client.SPServerInfoManager;
import ca.sqlpower.sql.DataSourceCollection;
@@ -39,7 +37,6 @@
import ca.sqlpower.sql.PlDotIni;
import ca.sqlpower.sql.SPDataSource;
import ca.sqlpower.sql.SpecificDataSourceCollection;
-import ca.sqlpower.sqlobject.SQLColumn;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLObjectRuntimeException;
import ca.sqlpower.util.Version;
@@ -136,15 +133,8 @@
serverManager = new
SPServerInfoManager(getPrefs().node("servers"), new Version(
ArchitectVersion.APP_FULL_VERSION.toString()),
defaultSettings);
-
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, ""));
+
+
}
public ArchitectSession createSession() throws SQLObjectException {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Fri Sep 3 14:03:29 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Wed Sep 8 09:07:07 2010
@@ -625,6 +625,7 @@
currentSession = session;
UserSettings sprefs = context.getUserSettings().getSwingSettings();
+ DefaultColumnUserSettings.setColumnDefaults();
int accelMask =
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
// Create actions
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/DefaultColumnUserSettings.java
Wed Apr 1 10:06:55 2009
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/DefaultColumnUserSettings.java
Wed Sep 8 09:07:07 2010
@@ -19,12 +19,19 @@
package ca.sqlpower.architect.swingui;
+import java.util.prefs.Preferences;
+
import ca.sqlpower.architect.AbstractUserSetting;
+import ca.sqlpower.architect.ArchitectSessionContextImpl;
+import ca.sqlpower.sqlobject.SQLColumn;
+import java.sql.Types;
public class DefaultColumnUserSettings extends AbstractUserSetting {
// ----------PROPERTY LIST KEYS-------------
+ private static final Preferences prefs =
Preferences.userNodeForPackage(ArchitectSessionContextImpl.class);
+
public static final String DEFAULT_COLUMN_NAME
= "DefaultColumnUserSettings.DEFAULT_COLUMN_NAME";
public static final String DEFAULT_COLUMN_TYPE
= "DefaultColumnUserSettings.DEFAULT_COLUMN_TYPE";
@@ -48,5 +55,17 @@
public DefaultColumnUserSettings() {
super();
}
-
-}
+
+ public static void setColumnDefaults()
+ {
+
SQLColumn.setDefaultName(prefs.get(DefaultColumnUserSettings.DEFAULT_COLUMN_NAME, "New
Column"));
+
SQLColumn.setDefaultType(prefs.getInt(DefaultColumnUserSettings.DEFAULT_COLUMN_TYPE,
Types.VARCHAR));
+
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, ""));
+ }
+}
