Author: kono
Date: 2012-05-08 13:04:00 -0700 (Tue, 08 May 2012)
New Revision: 29152
Modified:
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/BiomartClient.java
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/CyActivator.java
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/CyActivator.java
Log:
fixes #963 Marker interface added to the client.
Modified:
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/BiomartClient.java
===================================================================
---
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/BiomartClient.java
2012-05-08 19:47:34 UTC (rev 29151)
+++
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/BiomartClient.java
2012-05-08 20:04:00 UTC (rev 29152)
@@ -31,26 +31,24 @@
import javax.naming.ConfigurationException;
-import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.io.webservice.TableImportWebServiceClient;
import org.cytoscape.io.webservice.biomart.rest.BiomartRestClient;
import org.cytoscape.io.webservice.biomart.task.ImportTableTask;
import org.cytoscape.io.webservice.biomart.ui.BiomartAttrMappingPanel;
import org.cytoscape.io.webservice.swing.AbstractWebServiceGUIClient;
-import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
-import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.task.edit.MapTableToNetworkTablesTaskFactory;
import org.cytoscape.work.TaskIterator;
import org.osgi.framework.ServiceException;
/**
- * Biomart Web Service Client.
+ * BioMart Web Service Client.
*
*/
-public class BiomartClient extends AbstractWebServiceGUIClient {
+public class BiomartClient extends AbstractWebServiceGUIClient implements
TableImportWebServiceClient {
private final CyTableFactory tableFactory;
private final BiomartRestClient restClient;
Modified:
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/CyActivator.java
===================================================================
---
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/CyActivator.java
2012-05-08 19:47:34 UTC (rev 29151)
+++
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/CyActivator.java
2012-05-08 20:04:00 UTC (rev 29152)
@@ -21,9 +21,9 @@
super();
}
-
public void start(BundleContext bc) {
+ // Import services
CySwingApplication cySwingApplicationServiceRef =
getService(bc,CySwingApplication.class);
DialogTaskManager taskManagerServiceRef =
getService(bc,DialogTaskManager.class);
CyNetworkManager cyNetworkManagerServiceRef =
getService(bc,CyNetworkManager.class);
@@ -32,15 +32,14 @@
CyTableFactory cyTableFactoryServiceRef =
getService(bc,CyTableFactory.class);
MapTableToNetworkTablesTaskFactory mapNetworkAttrTFServiceRef =
getService(bc,MapTableToNetworkTablesTaskFactory.class);
+
+ // Export services
BiomartRestClient biomartRestClient = new
BiomartRestClient("http://www.biomart.org/biomart/martservice";);
BiomartAttrMappingPanel biomartAttrMappingPanel = new
BiomartAttrMappingPanel(taskManagerServiceRef,cyApplicationManagerServiceRef,cyTableManagerServiceRef,cyNetworkManagerServiceRef);
BiomartClient biomartClient = new BiomartClient("BioMart
Client","REST version of BioMart Web Service
Client.",biomartRestClient,cyTableFactoryServiceRef,cySwingApplicationServiceRef,cyTableManagerServiceRef,
biomartAttrMappingPanel, mapNetworkAttrTFServiceRef);
biomartAttrMappingPanel.setClient(biomartClient);
- //ShowBiomartGUIAction showBiomartGUIAction = new
ShowBiomartGUIAction(biomartAttrMappingPanel,biomartClient,taskManagerServiceRef,cyApplicationManagerServiceRef,cySwingApplicationServiceRef);
-
- //registerService(bc,showBiomartGUIAction,CyAction.class, new
Properties());
registerAllServices(bc,biomartAttrMappingPanel, new
Properties());
registerAllServices(bc,biomartClient, new Properties());
}
Modified:
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/CyActivator.java
2012-05-08 19:47:34 UTC (rev 29151)
+++
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/CyActivator.java
2012-05-08 20:04:00 UTC (rev 29152)
@@ -30,8 +30,11 @@
DialogTaskManager taskManagerServiceRef = getService(bc,
DialogTaskManager.class);
OpenBrowser openBrowser = getService(bc, OpenBrowser.class);
+ // UI for Network Import Clients
WebServiceImportDialog<NetworkImportWebServiceClient>
unifiedNetworkImportDialog = new
WebServiceImportDialog<NetworkImportWebServiceClient>(
NetworkImportWebServiceClient.class, "Import
Network from Web Service", taskManagerServiceRef, openBrowser);
+
+ // UI for Table Import Clients
WebServiceImportDialog<TableImportWebServiceClient>
unifiedTableImportDialog = new
WebServiceImportDialog<TableImportWebServiceClient>(
TableImportWebServiceClient.class, "Import Data
Table from Web Service", taskManagerServiceRef, openBrowser);
--
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.
