Revision: 3560
Author: [email protected]
Date: Thu May 27 07:42:00 2010
Log: Fixed the GenericDDLGeneratorTest where the precision type must be set
in order to pass an assertion for the columnType() method.
Also, did some additional code cleanup and type safety additions to various
classes.
http://code.google.com/p/power-architect/source/detail?r=3560
Modified:
/trunk/regress/ca/sqlpower/architect/ddl/GenericDDLGeneratorTest.java
/trunk/src/main/java/ca/sqlpower/architect/DepthFirstSearch.java
/trunk/src/main/java/ca/sqlpower/architect/ddl/DDLUtils.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/DBTree.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/dbtree/DBTreeCellRenderer.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/dbtree/DBTreeModel.java
=======================================
--- /trunk/regress/ca/sqlpower/architect/ddl/GenericDDLGeneratorTest.java
Mon May 10 11:25:06 2010
+++ /trunk/regress/ca/sqlpower/architect/ddl/GenericDDLGeneratorTest.java
Thu May 27 07:42:00 2010
@@ -87,12 +87,14 @@
SQLColumn col1 = new SQLColumn(tbl, "N_TEST",
SQLType.NVARCHAR, "NVARCHAR", 1000, 0, 0, "",
null, false);
col1.getUserDefinedSQLType().getDefaultPhysicalProperties().setScaleType(PropertyType.NOT_APPLICABLE);
+
col1.getUserDefinedSQLType().getDefaultPhysicalProperties().setPrecisionType(PropertyType.CONSTANT);
assertEquals("NVARCHAR(1000)", ddl.getColumnDataTypeName(col1));
assertEquals("NVARCHAR(1000)", ddl.columnType(col1));
SQLColumn col2 = new SQLColumn(tbl, "N_CHARTEST",
SQLType.NCHAR, "NCHAR", 1000, 0, 0, "",
null, false);
col2.getUserDefinedSQLType().getDefaultPhysicalProperties().setScaleType(PropertyType.NOT_APPLICABLE);
+
col2.getUserDefinedSQLType().getDefaultPhysicalProperties().setPrecisionType(PropertyType.CONSTANT);
assertEquals("NCHAR(1000)", ddl.getColumnDataTypeName(col2));
assertEquals("NCHAR(1000)", ddl.columnType(col2));
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/DepthFirstSearch.java Thu
Jul 2 16:31:05 2009
+++ /trunk/src/main/java/ca/sqlpower/architect/DepthFirstSearch.java Thu
May 27 07:42:00 2010
@@ -180,8 +180,8 @@
if (logger.isDebugEnabled()) {
logger.debug("Performing Search on: " + tables);
}
- vertexInfo = new HashMap();
- finishOrder = new LinkedList();
+ vertexInfo = new HashMap<SQLTable, VertexInfo>();
+ finishOrder = new LinkedList<SQLTable>();
for (SQLTable u : tables) {
vertexInfo.put(u, new VertexInfo());
}
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ddl/DDLUtils.java Mon May 10
22:46:35 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ddl/DDLUtils.java Thu May 27
07:42:00 2010
@@ -36,7 +36,8 @@
private static final Logger logger = Logger.getLogger(DDLUtils.class);
- private static final Class DEFAULT_DDL_GENERATOR_CLASS =
GenericDDLGenerator.class;
+ private static final Class<? extends DDLGenerator>
DEFAULT_DDL_GENERATOR_CLASS =
+ GenericDDLGenerator.class;
/**
* DDLUtils is a container for static methods. You can't make an
instance of it.
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/DBTree.java Tue May
25 09:44:45 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/DBTree.java Thu May
27 07:42:00 2010
@@ -69,6 +69,7 @@
import ca.sqlpower.architect.swingui.dbtree.DBTreeCellRenderer;
import ca.sqlpower.architect.swingui.dbtree.DBTreeModel;
import ca.sqlpower.object.ObjectDependentException;
+import ca.sqlpower.object.SPListener;
import ca.sqlpower.sql.JDBCDataSource;
import ca.sqlpower.sql.SPDataSource;
import ca.sqlpower.sqlobject.SQLCatalog;
@@ -653,7 +654,7 @@
public void actionPerformed(ActionEvent
e) {
SQLObject so = (SQLObject)
getLastSelectedPathComponent();
if (so != null) {
- JOptionPane.showMessageDialog(DBTree.this, new JScrollPane(new
JList(new java.util.Vector(so.getSPListeners()))));
+ JOptionPane.showMessageDialog(DBTree.this, new JScrollPane(new
JList(new java.util.Vector<SPListener>(so.getSPListeners()))));
}
}
});
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/dbtree/DBTreeCellRenderer.java
Wed Mar 10 08:21:50 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/dbtree/DBTreeCellRenderer.java
Thu May 27 07:42:00 2010
@@ -22,7 +22,6 @@
import java.awt.Color;
import java.awt.Component;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -152,7 +151,7 @@
if (getIcon() == null) {
setIcon(ERROR_BADGE);
} else {
- setIcon(new ComposedIcon(Arrays.asList(getIcon(),
ERROR_BADGE)));
+ setIcon(ComposedIcon.getInstance(getIcon(), ERROR_BADGE));
}
setToolTipText("Inaccessible: " + ((SQLObject)
value).getChildrenInaccessibleReasons());
}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/dbtree/DBTreeModel.java
Thu May 13 13:10:22 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/dbtree/DBTreeModel.java
Thu May 27 07:42:00 2010
@@ -24,7 +24,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -87,10 +86,6 @@
this.containingChildType = containingChildType;
this.isPopulatedRunnable = isPopulatedRunnable;
}
-
- public SQLTable getParentTable() {
- return parentTable;
- }
public List<? extends SQLObject> getChildren() {
return parentTable.getChildren(containingChildType);
@@ -190,15 +185,6 @@
}
}
-
- /**
- * For use in the {...@link DBTreeSPListener}.
- */
- private enum EventType {
- INSERT,
- REMOVE,
- CHANGE
- }
/**
* A {...@link SPListener} implementation that will fire tree events as the
underlying
@@ -206,33 +192,7 @@
*/
private class DBTreeSPListener implements SPListener {
- /**
- * Small inner class to group the tree event with the type of event
it is.
- */
- private class TreeEventWithType {
- private final TreeModelEvent evt;
- private final EventType type;
-
- public TreeEventWithType(TreeModelEvent evt, EventType type) {
- this.evt = evt;
- this.type = type;
- }
-
- public TreeModelEvent getEvt() {
- return evt;
- }
-
- public EventType getType() {
- return type;
- }
-
- @Override
- public String toString() {
- return evt.toString() + ", " + type;
- }
- }
-
- public void childAdded(SPChildEvent e) {
+ public void childAdded(SPChildEvent e) {
if
(!SQLPowerUtils.getAncestorList(e.getSource()).contains(root)
&& !e.getSource().equals(root)) return;
if (!root.getRunnableDispatcher().isForegroundThread())
@@ -421,7 +381,7 @@
*/
public DBTreeModel(SQLObjectRoot root, JTree tree) throws
SQLObjectException {
this.root = root;
- this.treeModelListeners = new LinkedList();
+ this.treeModelListeners = new LinkedList<TreeModelListener>();
tree.addTreeWillExpandListener(treeWillExpandListener);
SQLPowerUtils.listenToHierarchy(root, treeListener);
@@ -521,7 +481,7 @@
}
// -------------- treeModel event source support -----------------
- protected LinkedList treeModelListeners;
+ protected LinkedList<TreeModelListener> treeModelListeners;
public void addTreeModelListener(TreeModelListener l) {
treeModelListeners.add(l);
@@ -536,10 +496,9 @@
final TreeModelEvent ev =e;
Runnable notifier = new Runnable(){
public void run() {
- Iterator it = treeModelListeners.iterator();
- while (it.hasNext()) {
- ((TreeModelListener)
it.next()).treeNodesInserted(ev);
- }
+ for (TreeModelListener listener :
treeModelListeners) {
+ listener.treeNodesInserted(ev);
+ }
}
};
// TODO FIXME XXX Replace this with an alternate method leads to nasty
behavior. There are 3 others too
@@ -552,9 +511,8 @@
final TreeModelEvent ev =e;
Runnable notifier = new Runnable(){
public void run() {
- Iterator it = treeModelListeners.iterator();
- while (it.hasNext()) {
- ((TreeModelListener)
it.next()).treeNodesRemoved(ev);
+ for (TreeModelListener listener : treeModelListeners) {
+ listener.treeNodesRemoved(ev);
}
}
};
@@ -567,9 +525,8 @@
final TreeModelEvent ev =e;
Runnable notifier = new Runnable(){
public void run() {
- Iterator it = treeModelListeners.iterator();
- while (it.hasNext()) {
- ((TreeModelListener)
it.next()).treeNodesChanged(ev);
+ for (TreeModelListener listener : treeModelListeners) {
+ listener.treeNodesChanged(ev);
}
}
};
@@ -584,9 +541,8 @@
final TreeModelEvent ev =e;
Runnable notifier = new Runnable(){
public void run() {
- Iterator it = treeModelListeners.iterator();
- while (it.hasNext()) {
- ((TreeModelListener)
it.next()).treeStructureChanged(ev);
+ for (TreeModelListener listener : treeModelListeners) {
+ listener.treeStructureChanged(ev);
}
}
};
@@ -618,7 +574,7 @@
* @throws IllegalArgumentException if <code>node</code> is of class
SQLRelationship.
*/
public SQLObject[] getPathToNode(SPObject node) {
- LinkedList path = new LinkedList();
+ List<SPObject> path = new LinkedList<SPObject>();
while (node != null && node != root) {
if (path.size() > 0 && node instanceof SQLTable) {
for (FolderNode folder : foldersInTables.get(node)) {
