Revision: 3182
Author: terryyiu
Date: Tue Dec 1 14:28:13 2009
Log: Fixing a couple more classes to compile with the new changes to
SQLObject.
http://code.google.com/p/power-architect/source/detail?r=3182
Modified:
/branches/sqlobject-spobject-model/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/ddl/GenericDDLGenerator.java
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/diff/SQLIndexComparator.java
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/action/RemoveSourceDBAction.java
=======================================
---
/branches/sqlobject-spobject-model/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
Tue Dec 1 14:21:17 2009
+++
/branches/sqlobject-spobject-model/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
Tue Dec 1 14:28:13 2009
@@ -47,7 +47,6 @@
import ca.sqlpower.sql.JDBCDataSource;
import ca.sqlpower.sql.SPDataSource;
import ca.sqlpower.sqlobject.SQLDatabase;
-import ca.sqlpower.sqlobject.SQLObject;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLObjectRoot;
import ca.sqlpower.swingui.RecentMenu;
=======================================
---
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/ddl/GenericDDLGenerator.java
Tue Dec 1 14:21:17 2009
+++
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/ddl/GenericDDLGenerator.java
Tue Dec 1 14:28:13 2009
@@ -325,7 +325,7 @@
Map<String, SQLObject> colNameMap = new HashMap<String,
SQLObject> ();
boolean firstColumn = true;
- for (ColumnMapping cm : r.getChildren()) {
+ for (ColumnMapping cm : r.getChildren(ColumnMapping.class)) {
SQLColumn c = cm.getFkColumn();
// make sure this is unique
if (colNameMap.get(c.getName()) == null) {
@@ -351,7 +351,7 @@
errorMsg.append("Warning: Relationship has no columns to
map:\n");
}
- for (ColumnMapping cm : r.getChildren()) {
+ for (ColumnMapping cm : r.getChildren(ColumnMapping.class)) {
SQLColumn c = cm.getPkColumn();
SQLColumn fkCol = cm.getFkColumn();
@@ -382,7 +382,7 @@
}
// sanity check for SET NULL and SET DEFAULT delete rules, whether or
not DB supports them
- for (SQLRelationship.ColumnMapping cm : r.getChildren()) {
+ for (SQLRelationship.ColumnMapping cm :
r.getChildren(ColumnMapping.class)) {
UpdateDeleteRule deleteRule = r.getDeleteRule();
SQLColumn fkcol = cm.getFkColumn();
if (deleteRule == UpdateDeleteRule.SET_NULL
&& !fkcol.isDefinitelyNullable()) {
@@ -408,7 +408,7 @@
}
// sanity check for SET NULL and SET DEFAULT update rules, whether or
not DB supports them
- for (SQLRelationship.ColumnMapping cm : r.getChildren()) {
+ for (SQLRelationship.ColumnMapping cm :
r.getChildren(SQLRelationship.ColumnMapping.class)) {
UpdateDeleteRule updateRule = r.getUpdateRule();
SQLColumn fkcol = cm.getFkColumn();
if (updateRule == UpdateDeleteRule.SET_NULL
&& !fkcol.isDefinitelyNullable()) {
@@ -857,7 +857,7 @@
print(" PRIMARY KEY (");
boolean firstCol = true;
- for (SQLIndex.Column col : pk.getChildren()) {
+ for (SQLIndex.Column col : pk.getChildren(SQLIndex.Column.class)) {
if (!firstCol) print(", ");
if (col.getColumn() == null) {
throw new IllegalStateException("Index column is not
associated with the real column in the table.");
=======================================
---
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/diff/SQLIndexComparator.java
Tue Dec 1 14:21:17 2009
+++
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/diff/SQLIndexComparator.java
Tue Dec 1 14:28:13 2009
@@ -76,8 +76,8 @@
Set<Column> sourceCol = new TreeSet<Column>(comparator);
Set<Column> targetCol = new TreeSet<Column>(comparator);
- sourceCol.addAll(source.getChildren());
- targetCol.addAll(target.getChildren());
+ sourceCol.addAll(source.getChildren(Column.class));
+ targetCol.addAll(target.getChildren(Column.class));
return compareColumns(sourceCol, targetCol);
}
=======================================
---
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/action/RemoveSourceDBAction.java
Thu Jan 29 12:02:55 2009
+++
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/action/RemoveSourceDBAction.java
Tue Dec 1 14:28:13 2009
@@ -10,6 +10,7 @@
import ca.sqlpower.architect.swingui.DBTree;
import ca.sqlpower.architect.swingui.Messages;
+import ca.sqlpower.object.ObjectDependentException;
import ca.sqlpower.sqlobject.SQLDatabase;
import ca.sqlpower.sqlobject.SQLObject;
@@ -52,11 +53,18 @@
SQLDatabase selection = (SQLDatabase) tp.getLastPathComponent();
SQLObject root = (SQLObject) tree.getModel().getRoot();
- if (root.removeChild(selection)) {
- selection.disconnect();
- } else {
- logger.error("root.removeChild(selection) returned false!");
//$NON-NLS-1$
- JOptionPane.showMessageDialog(tree,
Messages.getString("DBTree.deleteConnectionFailed"),
Messages.getString("DBTree.deleteConnectionFailedDialogTitle"),
JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
+
+ try {
+ if (root.removeChild(selection)) {
+ selection.disconnect();
+ } else {
+ logger.error("root.removeChild(selection) returned false!");
//$NON-NLS-1$
+ JOptionPane.showMessageDialog(tree,
Messages.getString("DBTree.deleteConnectionFailed"),
Messages.getString("DBTree.deleteConnectionFailedDialogTitle"),
JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ } catch (IllegalArgumentException e) {
+ throw new RuntimeException(e);
+ } catch (ObjectDependentException e) {
+ throw new RuntimeException(e);
}
}
}
