Author: kono
Date: 2011-01-20 13:50:08 -0800 (Thu, 20 Jan 2011)
New Revision: 23528
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/client/AbstractWebServiceClient.java
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/task/ShowBiomartGUIAction.java
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/ui/BiomartAttrMappingPanel.java
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/ui/BiomartMainDialog.java
Log:
Biomart client is using new API. But not working due to broken TaskMonitor.
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-01-20 21:09:01 UTC (rev 23527)
+++
core3/webservice-api/trunk/src/main/java/org/cytoscape/io/webservice/WebServiceClient.java
2011-01-20 21:50:08 UTC (rev 23528)
@@ -37,6 +37,7 @@
import java.awt.Container;
import java.net.URI;
+import org.cytoscape.work.ProvidesGUI;
import org.cytoscape.work.TaskFactory;
/**
@@ -84,6 +85,6 @@
*
* @return
*/
- Container getQueryBuilderGUI();
+ @ProvidesGUI Container getQueryBuilderGUI();
}
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-01-20 21:09:01 UTC (rev 23527)
+++
core3/webservice-api/trunk/src/main/java/org/cytoscape/io/webservice/client/AbstractWebServiceClient.java
2011-01-20 21:50:08 UTC (rev 23528)
@@ -39,7 +39,7 @@
import java.net.URISyntaxException;
import org.cytoscape.io.webservice.WebServiceClient;
-import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.ProvidesGUI;
@@ -93,10 +93,8 @@
}
- @Override
+ @Override @ProvidesGUI
public Container getQueryBuilderGUI() {
return panel;
}
-
-
}
Modified:
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/task/ShowBiomartGUIAction.java
===================================================================
---
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/task/ShowBiomartGUIAction.java
2011-01-20 21:09:01 UTC (rev 23527)
+++
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/task/ShowBiomartGUIAction.java
2011-01-20 21:50:08 UTC (rev 23528)
@@ -60,33 +60,18 @@
// Prepare repository data.
logger.debug("BioMart Dialog initialization process
start.");
- initDataSource();
- dialog = new BiomartMainDialog(client.getRestClient(),
taskManager, appManager, tblManager, app);
+ //initDataSource();
+ dialog = new BiomartMainDialog(client, taskManager,
appManager, tblManager, app);
logger.info("BioMart Client dialog initialized.");
}
dialog.setLocationRelativeTo(app.getJFrame());
dialog.setVisible(true);
-
-
-// final Task dummy = new DummyTask();
-// final BioMartTaskFactory tf = new BioMartTaskFactory(dummy);
-// taskManager.setParent(dialog);
-// taskManager.execute(tf);
-
logger.info("BioMart Client initialized.");
}
- // Test
- private class DummyTask extends AbstractTask {
- @Override
- public void run(TaskMonitor taskMonitor) throws Exception {
- Thread.sleep(5000);
- }
- }
-
private List<String> initDataSource() {
final ValuedTask<LoadRepositoryResult> firstTask = new
LoadRepositoryTask(client.getRestClient());
final ValuedTaskExecutor<LoadRepositoryResult> ex =
@@ -99,22 +84,22 @@
List<String> dsList = null;
//FIXME
-// try {
-// result = ex.get();
-//
-//// this.datasourceMap = result.getDatasourceMap();
-// dsList = result.getSortedDataSourceList();
-// System.out.println("GOT datasource list from task: " +
dsList);
-//// for (String ds : dsList)
-//// this.databaseComboBox.addItem(ds);
-//
-// } catch (CancellationException e) {
-// e.printStackTrace();
-// } catch (InterruptedException e) {
-// e.printStackTrace();
-// } catch (ExecutionException e) {
-// e.printStackTrace();
-// }
+ try {
+ result = ex.get();
+
+// this.datasourceMap = result.getDatasourceMap();
+ dsList = result.getSortedDataSourceList();
+ System.out.println("GOT datasource list from task: " +
dsList);
+// for (String ds : dsList)
+// this.databaseComboBox.addItem(ds);
+
+ } catch (CancellationException e) {
+ e.printStackTrace();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ }
return dsList;
}
Modified:
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/ui/BiomartAttrMappingPanel.java
===================================================================
---
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/ui/BiomartAttrMappingPanel.java
2011-01-20 21:09:01 UTC (rev 23527)
+++
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/ui/BiomartAttrMappingPanel.java
2011-01-20 21:50:08 UTC (rev 23528)
@@ -70,6 +70,7 @@
import org.cytoscape.work.TaskManager;
import org.cytoscape.work.ValuedTask;
import org.cytoscape.work.ValuedTaskExecutor;
+import org.cytoscape.work.swing.GUITaskManager;
/**
*
@@ -144,7 +145,7 @@
attrNameMap = new HashMap<String, Map<String, String>>();
// Import list of repositories.
- //loadMartServiceList();
+ loadMartServiceList();
// Load available filters for current source.
//loadFilter();
@@ -158,7 +159,7 @@
firstTask);
final BioMartTaskFactory tf = new BioMartTaskFactory(ex);
System.out.println("Current thread: " + Thread.currentThread());
- //((GUITaskManager) taskManager).setParent(parent);
+ ((GUITaskManager) taskManager).setParent(parent);
taskManager.execute(tf);
LoadRepositoryResult result;
Modified:
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/ui/BiomartMainDialog.java
===================================================================
---
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/ui/BiomartMainDialog.java
2011-01-20 21:09:01 UTC (rev 23527)
+++
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/ui/BiomartMainDialog.java
2011-01-20 21:50:08 UTC (rev 23528)
@@ -67,7 +67,7 @@
* @param appManager
* @param tblManager
*/
- public BiomartMainDialog(final BiomartRestClient client, final
TaskManager taskManager,
+ public BiomartMainDialog(final BiomartClient client, final TaskManager
taskManager,
final CyApplicationManager appManager,
final CyTableManager tblManager, final
CySwingApplication app) {
super();
@@ -89,7 +89,9 @@
tunablePanel.add(tPanel);
- panel = new BiomartAttrMappingPanel(client,taskManager,
appManager, tblManager, app.getJFrame());
+ panel = new BiomartAttrMappingPanel(client.getRestClient(),
taskManager, appManager, tblManager, app.getJFrame());
+ client.setGUI(panel);
+
tabs.addTab("Query", panel);
add(tabs);
--
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.
