Author: jm
Date: 2011-03-29 12:38:42 -0700 (Tue, 29 Mar 2011)
New Revision: 24611
Modified:
core3/gui-distribution/trunk/startlevel-3/pom.xml
core3/webservice-impl/trunk/pom.xml
core3/webservice-impl/trunk/src/main/java/org/cytoscape/webservice/internal/ui/UnifiedNetworkImportDialog.java
Log:
Fixed support for plugin-provided webservice UI in UnifiedNetworkImportDialog
Updated POM references for webservice-api
Modified: core3/gui-distribution/trunk/startlevel-3/pom.xml
===================================================================
--- core3/gui-distribution/trunk/startlevel-3/pom.xml 2011-03-29 18:51:15 UTC
(rev 24610)
+++ core3/gui-distribution/trunk/startlevel-3/pom.xml 2011-03-29 19:38:42 UTC
(rev 24611)
@@ -192,7 +192,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>webservice-api</artifactId>
- <version>3.0.0-alpha1</version>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
</dependency>
<!-- Cytoscape Implementation Bundles -->
Modified: core3/webservice-impl/trunk/pom.xml
===================================================================
--- core3/webservice-impl/trunk/pom.xml 2011-03-29 18:51:15 UTC (rev 24610)
+++ core3/webservice-impl/trunk/pom.xml 2011-03-29 19:38:42 UTC (rev 24611)
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>webservice-api</artifactId>
- <version>3.0.0-alpha1</version>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
</dependency>
<dependency>
Modified:
core3/webservice-impl/trunk/src/main/java/org/cytoscape/webservice/internal/ui/UnifiedNetworkImportDialog.java
===================================================================
---
core3/webservice-impl/trunk/src/main/java/org/cytoscape/webservice/internal/ui/UnifiedNetworkImportDialog.java
2011-03-29 18:51:15 UTC (rev 24610)
+++
core3/webservice-impl/trunk/src/main/java/org/cytoscape/webservice/internal/ui/UnifiedNetworkImportDialog.java
2011-03-29 19:38:42 UTC (rev 24611)
@@ -56,7 +56,6 @@
import org.cytoscape.io.webservice.NetworkImportWebServiceClient;
import org.cytoscape.io.webservice.SearchWebServiceClient;
import org.cytoscape.io.webservice.WebServiceClient;
-import org.cytoscape.io.webservice.client.AbstractWebServiceClient;
import org.cytoscape.work.TaskManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -129,6 +128,13 @@
numClients++;
setComponentsEnabled(true);
+ if (client instanceof WebServiceClient) {
+ WebServiceClient service = (WebServiceClient) client;
+ Container container = service.getQueryBuilderGUI();
+ if (container != null) {
+ serviceUIPanels.put(client, container);
+ }
+ }
logger.info("New network import client registered: " + client);
}
--
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.
