Author: kono
Date: 2011-06-14 11:17:26 -0700 (Tue, 14 Jun 2011)
New Revision: 25748
Modified:
core3/webservice-api/trunk/pom.xml
core3/webservice-api/trunk/src/main/java/org/cytoscape/io/webservice/WebServiceClient.java
core3/webservice-api/trunk/src/main/java/org/cytoscape/io/webservice/client/AbstractWebServiceClient.java
core3/webservice-impl/trunk/src/main/java/org/cytoscape/webservice/internal/ui/UnifiedNetworkImportDialog.java
Log:
setQuery() method had been added. This may be changed later.
Modified: core3/webservice-api/trunk/pom.xml
===================================================================
--- core3/webservice-api/trunk/pom.xml 2011-06-14 17:54:30 UTC (rev 25747)
+++ core3/webservice-api/trunk/pom.xml 2011-06-14 18:17:26 UTC (rev 25748)
@@ -115,7 +115,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>io-api</artifactId>
- <version>3.0.0-alpha4-SNAPSHOT</version>
+ <version>3.0.0-alpha5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/webservice-api/trunk/src/main/java/org/cytoscape/io/webservice/WebServiceClient.java
===================================================================
---
core3/webservice-api/trunk/src/main/java/org/cytoscape/io/webservice/WebServiceClient.java
2011-06-14 17:54:30 UTC (rev 25747)
+++
core3/webservice-api/trunk/src/main/java/org/cytoscape/io/webservice/WebServiceClient.java
2011-06-14 18:17:26 UTC (rev 25748)
@@ -87,4 +87,12 @@
*/
@ProvidesGUI Container getQueryBuilderGUI();
+
+ /**
+ * Set query for the tasks to be executed.
+ *
+ * @param query query object. This is client-dependent.
+ */
+ void setQuery(Object query);
+
}
Modified:
core3/webservice-api/trunk/src/main/java/org/cytoscape/io/webservice/client/AbstractWebServiceClient.java
===================================================================
---
core3/webservice-api/trunk/src/main/java/org/cytoscape/io/webservice/client/AbstractWebServiceClient.java
2011-06-14 17:54:30 UTC (rev 25747)
+++
core3/webservice-api/trunk/src/main/java/org/cytoscape/io/webservice/client/AbstractWebServiceClient.java
2011-06-14 18:17:26 UTC (rev 25748)
@@ -60,6 +60,8 @@
// By default, this is null.
protected final Container panel = null;
+
+ protected Object currentQuery = null;
public AbstractWebServiceClient(final String uri, final String
displayName, final String description) {
@@ -101,4 +103,9 @@
public Container getQueryBuilderGUI() {
return panel;
}
+
+
+ @Override public void setQuery(Object query) {
+ this.currentQuery = query;
+ }
}
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-06-14 17:54:30 UTC (rev 25747)
+++
core3/webservice-impl/trunk/src/main/java/org/cytoscape/webservice/internal/ui/UnifiedNetworkImportDialog.java
2011-06-14 18:17:26 UTC (rev 25748)
@@ -56,7 +56,11 @@
import org.cytoscape.io.webservice.NetworkImportWebServiceClient;
import org.cytoscape.io.webservice.SearchWebServiceClient;
import org.cytoscape.io.webservice.WebServiceClient;
+import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TaskManager;
+import org.cytoscape.work.TaskMonitor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -433,9 +437,10 @@
throw new IllegalStateException("Selected cleint does
not have search function.");
}
+ // Set query. Just pass the text in the panel.
+ client.setQuery(this.queryTextPane.getText());
taskManager.execute(client);
-
- logger.info("Network Import from WS Success!");
+
}
private void aboutButtonActionPerformed(ActionEvent evt) {
@@ -452,7 +457,34 @@
}
//AboutDialog.showDialog(clientName, icon, description);
}
+
+ private final class ImportNetworkTaskFactory implements TaskFactory {
+ private final TaskFactory tFactory;
+
+ ImportNetworkTaskFactory(TaskFactory tFactory) {
+ this.tFactory = tFactory;
+ }
+
+ @Override
+ public TaskIterator getTaskIterator() {
+ final TaskIterator itr = new TaskIterator();
+ itr.insertTasksAfter(new RegisterNetworkTask(),
tFactory.getTaskIterator().next());
+ return itr;
+ }
+
+ }
+
+ private final class RegisterNetworkTask extends AbstractTask {
+
+ @Override
+ public void run(TaskMonitor taskMonitor) throws Exception {
+ logger.debug("Executing register task
------------------");
+ logger.info("DONE!");
+ }
+
+ }
+
/**
* Clear query text field.
*/
--
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.
