Author: kono
Date: 2010-10-14 15:01:42 -0700 (Thu, 14 Oct 2010)
New Revision: 22243
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReader.java
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReaderTest.java
Log:
Modified to support new viewmodel and presentation (test should be fixed.)
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReader.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReader.java
2010-10-14 21:55:39 UTC (rev 22242)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReader.java
2010-10-14 22:01:42 UTC (rev 22243)
@@ -63,6 +63,7 @@
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.presentation.RenderingEngine;
+import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
@@ -706,7 +707,8 @@
return;
}
VisualLexicon lexicon = engine.getVisualLexicon();
- Collection<VisualProperty<?>> properties =
lexicon.getVisualProperties(CyTableEntry.NODE);
+
+ Collection<VisualProperty<?>> properties =
lexicon.getAllDescendants(TwoDVisualLexicon.NODE);
for (VisualProperty<?> property : properties) {
String id = property.getIdString();
@@ -920,7 +922,7 @@
return;
}
VisualLexicon lexicon = engine.getVisualLexicon();
- Collection<VisualProperty<?>> properties =
lexicon.getVisualProperties(CyTableEntry.NODE);
+ Collection<VisualProperty<?>> properties =
lexicon.getAllDescendants(TwoDVisualLexicon.NODE);
for (VisualProperty<?> property : properties) {
String id = property.getIdString();
Modified:
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReaderTest.java
===================================================================
---
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReaderTest.java
2010-10-14 21:55:39 UTC (rev 22242)
+++
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReaderTest.java
2010-10-14 22:01:42 UTC (rev 22243)
@@ -34,7 +34,9 @@
when(networkManager.getCurrentRenderingEngine()).thenReturn(engine);
when(engine.getVisualLexicon()).thenReturn(lexicon);
-
when(lexicon.getVisualProperties(any(String.class))).thenReturn(new
LinkedList<VisualProperty<?>>());
+
+ // FIXME
+
//when(lexicon.getVisualProperties(any(String.class))).thenReturn(new
LinkedList<VisualProperty<?>>());
}
@Test
--
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.
