Author: mes
Date: 2011-10-05 16:47:15 -0700 (Wed, 05 Oct 2011)
New Revision: 27077
Added:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoginToGenomeSpace.java
Modified:
csplugins/trunk/ucsd/mes/genomespace-plugin/pom.xml
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/GSUtils.java
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/GenomeSpacePlugin.java
Log:
added login feature
Modified: csplugins/trunk/ucsd/mes/genomespace-plugin/pom.xml
===================================================================
--- csplugins/trunk/ucsd/mes/genomespace-plugin/pom.xml 2011-10-05 23:24:07 UTC
(rev 27076)
+++ csplugins/trunk/ucsd/mes/genomespace-plugin/pom.xml 2011-10-05 23:47:15 UTC
(rev 27077)
@@ -13,6 +13,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -51,13 +52,13 @@
<dependency>
<groupId>cytoscape</groupId>
<artifactId>application</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>cytoscape.coreplugins</groupId>
<artifactId>table-import</artifactId>
- <version>2.8.2-SNAPSHOT</version>
+ <version>2.8.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -83,9 +84,14 @@
</dependency>
<dependency>
<groupId>org.genomespace</groupId>
- <artifactId>datamanager-messages</artifactId>
+ <artifactId>dm-messages</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.genomespace</groupId>
+ <artifactId>identityServer-messages</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
<repositories>
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-10-05 23:24:07 UTC (rev 27076)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/GSUtils.java
2011-10-05 23:47:15 UTC (rev 27077)
@@ -24,11 +24,13 @@
private static GsSession session = null;
- public static GsSession getSession() {
+ public static synchronized GsSession getSession() {
if (session == null || !session.isLoggedIn()) {
try {
- session = new GsSession();
- if (session.isLoggedIn() &&
!loginToGenomeSpace())
+ // Session won't be logged after this because
+ // token parameter is null!
+ session = new GsSession(null);
+ if (!loginToGenomeSpace())
throw new GSClientException("failed to
login!", null);
} catch (Exception e) {
throw new GSClientException("failed to login",
e);
@@ -37,8 +39,20 @@
return session;
}
- public static boolean loginToGenomeSpace() {
- org.genomespace.client.ConfigurationUrls.init("test");
+ public static synchronized void reloginToGenomeSpace() {
+ if ( session != null && session.isLoggedIn() ) {
+ try {
+ session.logout();
+ } catch (Exception e) { }
+ session = null;
+ }
+
+ getSession();
+ }
+
+ public static synchronized boolean loginToGenomeSpace() {
+ String gsenv =
System.getProperty("genomespace.environment","test").toString();
+ org.genomespace.client.ConfigurationUrls.init(gsenv);
for (;;) {
final GSLoginDialog loginDialog =
new GSLoginDialog(null,
Dialog.ModalityType.APPLICATION_MODAL);
@@ -46,7 +60,6 @@
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/GenomeSpacePlugin.java
===================================================================
---
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/GenomeSpacePlugin.java
2011-10-05 23:24:07 UTC (rev 27076)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/GenomeSpacePlugin.java
2011-10-05 23:47:15 UTC (rev 27077)
@@ -55,5 +55,8 @@
LoadOntologyAndAnnotationFromGenomeSpace
loadOntologyAndAnnotationFromGenomeSpace =
new LoadOntologyAndAnnotationFromGenomeSpace();
Cytoscape.getDesktop().getCyMenus().addAction(loadOntologyAndAnnotationFromGenomeSpace);
+
+ LoginToGenomeSpace loginToGenomeSpace = new
LoginToGenomeSpace();
+
Cytoscape.getDesktop().getCyMenus().addAction(loginToGenomeSpace);
}
}
Added:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoginToGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoginToGenomeSpace.java
(rev 0)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoginToGenomeSpace.java
2011-10-05 23:47:15 UTC (rev 27077)
@@ -0,0 +1,44 @@
+package cytoscape.genomespace;
+
+
+import cytoscape.Cytoscape;
+import cytoscape.data.CyAttributes;
+import cytoscape.data.readers.CyAttributesReader;
+import cytoscape.logger.CyLogger;
+import cytoscape.util.CytoscapeAction;
+
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.List;
+import javax.swing.ImageIcon;
+import javax.swing.JOptionPane;
+
+import org.genomespace.client.DataManagerClient;
+import org.genomespace.client.GsSession;
+import org.genomespace.client.User;
+import org.genomespace.datamanager.core.GSFileMetadata;
+import org.genomespace.client.exceptions.AuthorizationException;
+import org.genomespace.client.exceptions.GSClientException;
+import org.genomespace.client.ui.GSLoginDialog;
+
+
+public class LoginToGenomeSpace extends CytoscapeAction {
+ private static final long serialVersionUID = 7577788473487659L;
+ private static final CyLogger logger =
CyLogger.getLogger(LoginToGenomeSpace.class);
+
+ public LoginToGenomeSpace() {
+ super("Login To GenomeSpace...",
+ new
ImageIcon(LoginToGenomeSpace.class.getResource("/images/genomespace_icon.gif")));
+
+ // Set the menu you'd like here. Plugins don't need
+ // to live in the Plugins menu, so choose whatever
+ // is appropriate!
+ setPreferredMenu("File.GenomeSpace");
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ GSUtils.reloginToGenomeSpace();
+ }
+}
--
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.
