Author: ruschein
Date: 2011-05-13 10:24:33 -0700 (Fri, 13 May 2011)
New Revision: 25047
Removed:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/ui/UserNamePasswordDialog.java
Modified:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/GSUtils.java
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoadNetworkFromGenomeSpace.java
Log:
Swapped out our own GS login dialog with the standard one provided by the CDK.
Modified:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/GSUtils.java
===================================================================
---
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/GSUtils.java
2011-05-13 15:49:26 UTC (rev 25046)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/GSUtils.java
2011-05-13 17:24:33 UTC (rev 25047)
@@ -2,8 +2,8 @@
import cytoscape.Cytoscape;
-import cytoscape.genomespace.ui.UserNamePasswordDialog;
+import java.awt.Dialog;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
@@ -11,9 +11,10 @@
import javax.swing.JOptionPane;
import org.genomespace.client.GsSession;
+import org.genomespace.client.User;
import org.genomespace.client.exceptions.AuthorizationException;
import org.genomespace.client.exceptions.GSClientException;
-import org.genomespace.client.User;
+import org.genomespace.client.ui.GSLoginDialog;
import org.genomespace.datamanager.core.GSFileMetadata;
@@ -38,10 +39,11 @@
public static boolean loginToGenomeSpace() {
for (;;) {
- final UserNamePasswordDialog userNamePasswordDialog =
new UserNamePasswordDialog();
- userNamePasswordDialog.setVisible(true);
- final String userName =
userNamePasswordDialog.getUserName();
- final String password =
userNamePasswordDialog.getPassword();
+ final GSLoginDialog loginDialog =
+ new GSLoginDialog(null,
Dialog.ModalityType.APPLICATION_MODAL);
+ loginDialog.setVisible(true);
+ final String userName = loginDialog.getUsername();
+ final String password = loginDialog.getPassword();
if (userName == null || userName.isEmpty() || password
== null || password.isEmpty()) {
System.out.println("no login info");
return false;
Modified:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoadNetworkFromGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoadNetworkFromGenomeSpace.java
2011-05-13 15:49:26 UTC (rev 25046)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoadNetworkFromGenomeSpace.java
2011-05-13 17:24:33 UTC (rev 25047)
@@ -6,7 +6,6 @@
import cytoscape.data.readers.GMLReader;
import cytoscape.data.readers.InteractionsReader;
import cytoscape.data.readers.XGMMLReader;
-import cytoscape.genomespace.filechoosersupport.GenomeSpaceFileSystemView;
import cytoscape.logger.CyLogger;
import cytoscape.util.CytoscapeAction;
import cytoscape.util.FileUtil;
Deleted:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/ui/UserNamePasswordDialog.java
===================================================================
---
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/ui/UserNamePasswordDialog.java
2011-05-13 15:49:26 UTC (rev 25046)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/ui/UserNamePasswordDialog.java
2011-05-13 17:24:33 UTC (rev 25047)
@@ -1,108 +0,0 @@
-package cytoscape.genomespace.ui;
-
-
-import cytoscape.Cytoscape;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.GridBagLayout;
-import java.awt.GridBagConstraints;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JTextField;
-import javax.swing.border.LineBorder;
-
-
-public final class UserNamePasswordDialog extends JDialog {
- private String userName = null;
- private String password = null;
- private final JLabel userNameLabel;
- private final JLabel passwordLabel;
- private final JTextField userNameTextField;
- private final JPasswordField passwordField;
- private final JButton loginButton;
- private final JButton cancelButton;
-
- public UserNamePasswordDialog() {
- super(Cytoscape.getDesktop(), "Genome Space Authentication", /*
modal = */ true);
-
- final JPanel userNameAndPasswordPanel = new JPanel(new
GridBagLayout());
- final GridBagConstraints constraints = new GridBagConstraints();
- constraints.fill = GridBagConstraints.HORIZONTAL;
-
- userNameLabel = new JLabel("GS User name: ");
- constraints.gridx = 0;
- constraints.gridy = 0;
- constraints.gridwidth = 1;
- userNameAndPasswordPanel.add(userNameLabel, constraints);
-
- userNameTextField = new JTextField(20);
- constraints.gridx = 1;
- constraints.gridy = 0;
- constraints.gridwidth = 2;
- userNameAndPasswordPanel.add(userNameTextField, constraints);
-
- passwordLabel = new JLabel("GS Password: ");
- constraints.gridx = 0;
- constraints.gridy = 1;
- constraints.gridwidth = 1;
- userNameAndPasswordPanel.add(passwordLabel, constraints);
-
- passwordField = new JPasswordField(20);
- constraints.gridx = 1;
- constraints.gridy = 1;
- constraints.gridwidth = 2;
- userNameAndPasswordPanel.add(passwordField, constraints);
-
- userNameAndPasswordPanel.setBorder(new LineBorder(Color.GRAY));
-
- final JPanel buttonPanel = new JPanel();
- loginButton = new JButton("Login");
- loginButton.addActionListener(new ActionListener() {
- public void actionPerformed(final ActionEvent e) {
- if
(userNameTextField.getText().trim().isEmpty())
-
JOptionPane.showMessageDialog(UserNamePasswordDialog.this,
- "Please
enter a non-empty user name!",
- "Error",
-
JOptionPane.ERROR_MESSAGE);
- else if (passwordField.getPassword().length ==
0)
-
JOptionPane.showMessageDialog(UserNamePasswordDialog.this,
- "Please
enter a non-empty password!",
- "Error",
-
JOptionPane.ERROR_MESSAGE);
- else {
- userName =
userNameTextField.getText().trim();
- password = new
String(passwordField.getPassword());
- dispose();
- }
- }
- });
- buttonPanel.add(loginButton);
- getRootPane().setDefaultButton(loginButton);
-
- cancelButton = new JButton("Cancel");
- cancelButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- dispose();
- }
- });
- buttonPanel.add(cancelButton);
-
- getContentPane().add(userNameAndPasswordPanel,
BorderLayout.CENTER);
- getContentPane().add(buttonPanel, BorderLayout.PAGE_END);
-
- pack();
- setResizable(false);
- setLocationRelativeTo(Cytoscape.getDesktop());
- }
-
- public String getUserName() { return userName; }
- public String getPassword() { return password; }
-}
\ No newline at end of file
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
