Author: clopes
Date: 2012-03-22 12:54:19 -0700 (Thu, 22 Mar 2012)
New Revision: 28618
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/HandlerFactory.java
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/read/xgmml/XGMMLNetworkReaderTest.java
core3/impl/trunk/io-impl/impl/src/test/resources/testData/xgmml/group_2x_collapsed.xgmml
core3/impl/trunk/io-impl/impl/src/test/resources/testData/xgmml/group_2x_expanded.xgmml
Log:
XGMML import: Fixed parsing subgraph "att" tags.
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/HandlerFactory.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/HandlerFactory.java
2012-03-22 19:38:51 UTC (rev 28617)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/HandlerFactory.java
2012-03-22 19:54:19 UTC (rev 28618)
@@ -131,6 +131,7 @@
{ NODE, "graphics", NODE_GRAPHICS, new
HandleNodeGraphics() },
{ NODE, "att", NODE_ATT, new
HandleNodeAttribute() },
{ NODE_ATT, "graph", NODE_GRAPH, new
HandleNodeGraph() },
+ { NODE_GRAPH, "att", NET_ATT, new
HandleGraphAttribute() },
{ NODE_GRAPHICS, "att", NODE_GRAPHICS,
new HandleNodeGraphics() },
// Handle edges
{ GRAPH, "edge", EDGE, new HandleEdge()
},
Modified:
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/read/xgmml/XGMMLNetworkReaderTest.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/read/xgmml/XGMMLNetworkReaderTest.java
2012-03-22 19:38:51 UTC (rev 28617)
+++
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/read/xgmml/XGMMLNetworkReaderTest.java
2012-03-22 19:54:19 UTC (rev 28618)
@@ -10,7 +10,6 @@
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.util.List;
import java.util.Set;
import org.cytoscape.ding.NetworkViewTestSupport;
@@ -132,6 +131,10 @@
assertEquals(2, gr.getNodeList().size());
// assertEquals(1, gr.getInternalEdgeList().size()); // TODO: fix
it
assertEquals(1, gr.getExternalEdgeList().size());
+
+ // Check if the nested graph's attribute was imported to the
group network
+ CyRow grNetrow =
gr.getGroupNetwork().getRow(gr.getGroupNetwork());
+ assertEquals("Lorem Ipsum", grNetrow.get("gr_att_1",
String.class));
}
@Test
@@ -150,6 +153,10 @@
assertEquals(2, gr.getNodeList().size());
assertEquals(1, gr.getInternalEdgeList().size());
assertEquals(1, gr.getExternalEdgeList().size());
+
+ // Check if the nested graph's attribute was imported to the
group network
+ CyRow grNetrow =
gr.getGroupNetwork().getRow(gr.getGroupNetwork());
+ assertEquals("Lorem Ipsum", grNetrow.get("gr_att_1",
String.class));
}
@Test
Modified:
core3/impl/trunk/io-impl/impl/src/test/resources/testData/xgmml/group_2x_collapsed.xgmml
===================================================================
---
core3/impl/trunk/io-impl/impl/src/test/resources/testData/xgmml/group_2x_collapsed.xgmml
2012-03-22 19:38:51 UTC (rev 28617)
+++
core3/impl/trunk/io-impl/impl/src/test/resources/testData/xgmml/group_2x_collapsed.xgmml
2012-03-22 19:54:19 UTC (rev 28618)
@@ -35,6 +35,7 @@
<att type="string" name="node.opacity" value="100.0"/>
<att>
<graph>
+ <att type="string" name="gr_att_1" value="Lorem Ipsum"/>
<node label="node1" id="-2">
<att type="string" name="NODE_TYPE" value="DefaultNode"/>
<att type="real" name="__metanodeHintX" value="-61.0"
cy:hidden="true"/>
Modified:
core3/impl/trunk/io-impl/impl/src/test/resources/testData/xgmml/group_2x_expanded.xgmml
===================================================================
---
core3/impl/trunk/io-impl/impl/src/test/resources/testData/xgmml/group_2x_expanded.xgmml
2012-03-22 19:38:51 UTC (rev 28617)
+++
core3/impl/trunk/io-impl/impl/src/test/resources/testData/xgmml/group_2x_expanded.xgmml
2012-03-22 19:54:19 UTC (rev 28618)
@@ -49,6 +49,7 @@
<att type="string" name="node.opacity" value="100.0"/>
<att>
<graph>
+ <att type="string" name="gr_att_1" value="Lorem Ipsum"/>
<node xlink:href="#-2"/>
<node xlink:href="#-1"/>
<edge label="node0 (DirectedEdge) node1" source="-1" target="-2">
--
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.
