Author: kono
Date: 2011-01-24 15:13:15 -0800 (Mon, 24 Jan 2011)
New Revision: 23585
Modified:
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/task/ShowNetworkImportDialogAction.java
core3/webservice-impl/trunk/src/main/java/org/cytoscape/webservice/internal/ui/UnifiedNetworkImportDialog.java
core3/webservice-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/webservice-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
core3/webservice-ncbi-client/trunk/src/main/java/org/cytoscape/webservice/ncbi/NCBIWebServiceClient.java
core3/webservice-ncbi-client/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/webservice-ncbi-client/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
NCBI Client is empty, but basic register/unregister mechanism is working for
common network import GUI.
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-24 22:29:11 UTC (rev 23584)
+++
core3/webservice-api/trunk/src/main/java/org/cytoscape/io/webservice/client/AbstractWebServiceClient.java
2011-01-24 23:13:15 UTC (rev 23585)
@@ -85,6 +85,10 @@
@Override public String getDescription() {
return description;
}
+
+ @Override public String toString() {
+ return this.displayName;
+ }
@Override
Modified:
core3/webservice-impl/trunk/src/main/java/org/cytoscape/webservice/internal/task/ShowNetworkImportDialogAction.java
===================================================================
---
core3/webservice-impl/trunk/src/main/java/org/cytoscape/webservice/internal/task/ShowNetworkImportDialogAction.java
2011-01-24 22:29:11 UTC (rev 23584)
+++
core3/webservice-impl/trunk/src/main/java/org/cytoscape/webservice/internal/task/ShowNetworkImportDialogAction.java
2011-01-24 23:13:15 UTC (rev 23585)
@@ -7,42 +7,37 @@
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.webservice.internal.ui.UnifiedNetworkImportDialog;
-import org.cytoscape.work.TaskManager;
-import org.cytoscape.work.TaskMonitor;
/**
- * Add menu item to open Unified Network Import GUI.
- *
+ * Network Import GUI.
+ *
*/
public class ShowNetworkImportDialogAction extends AbstractCyAction {
private static final long serialVersionUID = -36712860667900147L;
-
+
private UnifiedNetworkImportDialog dialog;
- private final TaskManager taskManager;
-
+
private final Window parent;
- public ShowNetworkImportDialogAction(final CyApplicationManager
applicationManager, final CySwingApplication app, final TaskManager
taskManager) {
+ public ShowNetworkImportDialogAction(
+ final CyApplicationManager applicationManager,
+ final CySwingApplication app,
+ final UnifiedNetworkImportDialog dialog) {
super("Public Databases...", applicationManager);
setPreferredMenu("File.Import.Network");
-
- if(taskManager == null)
- throw new NullPointerException("TaskMonitor is null.");
-
- this.taskManager = taskManager;
+
+ if (dialog == null)
+ throw new NullPointerException("Dialog is null.");
+
this.parent = app.getJFrame();
- dialog = null;
+ this.dialog = dialog;
}
@Override
public void actionPerformed(ActionEvent e) {
- if(dialog == null)
- dialog = new UnifiedNetworkImportDialog(taskManager);
-
dialog.setLocationRelativeTo(parent);
dialog.setVisible(true);
-
}
}
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-01-24 22:29:11 UTC (rev 23584)
+++
core3/webservice-impl/trunk/src/main/java/org/cytoscape/webservice/internal/ui/UnifiedNetworkImportDialog.java
2011-01-24 23:13:15 UTC (rev 23585)
@@ -35,33 +35,28 @@
package org.cytoscape.webservice.internal.ui;
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
-import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.swing.BoxLayout;
import javax.swing.DefaultListCellRenderer;
import javax.swing.GroupLayout;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.JDialog;
-import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
import javax.swing.LayoutStyle;
-import javax.swing.border.EmptyBorder;
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;
@@ -106,6 +101,7 @@
throw new NullPointerException("TaskManager is null.");
this.taskManager = taskManager;
+
numClients = 0;
setModal(false);
this.clients = new HashSet<NetworkImportWebServiceClient>();
@@ -124,7 +120,7 @@
* @param props
*/
public void addNetworkImportClient(
- final NetworkImportWebServiceClient client, Map props) {
+ final NetworkImportWebServiceClient client,
@SuppressWarnings("rawtypes") Map props) {
if(this.numClients == 0)
this.datasourceComboBox.removeAllItems();
@@ -132,6 +128,8 @@
this.clients.add(client);
numClients++;
setComponentsEnabled(true);
+
+ logger.info("New network import client registered: " + client);
}
@@ -142,7 +140,7 @@
* @param props
*/
public void removeNetworkImportClient(
- final NetworkImportWebServiceClient client, Map props) {
+ final NetworkImportWebServiceClient client,
@SuppressWarnings("rawtypes") Map props) {
datasourceComboBox.removeItem(client);
this.clients.remove(client);
@@ -418,6 +416,8 @@
*/
private void searchButtonActionPerformed() {
final Object selected = datasourceComboBox.getSelectedItem();
+ if(selected == null)
+ return;
WebServiceClient client = null;
if(selected instanceof SearchWebServiceClient && selected
instanceof WebServiceClient) {
@@ -426,7 +426,7 @@
throw new IllegalStateException("Selected cleint does
not have search function.");
}
- //taskManager.execute(client);
+ taskManager.execute(client);
logger.info("Network Import from WS Success!");
}
@@ -461,12 +461,14 @@
}
private void datasourceComboBoxActionPerformed(ActionEvent evt) {
-
- queryTextPane.setText("");
-
setProperty(clientNames.get(datasourceComboBox.getSelectedItem()));
final Object selected = datasourceComboBox.getSelectedItem();
+ if(selected == null)
+ return;
+ queryTextPane.setText("");
+
setProperty(clientNames.get(datasourceComboBox.getSelectedItem()));
+
if(selected instanceof WebServiceClient == false)
return;
@@ -483,7 +485,6 @@
buttonPanel.setVisible(false);
} else {
// Otherwise, use the default panel.
- logger.info("No custom GUI. Use default panel.");
dataQueryPanel.add(mainTabbedPane, BorderLayout.CENTER);
buttonPanel.setVisible(true);
}
@@ -560,7 +561,6 @@
private javax.swing.JButton aboutButton;
private javax.swing.JPanel buttonPanel;
private JPanel queryPanel;
- private JPanel installPanel;
private javax.swing.JButton clearButton;
private javax.swing.JPanel dataQueryPanel;
private javax.swing.JPanel datasourcePanel;
Modified:
core3/webservice-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/webservice-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-24 22:29:11 UTC (rev 23584)
+++
core3/webservice-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-24 23:13:15 UTC (rev 23585)
@@ -9,11 +9,11 @@
<!-- Import Application Manager -->
<osgi:reference id="cyApplicationManagerServiceRef"
interface="org.cytoscape.session.CyApplicationManager" />
-
+
<!-- Import ref to desktop application -->
<osgi:reference id="cySwingApplicationServiceRef"
interface="org.cytoscape.application.swing.CySwingApplication"
/>
-
+
<osgi:reference id="taskManagerServiceRef"
interface="org.cytoscape.work.swing.GUITaskManager" />
@@ -22,4 +22,17 @@
<osgi:service id="showNetworkImportDialogActionService"
ref="showNetworkImportDialogAction"
interface="org.cytoscape.application.swing.CyAction" />
+
+ <!-- Import client list -->
+ <osgi:set id="networkImportClientSet"
+ cardinality="0..N">
+ <osgi:interfaces>
+
<value>org.cytoscape.io.webservice.NetworkImportWebServiceClient</value>
+
<value>org.cytoscape.io.webservice.SearchWebServiceClient</value>
+
<value>org.cytoscape.io.webservice.WebServiceClient</value>
+ </osgi:interfaces>
+ <osgi:listener bind-method="addNetworkImportClient"
+ unbind-method="removeNetworkImportClient"
ref="unifiedNetworkImportDialog" />
+ </osgi:set>
+
</beans>
Modified:
core3/webservice-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/webservice-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-24 22:29:11 UTC (rev 23584)
+++
core3/webservice-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-24 23:13:15 UTC (rev 23585)
@@ -18,12 +18,16 @@
<context:annotation-config />
+
+ <bean id="unifiedNetworkImportDialog"
class="org.cytoscape.webservice.internal.ui.UnifiedNetworkImportDialog" >
+ <constructor-arg ref="taskManagerServiceRef" />
+ </bean>
<bean id="showNetworkImportDialogAction"
class="org.cytoscape.webservice.internal.task.ShowNetworkImportDialogAction">
<constructor-arg ref="cyApplicationManagerServiceRef" />
<constructor-arg ref="cySwingApplicationServiceRef" />
- <constructor-arg ref="taskManagerServiceRef" />
+ <constructor-arg ref="unifiedNetworkImportDialog" />
</bean>
</beans>
Modified:
core3/webservice-ncbi-client/trunk/src/main/java/org/cytoscape/webservice/ncbi/NCBIWebServiceClient.java
===================================================================
---
core3/webservice-ncbi-client/trunk/src/main/java/org/cytoscape/webservice/ncbi/NCBIWebServiceClient.java
2011-01-24 22:29:11 UTC (rev 23584)
+++
core3/webservice-ncbi-client/trunk/src/main/java/org/cytoscape/webservice/ncbi/NCBIWebServiceClient.java
2011-01-24 23:13:15 UTC (rev 23585)
@@ -3,22 +3,25 @@
import java.util.Set;
import org.cytoscape.io.webservice.NetworkImportWebServiceClient;
+import org.cytoscape.io.webservice.SearchWebServiceClient;
import org.cytoscape.io.webservice.TableImportWebServiceClient;
import org.cytoscape.io.webservice.client.AbstractWebServiceClient;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTable;
import org.cytoscape.work.TaskIterator;
-public class NCBIWebServiceClient extends AbstractWebServiceClient implements
TableImportWebServiceClient, NetworkImportWebServiceClient {
+public class NCBIWebServiceClient extends AbstractWebServiceClient implements
+ TableImportWebServiceClient, NetworkImportWebServiceClient,
+ SearchWebServiceClient<Object> {
- public NCBIWebServiceClient(String uri, String displayName, String
description) {
+ public NCBIWebServiceClient(String uri, String displayName,
+ String description) {
super(uri, displayName, description);
- // TODO Auto-generated constructor stub
}
@Override
public TaskIterator getTaskIterator() {
- // TODO Auto-generated method stub
+
return null;
}
@@ -34,4 +37,10 @@
return null;
}
+ @Override
+ public Object getSearchResult() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
Modified:
core3/webservice-ncbi-client/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/webservice-ncbi-client/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-24 22:29:11 UTC (rev 23584)
+++
core3/webservice-ncbi-client/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-24 23:13:15 UTC (rev 23585)
@@ -4,5 +4,8 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
default-lazy-init="false">
-
+
+
+ <osgi:service id="ncbiClientService" ref="ncbiClient"
auto-export="interfaces" />
+
</beans>
Modified:
core3/webservice-ncbi-client/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/webservice-ncbi-client/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-24 22:29:11 UTC (rev 23584)
+++
core3/webservice-ncbi-client/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-24 23:13:15 UTC (rev 23585)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:aop="http://www.springframework.org/schema/aop";
- xmlns:util="http://www.springframework.org/schema/util";
- xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:util="http://www.springframework.org/schema/util";
xmlns:context="http://www.springframework.org/schema/context";
xmlns:lang="http://www.springframework.org/schema/lang";
xmlns:osgi="http://www.springframework.org/schema/osgi";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
@@ -19,7 +18,11 @@
<context:annotation-config />
-
-
+ <!-- Wrapper for the REST client -->
+ <bean id="ncbiClient"
class="org.cytoscape.webservice.ncbi.NCBIWebServiceClient">
+ <constructor-arg index="0"
value="http://www.ncbi.nlm.nih.gov/entrez/eutils/soap/v2.0/eutils.wsdl"; />
+ <constructor-arg index="1" value="NCBI Client" />
+ <constructor-arg index="2" value="SOAP version of NCBI Web
Service Client." />
+ </bean>
</beans>
--
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.
