Revision: 3781
Author: [email protected]
Date: Thu Jul 22 12:40:28 2010
Log: Merged SPObjectUtils into SQLPowerUtils. We don't need that many
utility classes!
http://code.google.com/p/power-architect/source/detail?r=3781
Modified:
/trunk/regress/ca/sqlpower/architect/ArchitectUtilsTest.java
/trunk/src/main/java/ca/sqlpower/architect/ddl/GenericDDLGenerator.java
/trunk/src/main/java/ca/sqlpower/architect/profile/AbstractProfileResult.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ASUtils.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/DataMoverPanel.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ImportSafetyChecker.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPen.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/ProfileAction.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/RefreshAction.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/olap/CubeEditPanel.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/table/ProfileTableModel.java
=======================================
--- /trunk/regress/ca/sqlpower/architect/ArchitectUtilsTest.java Fri May 7
11:49:29 2010
+++ /trunk/regress/ca/sqlpower/architect/ArchitectUtilsTest.java Thu Jul 22
12:40:28 2010
@@ -19,10 +19,10 @@
package ca.sqlpower.architect;
import java.sql.Types;
+
import junit.framework.TestCase;
import ca.sqlpower.object.ObjectDependentException;
import ca.sqlpower.object.SPListener;
-import ca.sqlpower.object.SPObjectUtils;
import ca.sqlpower.sqlobject.CountingSQLObjectListener;
import ca.sqlpower.sqlobject.SQLCatalog;
import ca.sqlpower.sqlobject.SQLColumn;
@@ -206,13 +206,13 @@
parentdb.addChild(sch);
sch.addChild(t);
- assertEquals(parentdb, SPObjectUtils.getAncestor(t,
SQLDatabase.class));
- assertEquals(sch, SPObjectUtils.getAncestor(t, SQLSchema.class));
- assertEquals(t, SPObjectUtils.getAncestor(t, SQLTable.class));
- assertNull(SPObjectUtils.getAncestor(t, SQLCatalog.class));
+ assertEquals(parentdb, SQLPowerUtils.getAncestor(t,
SQLDatabase.class));
+ assertEquals(sch, SQLPowerUtils.getAncestor(t, SQLSchema.class));
+ assertEquals(t, SQLPowerUtils.getAncestor(t, SQLTable.class));
+ assertNull(SQLPowerUtils.getAncestor(t, SQLCatalog.class));
parentdb.removeChild(sch);
- assertNull(SPObjectUtils.getAncestor(t, SQLDatabase.class));
+ assertNull(SQLPowerUtils.getAncestor(t, SQLDatabase.class));
}
public void testCreateTableWhenExisting() throws Exception {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ddl/GenericDDLGenerator.java
Fri Jul 9 11:47:49 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ddl/GenericDDLGenerator.java
Thu Jul 22 12:40:28 2010
@@ -37,7 +37,6 @@
import ca.sqlpower.architect.DepthFirstSearch;
import ca.sqlpower.architect.ddl.DDLStatement.StatementType;
import ca.sqlpower.architect.profile.ProfileFunctionDescriptor;
-import ca.sqlpower.object.SPObjectUtils;
import ca.sqlpower.object.SPResolverRegistry;
import ca.sqlpower.object.SPVariableHelper;
import ca.sqlpower.object.SPVariableResolver;
@@ -61,6 +60,7 @@
import ca.sqlpower.sqlobject.SQLTypePhysicalPropertiesProvider;
import
ca.sqlpower.sqlobject.SQLTypePhysicalPropertiesProvider.PropertyType;
import ca.sqlpower.sqlobject.UserDefinedSQLType;
+import ca.sqlpower.util.SQLPowerUtils;
public class GenericDDLGenerator implements DDLGenerator {
@@ -214,7 +214,7 @@
try {
if (allowConnection && tableList.size() > 0) {
- SQLDatabase parentDb =
SPObjectUtils.getAncestor(tableList.get(0), SQLDatabase.class);
+ SQLDatabase parentDb =
SQLPowerUtils.getAncestor(tableList.get(0), SQLDatabase.class);
if (parentDb.isPlayPenDatabase()) {
con = null;
} else {
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/profile/AbstractProfileResult.java
Wed Jun 23 11:55:57 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/profile/AbstractProfileResult.java
Thu Jul 22 12:40:28 2010
@@ -28,7 +28,6 @@
import ca.sqlpower.object.AbstractSPObject;
import ca.sqlpower.object.ObjectDependentException;
import ca.sqlpower.object.SPObject;
-import ca.sqlpower.object.SPObjectUtils;
import ca.sqlpower.object.annotation.Accessor;
import ca.sqlpower.object.annotation.Mutator;
import ca.sqlpower.object.annotation.Transient;
@@ -38,6 +37,7 @@
import ca.sqlpower.sqlobject.SQLObject;
import ca.sqlpower.sqlobject.SQLSchema;
import ca.sqlpower.sqlobject.SQLTable;
+import ca.sqlpower.util.SQLPowerUtils;
/**
* Base class for storing profile results that relate to a database object.
@@ -190,8 +190,8 @@
SQLObject so1, so2;
// database name
- so1 = SPObjectUtils.getAncestor(po, SQLDatabase.class);
- so2 = SPObjectUtils.getAncestor(opo, SQLDatabase.class);
+ so1 = SQLPowerUtils.getAncestor(po, SQLDatabase.class);
+ so2 = SQLPowerUtils.getAncestor(opo, SQLDatabase.class);
if (so1 == null && so2 != null) diff = -1;
else if (so1 != null && so2 == null) diff = 1;
else if (so1 != null && so2 != null) diff =
so1.getName().compareTo(so2.getName());
@@ -199,8 +199,8 @@
if (diff != 0) return diff;
// catalog name
- so1 = SPObjectUtils.getAncestor(po, SQLCatalog.class);
- so2 = SPObjectUtils.getAncestor(opo, SQLCatalog.class);
+ so1 = SQLPowerUtils.getAncestor(po, SQLCatalog.class);
+ so2 = SQLPowerUtils.getAncestor(opo, SQLCatalog.class);
if (so1 == null && so2 != null) diff = -1;
else if (so1 != null && so2 == null) diff = 1;
else if (so1 != null && so2 != null) diff =
so1.getName().compareTo(so2.getName());
@@ -208,8 +208,8 @@
if (diff != 0) return diff;
// schema name
- so1 = SPObjectUtils.getAncestor(po, SQLSchema.class);
- so2 = SPObjectUtils.getAncestor(opo, SQLSchema.class);
+ so1 = SQLPowerUtils.getAncestor(po, SQLSchema.class);
+ so2 = SQLPowerUtils.getAncestor(opo, SQLSchema.class);
if (so1 == null && so2 != null) diff = -1;
else if (so1 != null && so2 == null) diff = 1;
else if (so1 != null && so2 != null) diff =
so1.getName().compareTo(so2.getName());
@@ -217,8 +217,8 @@
if (diff != 0) return diff;
// table name
- so1 = SPObjectUtils.getAncestor(po, SQLTable.class);
- so2 = SPObjectUtils.getAncestor(opo, SQLTable.class);
+ so1 = SQLPowerUtils.getAncestor(po, SQLTable.class);
+ so2 = SQLPowerUtils.getAncestor(opo, SQLTable.class);
if (so1 == null && so2 != null) diff = -1;
else if (so1 != null && so2 == null) diff = 1;
else if (so1 != null && so2 != null) diff =
so1.getName().compareTo(so2.getName());
@@ -226,8 +226,8 @@
if (diff != 0) return diff;
// column name
- so1 = SPObjectUtils.getAncestor(po, SQLColumn.class);
- so2 = SPObjectUtils.getAncestor(opo, SQLColumn.class);
+ so1 = SQLPowerUtils.getAncestor(po, SQLColumn.class);
+ so2 = SQLPowerUtils.getAncestor(opo, SQLColumn.class);
if (so1 == null && so2 != null) diff = -1;
else if (so1 != null && so2 == null) diff = 1;
else if (so1 != null && so2 != null) diff =
so1.getName().compareTo(so2.getName());
@@ -265,19 +265,19 @@
SQLObject po = getProfiledObject();
SQLObject so;
- so = SPObjectUtils.getAncestor(po, SQLDatabase.class);
+ so = SQLPowerUtils.getAncestor(po, SQLDatabase.class);
if (so != null) hash *= so.getName().hashCode();
- so = SPObjectUtils.getAncestor(po, SQLCatalog.class);
+ so = SQLPowerUtils.getAncestor(po, SQLCatalog.class);
if (so != null) hash *= so.getName().hashCode();
- so = SPObjectUtils.getAncestor(po, SQLSchema.class);
+ so = SQLPowerUtils.getAncestor(po, SQLSchema.class);
if (so != null) hash *= so.getName().hashCode();
- so = SPObjectUtils.getAncestor(po, SQLTable.class);
+ so = SQLPowerUtils.getAncestor(po, SQLTable.class);
if (so != null) hash *= so.getName().hashCode();
- so = SPObjectUtils.getAncestor(po, SQLColumn.class);
+ so = SQLPowerUtils.getAncestor(po, SQLColumn.class);
if (so != null) hash *= so.getName().hashCode();
hash *= createEndTime;
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ASUtils.java Tue Jul
13 10:39:23 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ASUtils.java Thu Jul
22 12:40:28 2010
@@ -47,7 +47,6 @@
import ca.sqlpower.architect.ArchitectSession;
import ca.sqlpower.architect.ArchitectVersion;
import ca.sqlpower.architect.UserSettings;
-import ca.sqlpower.object.SPObjectUtils;
import ca.sqlpower.sql.JDBCDataSource;
import ca.sqlpower.sql.JDBCDataSourceType;
import ca.sqlpower.sql.SPDataSource;
@@ -64,6 +63,7 @@
import ca.sqlpower.swingui.JDBCDataSourcePanel;
import ca.sqlpower.swingui.SPSUtils;
import ca.sqlpower.util.ExceptionReport;
+import ca.sqlpower.util.SQLPowerUtils;
/**
* ASUtils is a container class for static utility methods used
@@ -598,7 +598,7 @@
if (sourceColumn != null
&& !SQLObjectUtils.isInSameSession(column, sourceColumn)) {
//The source database of the source column ETL lineage from
the source column from the import/copy (if you can understand that)
- SQLDatabase sourceSourceDatabase =
SPObjectUtils.getAncestor(sourceColumn, SQLDatabase.class);
+ SQLDatabase sourceSourceDatabase =
SQLPowerUtils.getAncestor(sourceColumn, SQLDatabase.class);
//The source data source of the target of this import/copy if
it exists (less confusing than above thankfully)
SPDataSource targetSourceSPDataSource =
dbTree.getDuplicateDbcs(sourceSourceDatabase.getDataSource());
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/DataMoverPanel.java
Mon May 31 13:51:12 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/DataMoverPanel.java
Thu Jul 22 12:40:28 2010
@@ -50,7 +50,6 @@
import ca.sqlpower.architect.swingui.dbtree.DBTreeCellRenderer;
import ca.sqlpower.architect.swingui.dbtree.DBTreeModel;
import ca.sqlpower.object.ObjectDependentException;
-import ca.sqlpower.object.SPObjectUtils;
import ca.sqlpower.sql.DataMover;
import ca.sqlpower.sql.DatabaseListChangeEvent;
import ca.sqlpower.sql.DatabaseListChangeListener;
@@ -65,6 +64,7 @@
import ca.sqlpower.sqlobject.SQLSchema;
import ca.sqlpower.sqlobject.SQLTable;
import ca.sqlpower.swingui.SPSUtils;
+import ca.sqlpower.util.SQLPowerUtils;
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.factories.ButtonBarFactory;
@@ -282,11 +282,11 @@
* @throws SQLObjectException
*/
private int moveSingleTable(final SQLTable sourceTable) throws
SQLException, SQLObjectException {
- final SQLDatabase sourceDB =
SPObjectUtils.getAncestor(sourceTable, SQLDatabase.class);
+ final SQLDatabase sourceDB =
SQLPowerUtils.getAncestor(sourceTable, SQLDatabase.class);
final TreePath destPath = destTree.getSelectionPath();
final SQLObject destObject = (SQLObject)
destPath.getLastPathComponent();
- final SQLDatabase destDB = SPObjectUtils.getAncestor(destObject,
SQLDatabase.class);
+ final SQLDatabase destDB = SQLPowerUtils.getAncestor(destObject,
SQLDatabase.class);
String destCatalogName = null;
String destSchemaName = null;
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/ImportSafetyChecker.java
Mon Jul 12 08:21:11 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/ImportSafetyChecker.java
Thu Jul 22 12:40:28 2010
@@ -25,10 +25,10 @@
import java.util.List;
import ca.sqlpower.object.SPObject;
-import ca.sqlpower.object.SPObjectUtils;
import ca.sqlpower.sqlobject.SQLColumn;
import ca.sqlpower.sqlobject.SQLDatabase;
import ca.sqlpower.sqlobject.SQLObject;
+import ca.sqlpower.util.SQLPowerUtils;
import ca.sqlpower.util.UserPrompter;
import ca.sqlpower.util.UserPrompter.UserPromptOptions;
import ca.sqlpower.util.UserPrompter.UserPromptResponse;
@@ -150,7 +150,7 @@
if (sourceColumn.getSourceColumn() == null) {
sourceColumn.setSourceColumn(sourceColumn);
}
- sourceSourceDatabase =
SPObjectUtils.getAncestor(sourceColumn.getSourceColumn(),
SQLDatabase.class);
+ sourceSourceDatabase =
SQLPowerUtils.getAncestor(sourceColumn.getSourceColumn(),
SQLDatabase.class);
if (targetSession.getDBTree().getDuplicateDbcs(
sourceSourceDatabase.getDataSource()) == null) {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPen.java Tue Jul
13 13:48:22 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPen.java Thu Jul
22 12:40:28 2010
@@ -93,7 +93,6 @@
import ca.sqlpower.architect.ArchitectUtils;
import ca.sqlpower.architect.olap.MondrianModel;
-import ca.sqlpower.architect.olap.OLAPObject;
import ca.sqlpower.architect.olap.MondrianModel.Cube;
import ca.sqlpower.architect.olap.MondrianModel.CubeUsage;
import ca.sqlpower.architect.olap.MondrianModel.CubeUsages;
@@ -105,6 +104,7 @@
import ca.sqlpower.architect.olap.MondrianModel.VirtualCube;
import ca.sqlpower.architect.olap.MondrianModel.VirtualCubeDimension;
import ca.sqlpower.architect.olap.MondrianModel.VirtualCubeMeasure;
+import ca.sqlpower.architect.olap.OLAPObject;
import ca.sqlpower.architect.swingui.action.CancelAction;
import ca.sqlpower.architect.swingui.event.PlayPenLifecycleEvent;
import ca.sqlpower.architect.swingui.event.PlayPenLifecycleListener;
@@ -112,17 +112,16 @@
import ca.sqlpower.architect.swingui.event.SelectionListener;
import ca.sqlpower.architect.swingui.olap.CubePane;
import ca.sqlpower.architect.swingui.olap.DimensionPane;
+import ca.sqlpower.architect.swingui.olap.DimensionPane.HierarchySection;
import ca.sqlpower.architect.swingui.olap.OLAPPane;
import ca.sqlpower.architect.swingui.olap.OLAPTree;
import ca.sqlpower.architect.swingui.olap.PaneSection;
import ca.sqlpower.architect.swingui.olap.UsageComponent;
import ca.sqlpower.architect.swingui.olap.VirtualCubePane;
-import ca.sqlpower.architect.swingui.olap.DimensionPane.HierarchySection;
import ca.sqlpower.object.ObjectDependentException;
import ca.sqlpower.object.SPChildEvent;
import ca.sqlpower.object.SPListener;
import ca.sqlpower.object.SPObject;
-import ca.sqlpower.object.SPObjectUtils;
import ca.sqlpower.sql.JDBCDataSource;
import ca.sqlpower.sqlobject.SQLCatalog;
import ca.sqlpower.sqlobject.SQLColumn;
@@ -132,11 +131,11 @@
import ca.sqlpower.sqlobject.SQLObjectRuntimeException;
import ca.sqlpower.sqlobject.SQLObjectUtils;
import ca.sqlpower.sqlobject.SQLRelationship;
+import ca.sqlpower.sqlobject.SQLRelationship.SQLImportedKey;
import ca.sqlpower.sqlobject.SQLSchema;
import ca.sqlpower.sqlobject.SQLTable;
-import ca.sqlpower.sqlobject.SQLTypePhysicalPropertiesProvider;
-import ca.sqlpower.sqlobject.SQLRelationship.SQLImportedKey;
import ca.sqlpower.sqlobject.SQLTable.TransferStyles;
+import ca.sqlpower.sqlobject.SQLTypePhysicalPropertiesProvider;
import ca.sqlpower.sqlobject.undo.CompoundEventListener;
import ca.sqlpower.swingui.CursorManager;
import ca.sqlpower.swingui.ProgressWatcher;
@@ -1611,7 +1610,7 @@
setMessage(ArchitectUtils.truncateString(((SQLTable)someData).getName()));
preferredLocation.x += tp.getPreferredSize().width
+ 5;
- SQLDatabase dbAncestor =
SPObjectUtils.getAncestor(someData, SQLDatabase.class);
+ SQLDatabase dbAncestor =
SQLPowerUtils.getAncestor(someData, SQLDatabase.class);
String platform;
if (dbAncestor == null) {
platform = null;
@@ -1631,7 +1630,7 @@
TablePane tp = importTableCopy(sourceTable, preferredLocation,
duplicateProperties, false);
preferredLocation.x +=
tp.getPreferredSize().width + 5;
- String platform = SPObjectUtils.getAncestor(someData,
SQLDatabase.class).getDataSource().getParentType().getName();
+ String platform = SQLPowerUtils.getAncestor(someData,
SQLDatabase.class).getDataSource().getParentType().getName();
addedColumns.putAll(platform,
tp.getModel().getChildren(SQLColumn.class));
increaseProgress();
@@ -1650,7 +1649,7 @@
TablePane tp = importTableCopy(sourceTable, preferredLocation,
duplicateProperties, false);
preferredLocation.x += tp.getPreferredSize().width + 5;
- String platform = SPObjectUtils.getAncestor(someData,
SQLDatabase.class).getDataSource().getParentType().getName();
+ String platform = SQLPowerUtils.getAncestor(someData,
SQLDatabase.class).getDataSource().getParentType().getName();
addedColumns.putAll(platform,
tp.getModel().getChildren(SQLColumn.class));
increaseProgress();
@@ -1664,7 +1663,7 @@
TablePane tp = importTableCopy(sourceTable, preferredLocation,
duplicateProperties, false);
preferredLocation.x += tp.getPreferredSize().width + 5;
- String platform = SPObjectUtils.getAncestor(someData,
SQLDatabase.class).getDataSource().getParentType().getName();
+ String platform = SQLPowerUtils.getAncestor(someData,
SQLDatabase.class).getDataSource().getParentType().getName();
addedColumns.putAll(platform,
tp.getModel().getChildren(SQLColumn.class));
increaseProgress();
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/ProfileAction.java
Mon Jul 12 08:21:11 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/ProfileAction.java
Thu Jul 22 12:40:28 2010
@@ -31,7 +31,6 @@
import ca.sqlpower.architect.swingui.ASUtils;
import ca.sqlpower.architect.swingui.ArchitectFrame;
-import ca.sqlpower.object.SPObjectUtils;
import ca.sqlpower.sqlobject.SQLCatalog;
import ca.sqlpower.sqlobject.SQLColumn;
import ca.sqlpower.sqlobject.SQLDatabase;
@@ -39,6 +38,7 @@
import ca.sqlpower.sqlobject.SQLObjectUtils;
import ca.sqlpower.sqlobject.SQLSchema;
import ca.sqlpower.sqlobject.SQLTable;
+import ca.sqlpower.util.SQLPowerUtils;
public class ProfileAction extends AbstractArchitectAction {
@@ -87,43 +87,43 @@
else if ( tp.getLastPathComponent() instanceof SQLCatalog
) {
SQLCatalog cat = (SQLCatalog)tp.getLastPathComponent();
sqlObject.add(cat);
- SQLDatabase db =
SPObjectUtils.getAncestor(cat,SQLDatabase.class);
+ SQLDatabase db =
SQLPowerUtils.getAncestor(cat,SQLDatabase.class);
if ( db != null && sqlObject.contains(db))
sqlObject.remove(db);
} else if ( tp.getLastPathComponent() instanceof SQLSchema
) {
SQLSchema sch = (SQLSchema)tp.getLastPathComponent();
sqlObject.add(sch);
- SQLCatalog cat =
SPObjectUtils.getAncestor(sch,SQLCatalog.class);
+ SQLCatalog cat =
SQLPowerUtils.getAncestor(sch,SQLCatalog.class);
if ( cat != null && sqlObject.contains(cat))
sqlObject.remove(cat);
- SQLDatabase db =
SPObjectUtils.getAncestor(sch,SQLDatabase.class);
+ SQLDatabase db =
SQLPowerUtils.getAncestor(sch,SQLDatabase.class);
if ( db != null && sqlObject.contains(db))
sqlObject.remove(db);
} else if ( tp.getLastPathComponent() instanceof SQLTable
) {
SQLTable tab = (SQLTable)tp.getLastPathComponent();
sqlObject.add(tab);
- SQLSchema sch =
SPObjectUtils.getAncestor(tab,SQLSchema.class);
+ SQLSchema sch =
SQLPowerUtils.getAncestor(tab,SQLSchema.class);
if ( sch != null && sqlObject.contains(sch))
sqlObject.remove(sch);
- SQLCatalog cat =
SPObjectUtils.getAncestor(sch,SQLCatalog.class);
+ SQLCatalog cat =
SQLPowerUtils.getAncestor(sch,SQLCatalog.class);
if ( cat != null && sqlObject.contains(cat))
sqlObject.remove(cat);
- SQLDatabase db =
SPObjectUtils.getAncestor(sch,SQLDatabase.class);
+ SQLDatabase db =
SQLPowerUtils.getAncestor(sch,SQLDatabase.class);
if ( db != null && sqlObject.contains(db))
sqlObject.remove(db);
} else if ( tp.getLastPathComponent() instanceof SQLColumn
) {
SQLTable tab =
((SQLColumn)tp.getLastPathComponent()).getParent();
sqlObject.add((SQLColumn)tp.getLastPathComponent());
- SQLSchema sch =
SPObjectUtils.getAncestor(tab,SQLSchema.class);
+ SQLSchema sch =
SQLPowerUtils.getAncestor(tab,SQLSchema.class);
if ( sch != null && sqlObject.contains(sch))
sqlObject.remove(sch);
- SQLCatalog cat =
SPObjectUtils.getAncestor(sch,SQLCatalog.class);
+ SQLCatalog cat =
SQLPowerUtils.getAncestor(sch,SQLCatalog.class);
if ( cat != null && sqlObject.contains(cat))
sqlObject.remove(cat);
- SQLDatabase db =
SPObjectUtils.getAncestor(sch,SQLDatabase.class);
+ SQLDatabase db =
SQLPowerUtils.getAncestor(sch,SQLDatabase.class);
if ( db != null && sqlObject.contains(db))
sqlObject.remove(db);
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/RefreshAction.java
Mon Jul 12 08:21:11 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/RefreshAction.java
Thu Jul 22 12:40:28 2010
@@ -37,7 +37,6 @@
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
import ca.sqlpower.architect.swingui.DBTree;
import ca.sqlpower.architect.swingui.dbtree.DBTreeModel;
-import ca.sqlpower.object.SPObjectUtils;
import ca.sqlpower.sqlobject.SQLDatabase;
import ca.sqlpower.sqlobject.SQLObject;
import ca.sqlpower.sqlobject.SQLObjectException;
@@ -46,6 +45,7 @@
import ca.sqlpower.swingui.SwingWorkerRegistry;
import ca.sqlpower.swingui.event.TaskTerminationEvent;
import ca.sqlpower.swingui.event.TaskTerminationListener;
+import ca.sqlpower.util.SQLPowerUtils;
import com.jgoodies.forms.builder.DefaultFormBuilder;
import com.jgoodies.forms.layout.FormLayout;
@@ -135,7 +135,7 @@
Set<SQLDatabase> databasesToRefresh = new HashSet<SQLDatabase>();
for (TreePath tp : dbTree.getSelectionPaths()) {
SQLObject so = (SQLObject) tp.getLastPathComponent();
- SQLDatabase db = SPObjectUtils.getAncestor(so,
SQLDatabase.class);
+ SQLDatabase db = SQLPowerUtils.getAncestor(so,
SQLDatabase.class);
if (db != null && !db.isPlayPenDatabase()) {
databasesToRefresh.add(db);
}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/olap/CubeEditPanel.java
Wed Jul 21 08:10:13 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/olap/CubeEditPanel.java
Thu Jul 22 12:40:28 2010
@@ -40,21 +40,21 @@
import org.apache.log4j.Logger;
-import ca.sqlpower.architect.olap.OLAPObject;
-import ca.sqlpower.architect.olap.OLAPSession;
-import ca.sqlpower.architect.olap.OLAPUtil;
import ca.sqlpower.architect.olap.MondrianModel.Cube;
import ca.sqlpower.architect.olap.MondrianModel.Measure;
import ca.sqlpower.architect.olap.MondrianModel.SQL;
import ca.sqlpower.architect.olap.MondrianModel.Table;
import ca.sqlpower.architect.olap.MondrianModel.View;
+import ca.sqlpower.architect.olap.OLAPObject;
+import ca.sqlpower.architect.olap.OLAPSession;
+import ca.sqlpower.architect.olap.OLAPUtil;
import ca.sqlpower.architect.swingui.PlayPen;
-import ca.sqlpower.object.SPObjectUtils;
import ca.sqlpower.sqlobject.SQLDatabase;
import ca.sqlpower.sqlobject.SQLDatabaseMapping;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLTable;
import ca.sqlpower.swingui.DataEntryPanelBuilder;
+import ca.sqlpower.util.SQLPowerUtils;
import ca.sqlpower.validation.Validator;
import ca.sqlpower.validation.swingui.FormValidationHandler;
import ca.sqlpower.validation.swingui.StatusComponent;
@@ -267,7 +267,7 @@
* cube can be made from tables in this database.
*/
private SQLDatabase getDatabase() {
- return SPObjectUtils.getAncestor(CubeEditPanel.this.cube,
OLAPSession.class).getDatabase();
+ return SQLPowerUtils.getAncestor(CubeEditPanel.this.cube,
OLAPSession.class).getDatabase();
}
public String getSelectText() {
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/table/ProfileTableModel.java
Fri Jul 16 13:23:39 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/table/ProfileTableModel.java
Thu Jul 22 12:40:28 2010
@@ -36,7 +36,6 @@
import ca.sqlpower.architect.profile.event.ProfileChangeEvent;
import ca.sqlpower.architect.profile.event.ProfileChangeListener;
import ca.sqlpower.architect.profile.output.ProfileColumn;
-import ca.sqlpower.object.SPObjectUtils;
import ca.sqlpower.sqlobject.SQLCatalog;
import ca.sqlpower.sqlobject.SQLColumn;
import ca.sqlpower.sqlobject.SQLDatabase;
@@ -45,6 +44,7 @@
import ca.sqlpower.sqlobject.SQLSchema;
import ca.sqlpower.sqlobject.SQLTable;
import ca.sqlpower.swingui.table.CleanupTableModel;
+import ca.sqlpower.util.SQLPowerUtils;
public class ProfileTableModel extends AbstractTableModel implements
CleanupTableModel {
@@ -145,13 +145,13 @@
switch(column) {
case DATABASE:
- return SPObjectUtils.getAncestor(col,SQLDatabase.class);
+ return SQLPowerUtils.getAncestor(col,SQLDatabase.class);
case CATALOG:
- return SPObjectUtils.getAncestor(col,SQLCatalog.class);
+ return SQLPowerUtils.getAncestor(col,SQLCatalog.class);
case SCHEMA:
- return SPObjectUtils.getAncestor(col,SQLSchema.class);
+ return SQLPowerUtils.getAncestor(col,SQLSchema.class);
case TABLE:
- return SPObjectUtils.getAncestor(col,SQLTable.class);
+ return SQLPowerUtils.getAncestor(col,SQLTable.class);
case COLUMN:
return col;
case RUNDATE:
