Revision: 3576
Author: [email protected]
Date: Mon May 31 13:51:12 2010
Log: NEW - bug 2843: Copy Table Data and Forward Engineering on a server
project uses local pl.ini
http://trillian.sqlpower.ca/bugzilla/show_bug.cgi?id=2843
The copy table data and forward engineering dialogs were showing the local
pl.ini database connections on server projects because it was getting the
connections from the session context, and not using the getDataSources()
method itself.
http://code.google.com/p/power-architect/source/detail?r=3576
Modified:
/trunk/src/main/java/ca/sqlpower/architect/swingui/ASUtils.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/DataMoverPanel.java
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ASUtils.java Thu
Mar 4 15:28:57 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ASUtils.java Mon May
31 13:51:12 2010
@@ -135,7 +135,7 @@
JComboBox newTargetDB = new JComboBox();
JDBCDataSource currentTarget =
session.getTargetDatabase().getDataSource();
newTargetDB.addItem(currentTarget);
- for (JDBCDataSource dbcs : session.getContext().getConnections()) {
+ for (JDBCDataSource dbcs :
session.getDataSources().getConnections()) {
if(!dbcs.equals(currentTarget)) {
newTargetDB.addItem(dbcs);
}
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Tue May 25 14:03:00 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Mon May 31 13:51:12 2010
@@ -159,7 +159,7 @@
private JScrollPane playpenScrollPane;
DBTree dbTree = null;
private Navigator navigatorDialog;
- private CompareDMDialog comapareDMDialog = null;
+ private CompareDMDialog compareDMDialog = null;
private int oldWidth;
private int oldHeight;
private int prefWidth;
@@ -591,9 +591,9 @@
autoLayout = new FruchtermanReingoldForceLayout();
autoLayoutAction.setLayout(autoLayout);
exportDDLAction = new ExportDDLAction(session);
- comapareDMDialog = new CompareDMDialog(session);
-
- compareDMAction = new CompareDMAction(session,comapareDMDialog);
+ compareDMDialog = new CompareDMDialog(session);
+
+ compareDMAction = new CompareDMAction(session,compareDMDialog);
dataMoverAction = new DataMoverAction(this, session);
sqlQueryAction = new SQLQueryAction(session);
@@ -1183,7 +1183,7 @@
}
public CompareDMDialog getCompareDMDialog() {
- return comapareDMDialog;
+ return compareDMDialog;
}
public ReverseRelationshipAction getReverseRelationshipAction() {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/DataMoverPanel.java
Fri May 28 15:08:38 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/DataMoverPanel.java
Mon May 31 13:51:12 2010
@@ -55,7 +55,6 @@
import ca.sqlpower.sql.DatabaseListChangeEvent;
import ca.sqlpower.sql.DatabaseListChangeListener;
import ca.sqlpower.sql.JDBCDataSource;
-import ca.sqlpower.sql.SPDataSource;
import ca.sqlpower.sqlobject.SQLCatalog;
import ca.sqlpower.sqlobject.SQLColumn;
import ca.sqlpower.sqlobject.SQLDatabase;
@@ -207,8 +206,8 @@
treeRoot.removeChild(treeRoot.getChild(i));
}
}
- for (SPDataSource ds : session.getContext().getConnections()) {
- treeRoot.addChild(new SQLDatabase((JDBCDataSource) ds));
+ for (JDBCDataSource ds :
session.getDataSources().getConnections()) {
+ treeRoot.addChild(new SQLDatabase(ds));
}
treeRoot.commit();
} catch (IllegalArgumentException e) {
