Revision: 3183
Author: terryyiu
Date: Tue Dec 1 14:35:17 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=3183
Modified:
/branches/sqlobject-spobject-model/regress/ca/sqlpower/architect/swingui/TestSwingUIProject.java
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/ArchitectSessionImpl.java
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/ddl/MySqlDDLGenerator.java
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/ddl/critic/RelationshipMappingTypeCritic.java
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/diff/SQLRelationshipComparator.java
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/ColumnMappingPanel.java
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/IndexEditPanel.java
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/Relationship.java
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/action/CreateTableAction.java
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/action/DeleteSelectedAction.java
=======================================
---
/branches/sqlobject-spobject-model/regress/ca/sqlpower/architect/swingui/TestSwingUIProject.java
Tue Dec 1 14:21:17 2009
+++
/branches/sqlobject-spobject-model/regress/ca/sqlpower/architect/swingui/TestSwingUIProject.java
Tue Dec 1 14:35:17 2009
@@ -1238,7 +1238,7 @@
"didn't expect this index to have no columns!",
idx.getChildCount() > 0);
- List<SQLIndex.Column> indexCols = idx.getChildren();
+ List<SQLIndex.Column> indexCols =
idx.getChildren(SQLIndex.Column.class);
List<SQLColumn> colsToRemove = new ArrayList<SQLColumn>();
for (SQLIndex.Column indexCol : indexCols) {
colsToRemove.add(indexCol.getColumn());
@@ -1341,7 +1341,7 @@
ByteArrayInputStream r = new
ByteArrayInputStream(testData.getBytes());
project.load(r, plIni);
SQLTable table = session.getPlayPen().getTables().get(0);
- assertEquals(AscendDescend.ASCENDING,
table.getIndexByName("PL_MATCH_UNIQUE").getChildren().get(0).getAscendingOrDescending());
+ assertEquals(AscendDescend.ASCENDING,
table.getIndexByName("PL_MATCH_UNIQUE").getChildren(SQLIndex.Column.class).get(0).getAscendingOrDescending());
}
/**
@@ -1381,7 +1381,7 @@
ByteArrayInputStream r = new
ByteArrayInputStream(testData.getBytes());
project.load(r, plIni);
SQLTable table = session.getPlayPen().getTables().get(0);
- assertEquals(AscendDescend.DESCENDING,
table.getIndexByName("PL_MATCH_UNIQUE").getChildren().get(0).getAscendingOrDescending());
+ assertEquals(AscendDescend.DESCENDING,
table.getIndexByName("PL_MATCH_UNIQUE").getChildren(SQLIndex.Column.class).get(0).getAscendingOrDescending());
}
/**
@@ -1421,7 +1421,7 @@
ByteArrayInputStream r = new
ByteArrayInputStream(testData.getBytes());
project.load(r, plIni);
SQLTable table = session.getPlayPen().getTables().get(0);
- assertEquals(AscendDescend.UNSPECIFIED,
table.getIndexByName("PL_MATCH_UNIQUE").getChildren().get(0).getAscendingOrDescending());
+ assertEquals(AscendDescend.UNSPECIFIED,
table.getIndexByName("PL_MATCH_UNIQUE").getChildren(SQLIndex.Column.class).get(0).getAscendingOrDescending());
}
/**
@@ -1460,7 +1460,7 @@
ByteArrayInputStream r = new
ByteArrayInputStream(testData.getBytes());
project.load(r, plIni);
SQLTable table = session.getPlayPen().getTables().get(0);
- assertEquals(AscendDescend.ASCENDING,
table.getIndexByName("PL_MATCH_UNIQUE").getChildren().get(0).getAscendingOrDescending());
+ assertEquals(AscendDescend.ASCENDING,
table.getIndexByName("PL_MATCH_UNIQUE").getChildren(SQLIndex.Column.class).get(0).getAscendingOrDescending());
}
/**
* This tests loading a descending column on an index works.
@@ -1498,7 +1498,7 @@
ByteArrayInputStream r = new
ByteArrayInputStream(testData.getBytes());
project.load(r, plIni);
SQLTable table = session.getPlayPen().getTables().get(0);
- assertEquals(AscendDescend.DESCENDING,
table.getIndexByName("PL_MATCH_UNIQUE").getChildren().get(0).getAscendingOrDescending());
+ assertEquals(AscendDescend.DESCENDING,
table.getIndexByName("PL_MATCH_UNIQUE").getChildren(SQLIndex.Column.class).get(0).getAscendingOrDescending());
}
/**
* This tests loading an unspecified column on an index works.
@@ -1536,7 +1536,7 @@
ByteArrayInputStream r = new
ByteArrayInputStream(testData.getBytes());
project.load(r, plIni);
SQLTable table = session.getPlayPen().getTables().get(0);
- assertEquals(AscendDescend.UNSPECIFIED,
table.getIndexByName("PL_MATCH_UNIQUE").getChildren().get(0).getAscendingOrDescending());
+ assertEquals(AscendDescend.UNSPECIFIED,
table.getIndexByName("PL_MATCH_UNIQUE").getChildren(SQLIndex.Column.class).get(0).getAscendingOrDescending());
}
}
=======================================
---
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/ArchitectSessionImpl.java
Tue Dec 1 14:21:17 2009
+++
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/ArchitectSessionImpl.java
Tue Dec 1 14:35:17 2009
@@ -187,7 +187,7 @@
public SQLDatabase getDatabase(JDBCDataSource ds) {
try {
- for (SQLDatabase obj : rootObject.getChildren()) {
+ for (SQLDatabase obj :
rootObject.getChildren(SQLDatabase.class)) {
if (obj.getDataSource().equals(ds)) {
return (SQLDatabase) obj;
}
=======================================
---
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/ddl/MySqlDDLGenerator.java
Tue Dec 1 14:21:17 2009
+++
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/ddl/MySqlDDLGenerator.java
Tue Dec 1 14:35:17 2009
@@ -378,7 +378,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(", ");
print(col.getPhysicalName());
firstCol = false;
=======================================
---
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/ddl/critic/RelationshipMappingTypeCritic.java
Tue Dec 1 14:21:17 2009
+++
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/ddl/critic/RelationshipMappingTypeCritic.java
Tue Dec 1 14:35:17 2009
@@ -35,7 +35,8 @@
if (!(so instanceof SQLRelationship)) return
Collections.emptyList();
SQLRelationship subject = (SQLRelationship) so;
List<Criticism<SQLObject>> criticisms = new
ArrayList<Criticism<SQLObject>>();
- for (SQLRelationship.ColumnMapping cm : subject.getChildren()) {
+ for (SQLRelationship.ColumnMapping cm : subject.getChildren(
+ SQLRelationship.ColumnMapping.class)) {
if (ArchitectUtils.columnsDiffer(cm.getFkColumn(),
cm.getPkColumn())) {
final SQLColumn parentColumn = cm.getPkColumn();
final SQLTable parentTable = parentColumn.getParent();
=======================================
---
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/diff/SQLRelationshipComparator.java
Tue Dec 1 14:21:17 2009
+++
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/diff/SQLRelationshipComparator.java
Tue Dec 1 14:35:17 2009
@@ -58,12 +58,12 @@
Set<SQLColumn> sourceColFk = new TreeSet<SQLColumn>(comparator);
Set<SQLColumn> targetColFk = new TreeSet<SQLColumn>(comparator);
- for (ColumnMapping cm : r1.getChildren()) {
+ for (ColumnMapping cm : r1.getChildren(ColumnMapping.class)) {
sourceColPk.add(cm.getPkColumn());
sourceColFk.add(cm.getFkColumn());
}
- for (ColumnMapping cm : r2.getChildren()) {
+ for (ColumnMapping cm : r2.getChildren(ColumnMapping.class)) {
targetColPk.add(cm.getPkColumn());
targetColFk.add(cm.getFkColumn());
}
=======================================
---
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Tue Dec 1 14:21:17 2009
+++
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Tue Dec 1 14:35:17 2009
@@ -592,7 +592,7 @@
}
// close connections
- for (SQLDatabase db : getRootObject().getChildren()) {
+ for (SQLDatabase db :
getRootObject().getChildren(SQLDatabase.class)) {
logger.debug ("closing connection: " + db.getName());
//$NON-NLS-1$
db.disconnect();
}
=======================================
---
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/ColumnMappingPanel.java
Tue Dec 1 14:21:17 2009
+++
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/ColumnMappingPanel.java
Tue Dec 1 14:35:17 2009
@@ -348,7 +348,8 @@
SQLTable t = rhsTable.getModel();
for (SQLRelationship r : t.getImportedKeys()) {
if (r == this.r) continue;
- for (SQLRelationship.ColumnMapping cm : r.getChildren()) {
+ for (SQLRelationship.ColumnMapping cm : r.getChildren(
+ SQLRelationship.ColumnMapping.class)) {
rhsTable.addColumnHighlight(cm.getFkColumn(),
otherRelColour);
}
}
@@ -388,7 +389,8 @@
*/
public void updateMappingsFromRelationship() {
mappings = new HashMap<SQLColumn, SQLColumn>();
- for (SQLRelationship.ColumnMapping cm : r.getChildren()) {
+ for (SQLRelationship.ColumnMapping cm : r.getChildren(
+ SQLRelationship.ColumnMapping.class)) {
mappings.put(cm.getPkColumn(), cm.getFkColumn());
}
panel.repaint();
=======================================
---
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/IndexEditPanel.java
Tue Dec 1 14:21:17 2009
+++
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/IndexEditPanel.java
Tue Dec 1 14:35:17 2009
@@ -33,6 +33,7 @@
import javax.swing.JScrollPane;
import javax.swing.JTextField;
+import ca.sqlpower.object.ObjectDependentException;
import ca.sqlpower.sql.JDBCDataSourceType;
import ca.sqlpower.sqlobject.SQLColumn;
import ca.sqlpower.sqlobject.SQLIndex;
@@ -251,7 +252,7 @@
}
if (index.isPrimaryKeyIndex()) {
- for (Column c : (List<Column>) indexCopy.getChildren()) {
+ for (Column c : indexCopy.getChildren(Column.class)) {
if (c.getColumn() == null) {
warnings.append(Messages.getString("IndexEditPanel.onlyAddColumnsToPK"));
//$NON-NLS-1$
break;
@@ -274,7 +275,7 @@
c.setPrimaryKeySeq(null);
}
int i = 0;
- for (Column c : (List<Column>)
index.getChildren()) {
+ for (Column c : index.getChildren(Column.class)) {
SQLColumn column = c.getColumn();
if (column != null) {
column.setPrimaryKeySeq(Integer.MAX_VALUE);
@@ -308,6 +309,10 @@
}
} catch (SQLObjectException e) {
throw new SQLObjectRuntimeException(e);
+ } catch (IllegalArgumentException e) {
+ throw new RuntimeException(e);
+ } catch (ObjectDependentException e) {
+ throw new RuntimeException(e);
} finally {
parent.commit();
}
=======================================
---
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/Relationship.java
Tue Dec 1 14:21:17 2009
+++
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/Relationship.java
Tue Dec 1 14:35:17 2009
@@ -194,7 +194,7 @@
public void actionPerformed(ActionEvent e) {
StringBuffer componentList = new StringBuffer();
- for (ColumnMapping columnMap :
getModel().getChildren()) {
+ for (ColumnMapping columnMap :
getModel().getChildren(ColumnMapping.class)) {
componentList.append(columnMap).append("\n");
//$NON-NLS-1$
}
@@ -232,7 +232,8 @@
public void setSelected(boolean isSelected,int multiSelectType) {
if (selected != isSelected) {
- for (SQLRelationship.ColumnMapping m :
getModel().getChildren()) {
+ for (SQLRelationship.ColumnMapping m :
getModel().getChildren(
+ SQLRelationship.ColumnMapping.class)) {
if (isSelected) {
pkTable.addColumnHighlight(m.getPkColumn(),
columnHighlightColour);
=======================================
---
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/action/CreateTableAction.java
Thu Jan 29 12:02:55 2009
+++
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/action/CreateTableAction.java
Tue Dec 1 14:35:17 2009
@@ -33,6 +33,7 @@
import ca.sqlpower.architect.swingui.TableEditPanel;
import ca.sqlpower.architect.swingui.TablePane;
import ca.sqlpower.architect.swingui.event.SelectionEvent;
+import ca.sqlpower.object.ObjectDependentException;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLTable;
import ca.sqlpower.swingui.DataEntryPanel;
@@ -99,8 +100,14 @@
editPanel = new TableEditPanel(playpen.getSession(),
tp.getModel()) {
@Override
public void discardChanges() {
-
playpen.getSession().getTargetDatabase().removeChild(tp.getModel());
-
playpen.getTableNames().remove(tp.getModel().getName());
+ try {
+
playpen.getSession().getTargetDatabase().removeChild(tp.getModel());
+
playpen.getTableNames().remove(tp.getModel().getName());
+ } catch (IllegalArgumentException e) {
+ throw new RuntimeException(e);
+ } catch (ObjectDependentException e) {
+ throw new RuntimeException(e);
+ }
}
};
return editPanel;
=======================================
---
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/action/DeleteSelectedAction.java
Tue Dec 1 14:21:17 2009
+++
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/action/DeleteSelectedAction.java
Tue Dec 1 14:35:17 2009
@@ -138,7 +138,7 @@
SQLIndex index = (SQLIndex) o;
o.getParent().removeChild(o);
List<SQLColumn> cols = new ArrayList<SQLColumn>();
- for (Column col : index.getChildren()) {
+ for (Column col : index.getChildren(Column.class))
{
cols.add(col.getColumn());
}
for (SQLColumn col : cols) {
