Author: mes
Date: 2011-09-19 11:16:40 -0700 (Mon, 19 Sep 2011)
New Revision: 26862
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/pom.xml
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/DeleteFileInGenomeSpace.java
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/DownloadFileFromGenomeSpace.java
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/ListFilesInGenomeSpace.java
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadAttrsFromGenomeSpace.java
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadNetworkFromGenomeSpace.java
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadOntologyAndAnnotationFromGenomeSpace.java
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadSessionFromGenomeSpace.java
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadTableAttrsFromGenomeSpace.java
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadTableNetworkFromGenomeSpace.java
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/SaveNetworkToGenomeSpace.java
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/SaveSessionToGenomeSpace.java
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/UploadFileToGenomeSpace.java
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
got it working with genomespace code
Modified: csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/pom.xml
===================================================================
--- csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/pom.xml
2011-09-19 15:13:34 UTC (rev 26861)
+++ csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/pom.xml
2011-09-19 18:16:40 UTC (rev 26862)
@@ -90,13 +90,18 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>swing-application-api</artifactId>
- <version>3.0.0-alpha3-SNAPSHOT</version>
+ <version>3.0.0-alpha8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>session-api</artifactId>
- <version>3.0.0-alpha6-SNAPSHOT</version>
+ <version>3.0.0-alpha8-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>application-api</artifactId>
+ <version>3.0.0-alpha8-SNAPSHOT</version>
+ </dependency>
<!-- Logging -->
<dependency>
@@ -113,12 +118,6 @@
<version>4.8.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>test-support</artifactId>
- <version>3.0.0-alpha2</version>
- <scope>test</scope>
- </dependency>
<!-- dependencies specifically for unit testing -->
<dependency>
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/DeleteFileInGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/DeleteFileInGenomeSpace.java
2011-09-19 15:13:34 UTC (rev 26861)
+++
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/DeleteFileInGenomeSpace.java
2011-09-19 18:16:40 UTC (rev 26862)
@@ -3,7 +3,7 @@
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.application.CyApplicationManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/DownloadFileFromGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/DownloadFileFromGenomeSpace.java
2011-09-19 15:13:34 UTC (rev 26861)
+++
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/DownloadFileFromGenomeSpace.java
2011-09-19 18:16:40 UTC (rev 26862)
@@ -5,7 +5,7 @@
import org.slf4j.LoggerFactory;
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.application.CyApplicationManager;
import java.awt.FileDialog;
import java.awt.event.ActionEvent;
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/ListFilesInGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/ListFilesInGenomeSpace.java
2011-09-19 15:13:34 UTC (rev 26861)
+++
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/ListFilesInGenomeSpace.java
2011-09-19 18:16:40 UTC (rev 26862)
@@ -4,7 +4,7 @@
import org.cytoscape.genomespace.internal.filechoosersupport.GenomeSpaceTree;
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.application.CyApplicationManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadAttrsFromGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadAttrsFromGenomeSpace.java
2011-09-19 15:13:34 UTC (rev 26861)
+++
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadAttrsFromGenomeSpace.java
2011-09-19 18:16:40 UTC (rev 26862)
@@ -5,7 +5,7 @@
import org.slf4j.LoggerFactory;
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.application.CyApplicationManager;
import java.awt.event.ActionEvent;
import java.io.File;
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadNetworkFromGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadNetworkFromGenomeSpace.java
2011-09-19 15:13:34 UTC (rev 26861)
+++
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadNetworkFromGenomeSpace.java
2011-09-19 18:16:40 UTC (rev 26862)
@@ -6,7 +6,7 @@
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.application.CyApplicationManager;
import java.awt.event.ActionEvent;
import java.io.File;
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadOntologyAndAnnotationFromGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadOntologyAndAnnotationFromGenomeSpace.java
2011-09-19 15:13:34 UTC (rev 26861)
+++
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadOntologyAndAnnotationFromGenomeSpace.java
2011-09-19 18:16:40 UTC (rev 26862)
@@ -5,7 +5,7 @@
import org.slf4j.LoggerFactory;
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.application.CyApplicationManager;
import java.awt.event.ActionEvent;
import java.io.File;
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadSessionFromGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadSessionFromGenomeSpace.java
2011-09-19 15:13:34 UTC (rev 26861)
+++
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadSessionFromGenomeSpace.java
2011-09-19 18:16:40 UTC (rev 26862)
@@ -6,7 +6,7 @@
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.application.CyApplicationManager;
import java.awt.Frame;
import java.awt.event.ActionEvent;
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadTableAttrsFromGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadTableAttrsFromGenomeSpace.java
2011-09-19 15:13:34 UTC (rev 26861)
+++
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadTableAttrsFromGenomeSpace.java
2011-09-19 18:16:40 UTC (rev 26862)
@@ -5,7 +5,7 @@
import org.slf4j.LoggerFactory;
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.application.CyApplicationManager;
import java.awt.event.ActionEvent;
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadTableNetworkFromGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadTableNetworkFromGenomeSpace.java
2011-09-19 15:13:34 UTC (rev 26861)
+++
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/LoadTableNetworkFromGenomeSpace.java
2011-09-19 18:16:40 UTC (rev 26862)
@@ -5,7 +5,7 @@
import org.slf4j.LoggerFactory;
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.application.CyApplicationManager;
import java.awt.event.ActionEvent;
import java.io.File;
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/SaveNetworkToGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/SaveNetworkToGenomeSpace.java
2011-09-19 15:13:34 UTC (rev 26861)
+++
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/SaveNetworkToGenomeSpace.java
2011-09-19 18:16:40 UTC (rev 26862)
@@ -5,7 +5,7 @@
import org.slf4j.LoggerFactory;
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.application.CyApplicationManager;
import java.awt.FileDialog;
import java.awt.event.ActionEvent;
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/SaveSessionToGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/SaveSessionToGenomeSpace.java
2011-09-19 15:13:34 UTC (rev 26861)
+++
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/SaveSessionToGenomeSpace.java
2011-09-19 18:16:40 UTC (rev 26862)
@@ -4,7 +4,7 @@
import org.slf4j.LoggerFactory;
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.application.CyApplicationManager;
import java.awt.FileDialog;
import java.awt.event.ActionEvent;
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/UploadFileToGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/UploadFileToGenomeSpace.java
2011-09-19 15:13:34 UTC (rev 26861)
+++
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/java/org/cytoscape/genomespace/internal/UploadFileToGenomeSpace.java
2011-09-19 18:16:40 UTC (rev 26862)
@@ -5,7 +5,7 @@
import org.slf4j.LoggerFactory;
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.application.CyApplicationManager;
import java.awt.FileDialog;
import java.awt.event.ActionEvent;
Modified:
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-19 15:13:34 UTC (rev 26861)
+++
csplugins/trunk/ucsd/ruschein/genomespace-plugin-cytoscape3/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-19 18:16:40 UTC (rev 26862)
@@ -9,7 +9,7 @@
default-lazy-init="false">
<osgi:reference id="cyApplicationManagerServiceRef"
- interface="org.cytoscape.session.CyApplicationManager" />
+ interface="org.cytoscape.application.CyApplicationManager" />
<osgi:reference id="cySwingApplicationServiceRef"
interface="org.cytoscape.application.swing.CySwingApplication"
/>
--
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.
