Author: kono
Date: 2011-01-21 16:33:38 -0800 (Fri, 21 Jan 2011)
New Revision: 23560
Added:
core3/webservice-impl/trunk/src/main/resources/images/
core3/webservice-impl/trunk/src/main/resources/images/networkImportIcon.png
core3/webservice-impl/trunk/src/main/resources/images/stock_internet-32.png
Removed:
core3/webservice-impl/trunk/src/main/resources/readme.txt
Modified:
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/rest/BiomartRestClient.java
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/task/LoadRepositoryTask.java
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/ui/AttributeImportPanel.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
Log:
Some of the common GUI components are fixed. Need a test client.
Modified:
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/rest/BiomartRestClient.java
===================================================================
---
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/rest/BiomartRestClient.java
2011-01-22 00:30:42 UTC (rev 23559)
+++
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/rest/BiomartRestClient.java
2011-01-22 00:33:38 UTC (rev 23560)
@@ -92,8 +92,6 @@
*/
public BiomartRestClient(final String baseURL) throws IOException {
- System.out.println("v4 $$$$$$$$$$$$ REST Client start: " +
baseURL);
-
if (baseURL == null)
throw new NullPointerException("Biomart base URL is
missing.");
@@ -101,7 +99,7 @@
loadConversionFile();
- logger.debug("REST client initialized.");
+ logger.debug("Biomart REST client initialized.");
}
private void loadConversionFile() throws IOException {
Modified:
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/task/LoadRepositoryTask.java
===================================================================
---
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/task/LoadRepositoryTask.java
2011-01-22 00:30:42 UTC (rev 23559)
+++
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/task/LoadRepositoryTask.java
2011-01-22 00:33:38 UTC (rev 23560)
@@ -7,12 +7,14 @@
import java.util.List;
import java.util.Map;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.cytoscape.io.webservice.biomart.rest.BiomartRestClient;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
-import org.cytoscape.work.ValuedTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.xml.sax.SAXException;
public class LoadRepositoryTask extends AbstractTask {
@@ -46,21 +48,18 @@
@Override
- public void run(TaskMonitor taskMonitor) {
+ public void run(TaskMonitor taskMonitor) throws IOException,
ParserConfigurationException, SAXException {
- taskMonitor.setProgress(0.1);
- taskMonitor.setStatusMessage("Loading list of available
marts...");
+ taskMonitor.setStatusMessage("Loading list of available
Marts...");
+
dsList = new ArrayList<String>();
datasourceMap = new HashMap<String, String>();
logger.debug("Loading Repository...");
- try {
- reg = client.getRegistry();
- } catch (Exception e1) {
- e1.printStackTrace();
- }
-
+
+ reg = client.getRegistry();
+ taskMonitor.setProgress(0.1);
final int registryCount = reg.size();
float increment = 0.9f / registryCount;
float percentCompleted = 0.1f;
Modified:
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/ui/AttributeImportPanel.java
===================================================================
---
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/ui/AttributeImportPanel.java
2011-01-22 00:30:42 UTC (rev 23559)
+++
core3/webservice-biomart-client/trunk/src/main/java/org/cytoscape/io/webservice/biomart/ui/AttributeImportPanel.java
2011-01-22 00:33:38 UTC (rev 23560)
@@ -35,10 +35,7 @@
package org.cytoscape.io.webservice.biomart.ui;
import java.awt.Color;
-import java.awt.Container;
-import java.awt.Window;
import java.awt.event.ActionEvent;
-import java.util.Arrays;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -49,6 +46,11 @@
import javax.swing.JPanel;
import javax.swing.LayoutStyle;
+import org.cytoscape.model.events.ColumnCreatedEvent;
+import org.cytoscape.model.events.ColumnCreatedListener;
+import org.cytoscape.model.events.ColumnDeletedEvent;
+import org.cytoscape.model.events.ColumnDeletedListener;
+
/**
* General GUI component for importing attributes.<br>
* Maybe used by Web Service Clients to import attributes.
@@ -58,7 +60,8 @@
* TODO: is this the right place for this class?
*
*/
-public abstract class AttributeImportPanel extends JPanel {
+public abstract class AttributeImportPanel extends JPanel implements
+ ColumnCreatedListener, ColumnDeletedListener {
private static final long serialVersionUID = 8665197023334496167L;
@@ -75,6 +78,25 @@
private static final String KEY_ATTR = "Key Attribute in Cytoscape";
private static final String ATTR_PANEL_TITLE = "Available Annotations";
+ // Swing components. Maybe accessed from child classes.
+ protected javax.swing.JComboBox attributeComboBox;
+ protected javax.swing.JLabel attributeLabel;
+ protected javax.swing.JPanel attributePanel;
+ protected javax.swing.JComboBox attributeTypeComboBox;
+ protected javax.swing.JLabel attributeTypeLabel;
+ protected javax.swing.JButton cancelButton;
+ protected javax.swing.JComboBox databaseComboBox;
+ protected javax.swing.JPanel databasePanel;
+ protected javax.swing.JPanel attrListPanel;
+ protected javax.swing.JPanel availableAttrPanel;
+ protected javax.swing.JScrollPane availableAttrScrollPane;
+ protected javax.swing.JButton importButton;
+ protected javax.swing.JLabel titleLabel;
+ protected javax.swing.JButton resetButton;
+ protected CheckBoxJList attrList;
+
+ protected DefaultListModel model;
+
// Title of the panel.
protected String panelTitle;
@@ -372,7 +394,7 @@
protected void cancelButtonActionPerformed(java.awt.event.ActionEvent
evt) {
// Close parent
final JDialog container = (JDialog)
this.getRootPane().getParent();
-// System.out.println("parent = " + container);
+ // System.out.println("parent = " + container);
container.setVisible(false);
}
@@ -386,7 +408,6 @@
protected abstract void importAttributes();
-
protected void addAttribute(final String attributeName) {
if (attributeName == null)
return;
@@ -409,22 +430,18 @@
}
}
- // Swing components. Maybe accessed from child classes.
- protected javax.swing.JComboBox attributeComboBox;
- protected javax.swing.JLabel attributeLabel;
- protected javax.swing.JPanel attributePanel;
- protected javax.swing.JComboBox attributeTypeComboBox;
- protected javax.swing.JLabel attributeTypeLabel;
- protected javax.swing.JButton cancelButton;
- protected javax.swing.JComboBox databaseComboBox;
- protected javax.swing.JPanel databasePanel;
- protected javax.swing.JPanel attrListPanel;
- protected javax.swing.JPanel availableAttrPanel;
- protected javax.swing.JScrollPane availableAttrScrollPane;
- protected javax.swing.JButton importButton;
- protected javax.swing.JLabel titleLabel;
- protected javax.swing.JButton resetButton;
- protected CheckBoxJList attrList;
+ @Override
+ public void handleEvent(ColumnCreatedEvent e) {
+ final String attrName = e.getColumnName();
- protected DefaultListModel model;
+ addAttribute(attrName);
+ }
+
+ @Override
+ public void handleEvent(ColumnDeletedEvent e) {
+ final String attrName = e.getColumnName();
+
+ removeAttribute(attrName);
+ }
+
}
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-22 00:30:42 UTC (rev 23559)
+++
core3/webservice-impl/trunk/src/main/java/org/cytoscape/webservice/internal/task/ShowNetworkImportDialogAction.java
2011-01-22 00:33:38 UTC (rev 23560)
@@ -1,22 +1,48 @@
package org.cytoscape.webservice.internal.task;
+import java.awt.Window;
import java.awt.event.ActionEvent;
import org.cytoscape.application.swing.AbstractCyAction;
+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.
+ *
+ */
public class ShowNetworkImportDialogAction extends AbstractCyAction {
private static final long serialVersionUID = -36712860667900147L;
+
+ private UnifiedNetworkImportDialog dialog;
+ private final TaskManager taskManager;
+
+ private final Window parent;
- public ShowNetworkImportDialogAction(CyApplicationManager
applicationManager) {
- super("Import Network from Public Databases...",
applicationManager);
- setPreferredMenu("File.Import");
+ public ShowNetworkImportDialogAction(final CyApplicationManager
applicationManager, final CySwingApplication app, final TaskManager
taskManager) {
+ super("Public Databases...", applicationManager);
+ setPreferredMenu("File.Import.Network");
+
+ if(taskManager == null)
+ throw new NullPointerException("TaskMonitor is null.");
+
+ this.taskManager = taskManager;
+ this.parent = app.getJFrame();
+ dialog = null;
}
@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-22 00:30:42 UTC (rev 23559)
+++
core3/webservice-impl/trunk/src/main/java/org/cytoscape/webservice/internal/ui/UnifiedNetworkImportDialog.java
2011-01-22 00:33:38 UTC (rev 23560)
@@ -39,19 +39,13 @@
import java.awt.Component;
import java.awt.Container;
import java.awt.FlowLayout;
-import java.awt.Frame;
-import java.awt.GridLayout;
-import java.awt.Window;
import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeEvent;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.swing.BoxLayout;
-import javax.swing.ComboBoxModel;
import javax.swing.DefaultListCellRenderer;
import javax.swing.GroupLayout;
import javax.swing.Icon;
@@ -59,7 +53,6 @@
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JList;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
@@ -67,17 +60,12 @@
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.model.CyNetwork;
-import org.cytoscape.work.Task;
import org.cytoscape.work.TaskManager;
-import org.cytoscape.work.TaskMonitor;
-import org.cytoscape.work.Tunable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.java.swing.plaf.gtk.GTKConstants.IconSize;
-
/**
* Default GUI component for network import web service clients.
*
@@ -85,95 +73,108 @@
public class UnifiedNetworkImportDialog extends JDialog {
private static final long serialVersionUID = 3333726113970459078L;
- private static final Logger logger = LoggerFactory
- .getLogger(UnifiedNetworkImportDialog.class);
+ private static final Logger logger =
LoggerFactory.getLogger(UnifiedNetworkImportDialog.class);
+
+ private static final String NO_CLIENT = "No Service Client";
+
+ // Default icon for about dialog
+ private static final Icon DEF_ICON = new
ImageIcon(UnifiedNetworkImportDialog.class
+
.getResource("/images/stock_internet-32.png"));
- // Selected web service client ID
- private String selectedClientID = null;
+ private static final Icon NETWORK_IMPORT_ICON = new ImageIcon(
+ UnifiedNetworkImportDialog.class
+
.getResource("/images/networkImportIcon.png"));
+ // Registered web service clients
private Set<NetworkImportWebServiceClient> clients;
// Key is display name, value is URI of service.
private Map<String, String> clientNames;
// Client-Dependent GUI panels
- private Map<String, Container> serviceUIPanels = new HashMap<String,
Container>();
+ private Map<NetworkImportWebServiceClient, Container> serviceUIPanels =
new HashMap<NetworkImportWebServiceClient, Container>();
+ private int numClients;
+
+ private final TaskManager taskManager;
- // Default icon for about dialog
- private static final Icon DEF_ICON = new ImageIcon(
- UnifiedNetworkImportDialog.class
-
.getResource("images/ximian/stock_internet-32.png"));
-
- private static final Icon NETWORK_IMPORT_ICON = new ImageIcon(
- UnifiedNetworkImportDialog.class
-
.getResource("images/networkImportIcon.png"));
-
- private int numDataSources = 0;
- private int numClients = 0;
-
- private boolean cancelFlag = false;
-
/**
- * Display this standard GUI.
- */
- public void showDialog(final Window parent) {
- setLocationRelativeTo(parent);
- setVisible(true);
- }
-
- /**
* Creates new form NetworkImportDialog
*/
- public UnifiedNetworkImportDialog(Window parent) {
- super(parent);
+ public UnifiedNetworkImportDialog(final TaskManager taskManager) {
+ super();
+ if(taskManager == null)
+ throw new NullPointerException("TaskManager is null.");
+
+ this.taskManager = taskManager;
+ numClients = 0;
setModal(false);
this.clients = new HashSet<NetworkImportWebServiceClient>();
initGUI();
+
+ datasourceComboBox.addItem(NO_CLIENT);
+ setComponentsEnabled(false);
}
+
+ /**
+ * Will be used by Spring DM.
+ *
+ * @param client
+ * @param props
+ */
public void addNetworkImportClient(
final NetworkImportWebServiceClient client, Map props) {
+ if(this.numClients == 0)
+ this.datasourceComboBox.removeAllItems();
+
datasourceComboBox.addItem(client);
this.clients.add(client);
numClients++;
+ setComponentsEnabled(true);
}
+
+ /**
+ * Will be used by Spring DM
+ *
+ * @param client
+ * @param props
+ */
public void removeNetworkImportClient(
final NetworkImportWebServiceClient client, Map props) {
datasourceComboBox.removeItem(client);
this.clients.remove(client);
numClients--;
+
+ if(numClients == 0) {
+ this.datasourceComboBox.removeAllItems();
+ this.datasourceComboBox.addItem(NO_CLIENT);
+ setComponentsEnabled(false);
+ }
}
+
+
+ private void setComponentsEnabled(boolean enable) {
+ datasourceComboBox.setEnabled(enable);
+ this.searchButton.setEnabled(enable);
+ this.aboutButton.setEnabled(enable);
+ this.cancelButton.setEnabled(enable);
+ }
private void initGUI() {
clientNames = new HashMap<String, String>();
- // List<WebServiceClient<?>> clients = WebServiceClientManager
- // .getAllClients();
- // for (WebServiceClient<?> client : clients) {
- // if (client instanceof NetworkImportWebServiceClient) {
- // numClients++;
- // }
- // }
-
initComponents();
setDatasource();
// If we have no data sources, show the install panel
getContentPane().setLayout(new BorderLayout());
- if (numClients <= 1) {
- this.getContentPane().add(installPanel,
BorderLayout.SOUTH);
- }
- if (numClients > 0) {
- this.getContentPane().add(queryPanel,
BorderLayout.CENTER);
- }
-
+ this.getContentPane().add(queryPanel, BorderLayout.CENTER);
this.pack();
+
setProperty(clientNames.get(datasourceComboBox.getSelectedItem()));
- selectedClientID = clientNames
- .get(datasourceComboBox.getSelectedItem());
// Initialize GUI panel.
datasourceComboBoxActionPerformed(null);
@@ -301,7 +302,7 @@
searchButton.setText("Search");
searchButton.addActionListener(new
java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent
evt) {
- searchButtonActionPerformed(evt);
+ searchButtonActionPerformed();
}
});
@@ -407,75 +408,42 @@
GroupLayout.PREFERRED_SIZE)));
dataQueryPanel.setLayout(new BorderLayout());
- createInstallPanel();
} // </editor-fold>
- private void createInstallPanel() {
- installPanel = new JPanel();
- installPanel.setLayout(new BorderLayout());
- JLabel titleIconLabel2 = new JLabel();
- titleIconLabel2.setIcon(NETWORK_IMPORT_ICON);
- JPanel titlePanel2 = new JPanel();
- titlePanel2.add(titleIconLabel2);
- titlePanel2.setBackground(new Color(0, 0, 0));
- titlePanel2.setLayout(new FlowLayout(FlowLayout.LEFT));
- if (numClients == 0) {
- installPanel.add(titlePanel2, BorderLayout.NORTH);
- }
- JPanel internalPanel = new JPanel();
- internalPanel.setBorder(new EmptyBorder(10, 10, 10, 10));
- internalPanel.setLayout(new BoxLayout(internalPanel,
- BoxLayout.PAGE_AXIS));
- JTextArea area = new JTextArea(1, 40);
- area.setBorder(new EmptyBorder(0, 0, 0, 0));
- if (numClients == 0) {
- area.setText("There are no network import web service
clients installed.");
- } else {
- area.setText("To install additional web service
clients, click the install button below.");
- }
- area.setEditable(false);
- area.setOpaque(false);
- area.setAlignmentX(Component.LEFT_ALIGNMENT);
- internalPanel.add(area);
- }
-
/**
* Execute the search task.
*
* @param evt
*/
- private void searchButtonActionPerformed(final ActionEvent evt) {
-// selectedClientID = clientNames
-// .get(datasourceComboBox.getSelectedItem());
-//
-// final CyWebServiceEvent<String> event = buildEvent();
-// logger.info("Start importing network: " +
evt.getActionCommand());
-//
-// task = new
WSNetworkImportTask(datasourceComboBox.getSelectedItem()
-// .toString(), event);
-//
-// // Execute Task in New Thread; pops open JTask Dialog Box.
-// TaskManager.executeTask(task, tConfig);
-//
-// logger.info("Network Import from WS Success!");
+ private void searchButtonActionPerformed() {
+ final Object selected = datasourceComboBox.getSelectedItem();
+
+ WebServiceClient client = null;
+ if(selected instanceof SearchWebServiceClient && selected
instanceof WebServiceClient) {
+ client = (WebServiceClient) selected;
+ } else {
+ throw new IllegalStateException("Selected cleint does
not have search function.");
+ }
+
+ //taskManager.execute(client);
+
+ logger.info("Network Import from WS Success!");
}
private void aboutButtonActionPerformed(ActionEvent evt) {
-
-// final WebServiceClient<?> wsc = WebServiceClientManager
-// .getClient(selectedClientID);
-// final String clientName = wsc.getDisplayName();
-// final String description = wsc.getDescription();
-// Icon icon = null;
-// if (wsc instanceof WebServiceClientGUI) {
-// icon = ((WebServiceClientGUI)
wsc).getIcon(IconSize.FULL);
-// }
-//
-// if (icon == null) {
-// icon = DEF_ICON;
-// }
-// AboutDialog.showDialog(clientName, icon, description);
+
+ final WebServiceClient wsc =
(WebServiceClient)datasourceComboBox.getSelectedItem();
+
+ final String clientName = wsc.getDisplayName();
+ final String description = wsc.getDescription();
+
+ // FIXME
+ Icon icon = null;
+ if (icon == null) {
+ icon = DEF_ICON;
+ }
+ //AboutDialog.showDialog(clientName, icon, description);
}
/**
@@ -492,18 +460,22 @@
dispose();
}
- private void datasourceComboBoxActionPerformed(
- java.awt.event.ActionEvent evt) {
+ private void datasourceComboBoxActionPerformed(ActionEvent evt) {
queryTextPane.setText("");
setProperty(clientNames.get(datasourceComboBox.getSelectedItem()));
- selectedClientID = clientNames
- .get(datasourceComboBox.getSelectedItem());
-
+
+ final Object selected = datasourceComboBox.getSelectedItem();
+
+ if(selected instanceof WebServiceClient == false)
+ return;
+
+ final WebServiceClient client = (WebServiceClient) selected;
+
// Update Panel
dataQueryPanel.removeAll();
- final Container gui = serviceUIPanels.get(selectedClientID);
+ final Container gui = serviceUIPanels.get(client);
if (gui != null) {
// This service has custom panel.
dataQueryPanel.add(gui, BorderLayout.CENTER);
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-22 00:30:42 UTC (rev 23559)
+++
core3/webservice-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-01-22 00:33:38 UTC (rev 23560)
@@ -5,5 +5,21 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
default-lazy-init="false">
-
+
+ <!-- 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" />
+
+
+ <!-- Export actions -->
+ <osgi:service id="showNetworkImportDialogActionService"
+ ref="showNetworkImportDialogAction"
interface="org.cytoscape.application.swing.CyAction" />
+
</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-22 00:30:42 UTC (rev 23559)
+++
core3/webservice-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-01-22 00:33:38 UTC (rev 23560)
@@ -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,6 +18,12 @@
<context:annotation-config />
-
+ <bean id="showNetworkImportDialogAction"
+
class="org.cytoscape.webservice.internal.task.ShowNetworkImportDialogAction">
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cySwingApplicationServiceRef" />
+ <constructor-arg ref="taskManagerServiceRef" />
+ </bean>
+
</beans>
Added:
core3/webservice-impl/trunk/src/main/resources/images/networkImportIcon.png
===================================================================
(Binary files differ)
Property changes on:
core3/webservice-impl/trunk/src/main/resources/images/networkImportIcon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
core3/webservice-impl/trunk/src/main/resources/images/stock_internet-32.png
===================================================================
(Binary files differ)
Property changes on:
core3/webservice-impl/trunk/src/main/resources/images/stock_internet-32.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: core3/webservice-impl/trunk/src/main/resources/readme.txt
===================================================================
--- core3/webservice-impl/trunk/src/main/resources/readme.txt 2011-01-22
00:30:42 UTC (rev 23559)
+++ core3/webservice-impl/trunk/src/main/resources/readme.txt 2011-01-22
00:33:38 UTC (rev 23560)
@@ -1 +0,0 @@
-Bundle resources go here
--
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.
