Author: jfuerth
Date: Fri Oct 17 07:35:08 2008
New Revision: 2786
Modified:
trunk/regress/ca/sqlpower/architect/swingui/dbtree/TestDBTreeModel.java
trunk/src/ca/sqlpower/architect/swingui/DataMoverPanel.java
trunk/src/ca/sqlpower/architect/swingui/dbtree/DBTree.java
trunk/src/ca/sqlpower/architect/swingui/dbtree/DBTreeModel.java
Log:
It turned out to be easy to remove ArchitectSession dependency from
DBTreeModel. Now it's much easier to reuse the model in other apps.
Modified:
trunk/regress/ca/sqlpower/architect/swingui/dbtree/TestDBTreeModel.java
==============================================================================
--- trunk/regress/ca/sqlpower/architect/swingui/dbtree/TestDBTreeModel.java
(original)
+++ trunk/regress/ca/sqlpower/architect/swingui/dbtree/TestDBTreeModel.java
Fri Oct 17 07:35:08 2008
@@ -100,7 +100,8 @@
private DBTreeModel tm;
protected void setUp() throws Exception {
- tm = new DBTreeModel(new ArchitectSessionImpl(new
ArchitectSessionContextImpl(), "TestSession"));
+ ArchitectSessionImpl session = new ArchitectSessionImpl(new
ArchitectSessionContextImpl(), "TestSession");
+ tm = new DBTreeModel(session.getRootObject());
tm.setTestMode(true);
}
Modified: trunk/src/ca/sqlpower/architect/swingui/DataMoverPanel.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/DataMoverPanel.java (original)
+++ trunk/src/ca/sqlpower/architect/swingui/DataMoverPanel.java Fri Oct 17
07:35:08 2008
@@ -102,12 +102,12 @@
setupDBTrees();
- sourceTree = new JTree(new DBTreeModel(session, treeRoot));
+ sourceTree = new JTree(new DBTreeModel(treeRoot));
sourceTree.setRootVisible(false);
sourceTree.setShowsRootHandles(true);
sourceTree.setCellRenderer(new DBTreeCellRenderer(session));
- destTree = new JTree(new DBTreeModel(session, treeRoot));
+ destTree = new JTree(new DBTreeModel(treeRoot));
destTree.setRootVisible(false);
destTree.setShowsRootHandles(true);
destTree.setCellRenderer(new DBTreeCellRenderer(session));
Modified: trunk/src/ca/sqlpower/architect/swingui/dbtree/DBTree.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/dbtree/DBTree.java (original)
+++ trunk/src/ca/sqlpower/architect/swingui/dbtree/DBTree.java Fri Oct 17
07:35:08 2008
@@ -114,7 +114,7 @@
public DBTree(ArchitectSwingSession session) throws ArchitectException {
this.session = session;
- setModel(new DBTreeModel(session));
+ setModel(new DBTreeModel(session.getRootObject()));
setUI(new MultiDragTreeUI());
setRootVisible(false);
setShowsRootHandles(true);
Modified: trunk/src/ca/sqlpower/architect/swingui/dbtree/DBTreeModel.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/dbtree/DBTreeModel.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/dbtree/DBTreeModel.java Fri Oct
17 07:35:08 2008
@@ -34,7 +34,6 @@
import ca.sqlpower.architect.ArchitectException;
import ca.sqlpower.architect.ArchitectRuntimeException;
-import ca.sqlpower.architect.ArchitectSession;
import ca.sqlpower.architect.ArchitectUtils;
import ca.sqlpower.architect.SQLExceptionNode;
import ca.sqlpower.architect.SQLObject;
@@ -42,7 +41,7 @@
import ca.sqlpower.architect.SQLObjectListener;
import ca.sqlpower.architect.SQLObjectRoot;
import ca.sqlpower.architect.SQLRelationship;
-import ca.sqlpower.architect.swingui.ASUtils;
+import ca.sqlpower.swingui.SPSUtils;
public class DBTreeModel implements TreeModel, SQLObjectListener,
java.io.Serializable {
@@ -57,10 +56,6 @@
protected SQLObject root;
- public DBTreeModel(ArchitectSession session) throws ArchitectException {
- this(session,session.getRootObject());
- }
-
/**
* Creates a tree model with all of the SQLDatabase objects in the
* given session's root object in its root list of databases.
@@ -70,7 +65,7 @@
* root object associated with the given session, but it normally
* will be.
*/
- public DBTreeModel(ArchitectSession session, SQLObjectRoot root) throws
ArchitectException {
+ public DBTreeModel(SQLObjectRoot root) throws ArchitectException {
this.root = root;
this.treeModelListeners = new LinkedList();
ArchitectUtils.listenToHierarchy(this, root);
@@ -298,7 +293,7 @@
parent.addChild(excNode);
} catch (ArchitectException e) {
logger.error("Couldn't add SQLExceptionNode \""+excNode.getName()+"\"
to tree model:", e); //$NON-NLS-1$ //$NON-NLS-2$
- ASUtils.showExceptionDialogNoReport("Failed to add SQLExceptionNode to
tree model.", e); //$NON-NLS-1$
+ SPSUtils.showExceptionDialogNoReport("Failed to add SQLExceptionNode to
tree model.", e); //$NON-NLS-1$
}
return excNode;
}
