Author: jm
Date: 2011-09-20 08:49:47 -0700 (Tue, 20 Sep 2011)
New Revision: 26877
Modified:
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/NCBITableImportAction.java
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/ui/AttributeImportPanel.java
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/ui/NCBIGeneDialog.java
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/ui/NCBIGenePanel.java
core3/impl/trunk/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Removed unnecessary references to CyTableManager
Modified:
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/NCBITableImportAction.java
===================================================================
---
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/NCBITableImportAction.java
2011-09-20 15:48:13 UTC (rev 26876)
+++
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/NCBITableImportAction.java
2011-09-20 15:49:47 UTC (rev 26877)
@@ -1,12 +1,10 @@
package org.cytoscape.webservice.ncbi;
import java.awt.event.ActionEvent;
-import java.util.Map;
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.webservice.ncbi.ui.NCBIGeneDialog;
import org.cytoscape.work.TaskManager;
@@ -14,16 +12,14 @@
private static final long serialVersionUID = 3101400401346193602L;
- final CyTableManager tblManager;
final CyNetworkManager netManager;
private final NCBITableImportClient client;
private final TaskManager taskManager;
public NCBITableImportAction(final NCBITableImportClient client, final
TaskManager taskManager,
- final CyTableManager tblManager, final CyNetworkManager
netManager, CyApplicationManager applicationManager) {
+ final CyNetworkManager netManager, CyApplicationManager
applicationManager) {
super("Import Data Table from NCBI...", applicationManager);
setPreferredMenu("File.Import.Table.WebService");
- this.tblManager = tblManager;
this.netManager = netManager;
this.client = client;
this.taskManager = taskManager;
@@ -31,7 +27,7 @@
@Override
public void actionPerformed(ActionEvent evt) {
- final NCBIGeneDialog dialog = new NCBIGeneDialog(client,
taskManager, tblManager, netManager);
+ final NCBIGeneDialog dialog = new NCBIGeneDialog(client,
taskManager, netManager);
dialog.setVisible(true);
}
Modified:
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/ui/AttributeImportPanel.java
===================================================================
---
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/ui/AttributeImportPanel.java
2011-09-20 15:48:13 UTC (rev 26876)
+++
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/ui/AttributeImportPanel.java
2011-09-20 15:49:47 UTC (rev 26877)
@@ -37,7 +37,6 @@
import java.awt.Color;
import java.awt.event.ActionEvent;
import java.util.Collection;
-import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -53,9 +52,7 @@
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.events.ColumnCreatedEvent;
import org.cytoscape.model.events.ColumnCreatedListener;
import org.cytoscape.model.events.ColumnDeletedEvent;
@@ -118,17 +115,15 @@
// Attribute panel border title
protected String attributePanelTitle;
- protected final CyTableManager tblManager;
protected final CyNetworkManager netManager;
- protected AttributeImportPanel(final CyTableManager tblManager, final
CyNetworkManager netManager,
+ protected AttributeImportPanel(final CyNetworkManager netManager,
Icon logo, String title,
String attrPanelTitle) {
this.logo = logo;
this.panelTitle = title;
this.attributePanelTitle = attrPanelTitle;
- this.tblManager = tblManager;
this.netManager = netManager;
initComponents();
@@ -429,8 +424,7 @@
final Set<CyNetwork> networks = this.netManager.getNetworkSet();
for(CyNetwork network: networks) {
- final Map<String, CyTable> tables =
this.tblManager.getTableMap(CyNode.class, network);
- final CyTable nodeTable =
tables.get(CyNetwork.DEFAULT_ATTRS);
+ final CyTable nodeTable = network.getDefaultNodeTable();
//final Map<String, Class<?>> columns =
nodeTable.getColumnTypeMap();
Collection<CyColumn> columns = nodeTable.getColumns();
for (CyColumn col : columns)
Modified:
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/ui/NCBIGeneDialog.java
===================================================================
---
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/ui/NCBIGeneDialog.java
2011-09-20 15:48:13 UTC (rev 26876)
+++
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/ui/NCBIGeneDialog.java
2011-09-20 15:49:47 UTC (rev 26877)
@@ -7,7 +7,6 @@
import javax.swing.JPanel;
import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.webservice.ncbi.NCBITableImportClient;
import org.cytoscape.work.TaskManager;
@@ -15,16 +14,14 @@
private static final long serialVersionUID = -2609215983943863094L;
- private final CyTableManager tblManager;
private final CyNetworkManager netManager;
- public NCBIGeneDialog(final NCBITableImportClient client, final
TaskManager taskManager, final CyTableManager tblManager, final
CyNetworkManager netManager) {
- this.tblManager = tblManager;
+ public NCBIGeneDialog(final NCBITableImportClient client, final
TaskManager taskManager, final CyNetworkManager netManager) {
this.netManager = netManager;
setTitle("NCBI Entrez Gene");
- final JPanel panel = new NCBIGenePanel(client, taskManager,
tblManager, netManager, "NCBI table import");
+ final JPanel panel = new NCBIGenePanel(client, taskManager,
netManager, "NCBI table import");
panel.addPropertyChangeListener(this);
add(panel);
pack();
Modified:
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/ui/NCBIGenePanel.java
===================================================================
---
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/ui/NCBIGenePanel.java
2011-09-20 15:48:13 UTC (rev 26876)
+++
core3/impl/trunk/webservice-ncbi-client-impl/src/main/java/org/cytoscape/webservice/ncbi/ui/NCBIGenePanel.java
2011-09-20 15:49:47 UTC (rev 26877)
@@ -47,7 +47,6 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.webservice.ncbi.NCBIQuery;
import org.cytoscape.webservice.ncbi.NCBITableImportClient;
import org.cytoscape.work.TaskManager;
@@ -71,8 +70,8 @@
private final TaskManager taskManager;
public NCBIGenePanel(final NCBITableImportClient client, final
TaskManager taskManager,
- final CyTableManager tblManager, final CyNetworkManager
netManager, String attrPanelName) {
- super(tblManager, netManager, LOGO, "NCBI Client",
attrPanelName);
+ final CyNetworkManager netManager, String
attrPanelName) {
+ super(netManager, LOGO, "NCBI Client", attrPanelName);
this.client = client;
this.taskManager = taskManager;
Modified:
core3/impl/trunk/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/trunk/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-20 15:48:13 UTC (rev 26876)
+++
core3/impl/trunk/webservice-ncbi-client-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-20 15:49:47 UTC (rev 26877)
@@ -45,7 +45,6 @@
<bean id="ncbiTableImportAction"
class="org.cytoscape.webservice.ncbi.NCBITableImportAction">
<constructor-arg ref="ncbiTableImportClient" />
<constructor-arg ref="taskManagerServiceRef" />
- <constructor-arg ref="cyTableManagerServiceRef" />
<constructor-arg ref="cyNetworkManagerServiceRef" />
<constructor-arg ref="cyApplicationManagerRef" />
</bean>
--
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.
