Author: jm
Date: 2011-09-20 08:48:13 -0700 (Tue, 20 Sep 2011)
New Revision: 26876
Modified:
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/ui/AttributeImportPanel.java
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/ui/BiomartAttrMappingPanel.java
Log:
Removed unnecessary references to CyTableManager
Modified:
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/ui/AttributeImportPanel.java
===================================================================
---
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/ui/AttributeImportPanel.java
2011-09-20 15:46:31 UTC (rev 26875)
+++
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/ui/AttributeImportPanel.java
2011-09-20 15:48:13 UTC (rev 26876)
@@ -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,7 +52,6 @@
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;
@@ -429,8 +427,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-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/ui/BiomartAttrMappingPanel.java
===================================================================
---
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/ui/BiomartAttrMappingPanel.java
2011-09-20 15:46:31 UTC (rev 26875)
+++
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/ui/BiomartAttrMappingPanel.java
2011-09-20 15:48:13 UTC (rev 26876)
@@ -37,7 +37,6 @@
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -251,8 +250,7 @@
// }
// } else {
// Use Attributes for mapping
- final CyTable defTable = tblManager.getTableMap(CyNode.class,
- curNetwork).get(CyNetwork.DEFAULT_ATTRS);
+ final CyTable defTable = curNetwork.getDefaultNodeTable();
final CyColumn column = defTable.getColumn(keyAttrName);
final Class<?> attrDataType = column.getType();
--
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.
