Revision: 3347
Author: ferguson.sebastian
Date: Tue Mar 2 10:33:08 2010
Log: One can now test a server connection, and the labels for the buttons
on the projects manager now have the correct number of dots.
http://code.google.com/p/power-architect/source/detail?r=3347
Modified:
/trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java
/trunk/src/ca/sqlpower/architect/swingui/enterprise/ServerProjectsManagerPanel.java
=======================================
--- /trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java Thu Feb 25
09:46:15 2010
+++ /trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java Tue Mar 2
10:33:08 2010
@@ -39,6 +39,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.sql.Types;
+import java.util.List;
import java.util.prefs.Preferences;
import javax.swing.AbstractAction;
@@ -67,6 +68,7 @@
import ca.sqlpower.architect.ArchitectSession;
import ca.sqlpower.architect.CoreUserSettings;
import ca.sqlpower.architect.UserSettings;
+import ca.sqlpower.architect.enterprise.ArchitectClientSideSession;
import ca.sqlpower.architect.layout.ArchitectLayout;
import ca.sqlpower.architect.layout.FruchtermanReingoldForceLayout;
import ca.sqlpower.architect.olap.OLAPSession;
@@ -257,6 +259,21 @@
JOptionPane.showMessageDialog(ArchitectFrame.this, "Please select a
server", "", JOptionPane.INFORMATION_MESSAGE);
}
}
+ });
+
+ sim.setTestAction(new AbstractAction("Test Server") {
+ public void actionPerformed(ActionEvent e) {
+ String msg = "Unable to connect to server";
+ try {
+ List l =
ArchitectClientSideSession.getWorkspaceNames(sim.getSelectedServer());
+ if (l != null) {
+ msg = "Successfuly connected to server";
+ }
+ } catch (Exception ex) {
+ }
+
+ JOptionPane.showMessageDialog(ArchitectFrame.this,
msg);
+ }
});
d.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
=======================================
---
/trunk/src/ca/sqlpower/architect/swingui/enterprise/ServerProjectsManagerPanel.java
Thu Feb 25 14:40:55 2010
+++
/trunk/src/ca/sqlpower/architect/swingui/enterprise/ServerProjectsManagerPanel.java
Tue Mar 2 10:33:08 2010
@@ -59,7 +59,7 @@
private JList projects;
private JList servers;
- private Action refreshAction = new AbstractAction("Refresh...") {
+ private Action refreshAction = new AbstractAction("Refresh") {
public void actionPerformed(ActionEvent e) {
refreshInfoList();
}
@@ -85,7 +85,7 @@
}
};
- private Action openAction = new AbstractAction("Open...") {
+ private Action openAction = new AbstractAction("Open") {
public void actionPerformed(ActionEvent e) {
if (getSelectedServerInfo() != null) {
@@ -117,7 +117,7 @@
};
- private Action deleteAction = new AbstractAction("Delete...") {
+ private Action deleteAction = new AbstractAction("Delete") {
public void actionPerformed(ActionEvent e) {
if (getSelectedServerInfo() != null) {
