[power-architect] r3196 committed - Removed SQLObject.getChildType() and one constructor from SQLObjectCom...

Tue, 01 Dec 2009 15:31:25 -0800 

Revision: 3196
Author: [email protected]
Date: Tue Dec  1 15:00:36 2009
Log: Removed SQLObject.getChildType() and one constructor from SQLObjectComboBoxModel. 
Fixed several compile errors.
http://code.google.com/p/power-architect/source/detail?r=3196

Modified:
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/SQLObjectComboBoxModel.java /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/olap/DimensionEditPanel.java /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/olap/DimensionUsageEditPanel.java /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/olap/LevelEditPanel.java /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/olap/SchemaEditPanel.java 

=======================================
--- /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/SQLObjectComboBoxModel.java Tue Dec 1 14:21:17 2009 +++ /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/SQLObjectComboBoxModel.java Tue Dec 1 15:00:36 2009 
@@ -47,10 +47,6 @@
private final List<ListDataListener> listDataListeners = new ArrayList<ListDataListener>(); 

-    public SQLObjectComboBoxModel(SQLObject parent) {
-        this(parent, parent.getChildType());
-    }
-
public SQLObjectComboBoxModel(SQLObject parent, Class<? extends SQLObject> childType) { 
         this.parent = parent;
         this.childType = childType;
=======================================
--- /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/olap/DimensionEditPanel.java Tue Dec 1 14:55:22 2009 +++ /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/olap/DimensionEditPanel.java Tue Dec 1 15:00:36 2009 
@@ -108,7 +108,7 @@
foreignKeyChooser.addItem("Parent Cube Fact table has no columns"); 
                 foreignKeyChooser.setEnabled(false);
             } else {
- foreignKeyChooser.setModel(new SQLObjectComboBoxModel(factTable)); + foreignKeyChooser.setModel(new SQLObjectComboBoxModel(factTable, SQLColumn.class)); 
                 for (SQLColumn col : factTable.getColumns()) {
                     if (col.getName().equals(dimension.getForeignKey())) {
                         foreignKeyChooser.setSelectedItem(col);
=======================================
--- /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/olap/DimensionUsageEditPanel.java Tue Dec 1 14:55:22 2009 +++ /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/olap/DimensionUsageEditPanel.java Tue Dec 1 15:00:36 2009 
@@ -82,7 +82,7 @@
foreignKeyChooser.addItem("Parent Cube Fact table has no columns"); 
             foreignKeyChooser.setEnabled(false);
         } else {
- foreignKeyChooser.setModel(new SQLObjectComboBoxModel(factTable)); + foreignKeyChooser.setModel(new SQLObjectComboBoxModel(factTable, SQLColumn.class)); 
             for (SQLColumn col : factTable.getColumns()) {
                 if (col.getName().equals(dimensionUsage.getForeignKey())) {
                     foreignKeyChooser.setSelectedItem(col);
=======================================
--- /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/olap/LevelEditPanel.java Mon Jul 6 13:49:18 2009 +++ /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/olap/LevelEditPanel.java Tue Dec 1 15:00:36 2009 
@@ -222,7 +222,7 @@
             columnChooser.addItem("Parent hierarchy table has no columns");
             columnChooser.setEnabled(false);
         } else {
- columnChooser.setModel(new SQLObjectComboBoxModel(dimensionTable.getColumnsFolder())); + columnChooser.setModel(new SQLObjectComboBoxModel(dimensionTable, SQLColumn.class)); 
             for (SQLColumn col : dimensionTable.getColumns()) {
                 if (col.getName().equalsIgnoreCase(level.getColumn())) {
                     columnChooser.setSelectedItem(col);
=======================================
--- /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/olap/SchemaEditPanel.java Thu Jan 29 12:02:55 2009 +++ /branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/olap/SchemaEditPanel.java Tue Dec 1 15:00:36 2009 
@@ -29,8 +29,9 @@
 import ca.sqlpower.architect.olap.MondrianModel.Schema;
 import ca.sqlpower.architect.swingui.ArchitectSwingSession;
 import ca.sqlpower.architect.swingui.SQLObjectComboBoxModel;
-import ca.sqlpower.sqlobject.SQLObjectException;
 import ca.sqlpower.sqlobject.SQLDatabase;
+import ca.sqlpower.sqlobject.SQLObject;
+import ca.sqlpower.sqlobject.SQLObjectException;
 import ca.sqlpower.validation.swingui.FormValidationHandler;
 import ca.sqlpower.validation.swingui.NotNullValidator;
 import ca.sqlpower.validation.swingui.StatusComponent;
@@ -63,7 +64,7 @@
         builder.setDefaultDialogBorder();

         builder.append(status, 3);
- builder.append("Database", databaseBox = new JComboBox(new SQLObjectComboBoxModel(session.getRootObject()))); + builder.append("Database", databaseBox = new JComboBox(new SQLObjectComboBoxModel(session.getRootObject(), SQLObject.class))); 
         OLAPSession osession = OLAPUtil.getSession(schema);
         if (osession.getDatabase() != null) {
             databaseBox.setSelectedItem(osession.getDatabase());

Reply via email to