Author: jm
Date: 2011-09-20 08:46:31 -0700 (Tue, 20 Sep 2011)
New Revision: 26875
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/reader/AttributeMappingParameters.java
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java
Log:
Removed unnecessary references to CyTableManager
Fixed bug where node table was being used instead of edge table
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/reader/AttributeMappingParameters.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/reader/AttributeMappingParameters.java
2011-09-20 15:43:41 UTC (rev 26874)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/reader/AttributeMappingParameters.java
2011-09-20 15:46:31 UTC (rev 26875)
@@ -249,7 +249,7 @@
if (network != null){
- attributes =
CytoscapeServices.tblMgr.getTableMap(CyNode.class,
network).get(CyNetwork.DEFAULT_ATTRS);
+ attributes =
network.getDefaultNodeTable();
//existingAliases =
Cytoscape.getOntologyServer().getNodeAliases();
it = network.getNodeList().iterator();
//Cytoscape.getRootGraph().nodesIterator();
@@ -259,7 +259,7 @@
case EDGE:
if (network != null){
- attributes =
CytoscapeServices.tblMgr.getTableMap(CyNode.class,
network).get(CyNetwork.DEFAULT_ATTRS);
+ attributes =
network.getDefaultEdgeTable();
//existingAliases =
Cytoscape.getOntologyServer().getNodeAliases();
it = network.getEdgeList().iterator();
//Cytoscape.getRootGraph().nodesIterator();
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java
2011-09-20 15:43:41 UTC (rev 26874)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java
2011-09-20 15:46:31 UTC (rev 26875)
@@ -99,7 +99,6 @@
import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.cytoscape.io.read.InputStreamTaskFactory;
import org.cytoscape.model.CyColumn;
-import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
@@ -270,7 +269,7 @@
network = CytoscapeServices.appMgr.getCurrentNetwork();
if (network != null){
- selectedAttributes =
CytoscapeServices.tblMgr.getTableMap(CyNode.class,
network).get(CyNetwork.DEFAULT_ATTRS);
+ selectedAttributes = network.getDefaultNodeTable();
}
this.objType = NODE;
this.dialogType = dialogType;
@@ -1312,14 +1311,14 @@
if (nodeRadioButton.isSelected()) {
//selectedAttributes = Cytoscape.getNodeAttributes();
if (network != null){
- selectedAttributes =
CytoscapeServices.tblMgr.getTableMap(CyNode.class,
network).get(CyNetwork.DEFAULT_ATTRS);
+ selectedAttributes =
network.getDefaultNodeTable();
}
objType = NODE;
} else if (edgeRadioButton.isSelected()) {
//selectedAttributes = Cytoscape.getEdgeAttributes();
if (network != null){
- selectedAttributes =
CytoscapeServices.tblMgr.getTableMap(CyEdge.class,
network).get(CyNetwork.DEFAULT_ATTRS);
+ selectedAttributes =
network.getDefaultEdgeTable();
}
objType = EDGE;
--
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.
