Author: kono
Date: 2010-09-15 13:24:29 -0700 (Wed, 15 Sep 2010)
New Revision: 21877
Added:
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/MinimalVisualLexicon.java
core3/viewmodel-impl/branches/vp-tree/src/test/java/org/cytoscape/view/model/VisualLexiconTest.java
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualLexiconManagerImpl.java
Log:
Visual Property Tree version of view model.
Added:
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/MinimalVisualLexicon.java
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/MinimalVisualLexicon.java
(rev 0)
+++
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/MinimalVisualLexicon.java
2010-09-15 20:24:29 UTC (rev 21877)
@@ -0,0 +1,17 @@
+package org.cytoscape.view.model.internal;
+
+import org.cytoscape.view.model.BasicVisualLexicon;
+import org.cytoscape.view.model.visualproperties.NullVisualProperty;
+
+/**
+ * VisualLexicon only with a root node.
+ * @author kono
+ *
+ */
+public class MinimalVisualLexicon extends BasicVisualLexicon {
+
+ public MinimalVisualLexicon() {
+ super(new NullVisualProperty("ROOT_OF_EVRYTHING", "Root Visual
Property"));
+ }
+
+}
Added:
core3/viewmodel-impl/branches/vp-tree/src/test/java/org/cytoscape/view/model/VisualLexiconTest.java
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/test/java/org/cytoscape/view/model/VisualLexiconTest.java
(rev 0)
+++
core3/viewmodel-impl/branches/vp-tree/src/test/java/org/cytoscape/view/model/VisualLexiconTest.java
2010-09-15 20:24:29 UTC (rev 21877)
@@ -0,0 +1,47 @@
+package org.cytoscape.view.model;
+
+
+import static org.junit.Assert.*;
+
+import java.util.Set;
+
+import org.cytoscape.view.model.internal.MinimalVisualLexicon;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class VisualLexiconTest {
+
+ private VisualLexicon minimalLex;
+ private VisualLexicon twoDLex;
+ private VisualLexicon threeDLex;
+
+ @Before
+ public void setUp() throws Exception {
+ minimalLex = new MinimalVisualLexicon();
+ twoDLex = new TwoDVisualLexicon();
+ threeDLex = new ThreeDVisualLexicon();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public void testLexiconInstances() {
+ assertNotNull(minimalLex);
+ assertNotNull(twoDLex);
+ assertNotNull(threeDLex);
+ }
+
+ @Test
+ public void testMinimalLexicon() {
+ final Set<VisualProperty<?>> all =
minimalLex.getAllVisualProperties();
+
+ assertEquals(1, all.size());
+ assertEquals(38, twoDLex.getAllVisualProperties().size());
+ minimalLex.mergeLexicon(twoDLex);
+ assertEquals(39, minimalLex.getAllVisualProperties().size());
+ }
+
+}
Copied:
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualLexiconManagerImpl.java
(from rev 21529,
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/RootVisualLexiconImpl.java)
===================================================================
---
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualLexiconManagerImpl.java
(rev 0)
+++
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualLexiconManagerImpl.java
2010-09-15 20:24:29 UTC (rev 21877)
@@ -0,0 +1,47 @@
+package org.cytoscape.view.model.internal;
+
+import java.util.Map;
+
+import org.cytoscape.view.model.VisualLexiconManager;
+import org.cytoscape.view.model.VisualLexicon;
+
+public class VisualLexiconManagerImpl implements VisualLexiconManager {
+
+ // There is only one lexicon.
+ private final VisualLexicon lexicon;
+
+ /**
+ * Constructor. Just initializes collections for currently available
+ * renderers and VPs
+ */
+ public VisualLexiconManagerImpl(final VisualLexicon lexicon) {
+ if(lexicon == null)
+ throw new NullPointerException("Visual Lexicon cannot
be null.");
+
+ this.lexicon = lexicon;
+ }
+
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public void addVisualLexicon(VisualLexicon newLexicon, Map props) {
+ final String presentationName = lexicon.toString();
+
+ lexicon.mergeLexicon(newLexicon);
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public void removeVisualLexicon(VisualLexicon lexicon, Map props) {
+ final String presentationName = lexicon.toString();
+
+ // FIXME: need to remove actual props!
+ }
+
+
+ @Override
+ public VisualLexicon getLexicon() {
+ return 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.
