Author: kono
Date: 2010-09-20 18:25:00 -0700 (Mon, 20 Sep 2010)
New Revision: 21961
Modified:
core3/vizmap-impl/branches/vp-tree/pom.xml
core3/vizmap-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
core3/vizmap-impl/branches/vp-tree/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
Log:
Refactored version of visual property tree. Tree structure is now managed in
wrapper object VisualLexiconNode.
Modified: core3/vizmap-impl/branches/vp-tree/pom.xml
===================================================================
--- core3/vizmap-impl/branches/vp-tree/pom.xml 2010-09-21 01:24:26 UTC (rev
21960)
+++ core3/vizmap-impl/branches/vp-tree/pom.xml 2010-09-21 01:25:00 UTC (rev
21961)
@@ -176,5 +176,12 @@
<version>1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-impl</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
core3/vizmap-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
===================================================================
---
core3/vizmap-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2010-09-21 01:24:26 UTC (rev 21960)
+++
core3/vizmap-impl/branches/vp-tree/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2010-09-21 01:25:00 UTC (rev 21961)
@@ -271,7 +271,7 @@
continue;
// Not a leaf VP. We can ignore those.
- if(vp.getChildren().size() != 0)
+
if(lexicon.getVisualLexiconNode(vp).getChildren().size() != 0)
continue;
// This is a leaf
Modified:
core3/vizmap-impl/branches/vp-tree/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
===================================================================
---
core3/vizmap-impl/branches/vp-tree/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
2010-09-21 01:24:26 UTC (rev 21960)
+++
core3/vizmap-impl/branches/vp-tree/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
2010-09-21 01:25:00 UTC (rev 21961)
@@ -3,6 +3,11 @@
import static org.easymock.EasyMock.*;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.view.model.NullDataType;
+import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.model.internal.VisualLexiconNodeFactoryImpl;
+import org.cytoscape.view.presentation.property.NullVisualProperty;
+import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
import org.cytoscape.view.vizmap.AbstractVisualStyleTest;
import org.cytoscape.view.vizmap.internal.VisualStyleFactoryImpl;
import org.junit.After;
@@ -12,10 +17,17 @@
@Before
public void setUp() throws Exception {
- super.setUp();
-
+
+ // Create root node.
+ final VisualProperty<NullDataType> twoDRoot = new
NullVisualProperty(
+ "TWO_D_ROOT", "2D Root Visual Property");
+
+ lexicon = new TwoDVisualLexicon(twoDRoot,
+ new VisualLexiconNodeFactoryImpl());
+
final CyEventHelper helperMock =
createMock(CyEventHelper.class);
- final VisualStyleFactoryImpl visualStyleFactory = new
VisualStyleFactoryImpl(helperMock);
+ final VisualStyleFactoryImpl visualStyleFactory = new
VisualStyleFactoryImpl(
+ helperMock);
originalTitle = "Style 1";
newTitle = "Style 2";
style = visualStyleFactory.createVisualStyle(originalTitle,
lexicon);
--
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.
