Revision: 3510
Author: [email protected]
Date: Fri May 7 07:29:39 2010
Log: NEW - bug 2771: Testing a server connection doesn't report if it's
actually connected correctly.
http://trillian.sqlpower.ca/bugzilla/show_bug.cgi?id=2771
Added a ConnectionTestAction that contains a reference to all the
SPServerInfoPanels that has a Component it is assigned to. The
SPServerInfoManagerPanel uses this ConnectionTestAction when creating
SPServerInfoPanels so that the proper server connection can be tested.
This new ConnectionTestAction is used to test server connections in the
ArchitectFrame.
http://code.google.com/p/power-architect/source/detail?r=3510
Modified:
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Thu May 6 12:56:55 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Fri May 7 07:29:39 2010
@@ -70,6 +70,7 @@
import ca.sqlpower.architect.CoreUserSettings;
import ca.sqlpower.architect.UserSettings;
import ca.sqlpower.architect.enterprise.ArchitectClientSideSession;
+import ca.sqlpower.architect.enterprise.ProjectLocation;
import ca.sqlpower.architect.layout.ArchitectLayout;
import ca.sqlpower.architect.layout.FruchtermanReingoldForceLayout;
import ca.sqlpower.architect.olap.OLAPSession;
@@ -127,6 +128,7 @@
import ca.sqlpower.architect.swingui.olap.action.ImportSchemaAction;
import ca.sqlpower.architect.swingui.olap.action.OLAPEditAction;
import ca.sqlpower.architect.swingui.olap.action.OLAPSchemaManagerAction;
+import ca.sqlpower.enterprise.client.ConnectionTestAction;
import ca.sqlpower.enterprise.client.SPServerInfo;
import ca.sqlpower.sqlobject.SQLColumn;
import ca.sqlpower.sqlobject.SQLDatabase;
@@ -273,13 +275,15 @@
}
});
- sim.setTestAction(new AbstractAction("Test Server") {
+ sim.setTestAction(new ConnectionTestAction("Test Server") {
public void actionPerformed(ActionEvent e) {
String msg = "Unable to connect to server";
try {
- List l =
ArchitectClientSideSession.getWorkspaceNames(sim.getSelectedServer(),
session);
+ List<ProjectLocation> l =
+ ArchitectClientSideSession.getWorkspaceNames(
+ findPanel((JButton)
e.getSource()).getServerInfo(), session);
if (l != null) {
- msg = "Successfuly connected to server";
+ msg = "Successfully connected to server";
}
} catch (Exception ex) {
}
