Author: kono
Date: 2010-09-20 13:05:30 -0700 (Mon, 20 Sep 2010)
New Revision: 21953

Added:
   
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/AbstractVisualLexiconTest.java
   
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
   
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
Removed:
   
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/VisualLexiconTest.java
Modified:
   
core3/presentation-api/branches/vp-tree/src/main/java/org/cytoscape/view/presentation/property/ThreeDVisualLexicon.java
   
core3/presentation-api/branches/vp-tree/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
   
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualLexicon.java
Log:
Tree structure tests had been added.

Modified: 
core3/presentation-api/branches/vp-tree/src/main/java/org/cytoscape/view/presentation/property/ThreeDVisualLexicon.java
===================================================================
--- 
core3/presentation-api/branches/vp-tree/src/main/java/org/cytoscape/view/presentation/property/ThreeDVisualLexicon.java
     2010-09-20 20:04:23 UTC (rev 21952)
+++ 
core3/presentation-api/branches/vp-tree/src/main/java/org/cytoscape/view/presentation/property/ThreeDVisualLexicon.java
     2010-09-20 20:05:30 UTC (rev 21953)
@@ -12,7 +12,8 @@
                        0.0, "NODE_Z_SIZE", "Node z size (depth)", NODE_SIZE);
 
        public static final VisualProperty<Double> NETWORK_CENTER_Z_LOCATION = 
new DoubleVisualProperty(
-                       0.0, "NETWORK_CENTER_Z_LOCATION", "Network Center Z 
Location", NETWORK_CENTER_LOCATION);
+                       0.0, "NETWORK_CENTER_Z_LOCATION", "Network Center Z 
Location",
+                       NETWORK_CENTER_LOCATION);
 
        public static final VisualProperty<Double> NETWORK_DEPTH = new 
DoubleVisualProperty(
                        0.0, "NETWORK_DEPTH", "Network Depth", NETWORK_SIZE);
@@ -20,13 +21,9 @@
        public ThreeDVisualLexicon(final VisualProperty<NullDataType> root) {
                super(root);
 
-               NODE_LOCATION.getChildren().add(NODE_Z_LOCATION);
-               NODE_SIZE.getChildren().add(NODE_Z_SIZE);
                addVisualProperty(NODE_Z_LOCATION);
                addVisualProperty(NODE_Z_SIZE);
-               
-               
NETWORK_CENTER_LOCATION.getChildren().add(NETWORK_CENTER_Z_LOCATION);
-               NETWORK_SIZE.getChildren().add(NETWORK_DEPTH);
+
                addVisualProperty(NETWORK_CENTER_Z_LOCATION);
                addVisualProperty(NETWORK_DEPTH);
 

Modified: 
core3/presentation-api/branches/vp-tree/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
===================================================================
--- 
core3/presentation-api/branches/vp-tree/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
       2010-09-20 20:04:23 UTC (rev 21952)
+++ 
core3/presentation-api/branches/vp-tree/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
       2010-09-20 20:05:30 UTC (rev 21953)
@@ -41,8 +41,6 @@
 import org.cytoscape.view.model.VisualProperty;
 import org.cytoscape.view.model.Visualizable;
 
-
-
 /**
  * Should be implemented as a service. 'Renderer' is simply anything that
  * provides VisualProperties. With a 'VisualProperties as annotations' this
@@ -52,36 +50,35 @@
 
        public static final VisualProperty<Visualizable> NETWORK = new 
DefaultVisualizableVisualProperty(
                        "NETWORK", "Network Visual Property", null);
-       
+
        public static final VisualProperty<Visualizable> NODE = new 
DefaultVisualizableVisualProperty(
                        "NODE", "Node Visual Property", NETWORK);
        public static final VisualProperty<Visualizable> EDGE = new 
DefaultVisualizableVisualProperty(
                        "EDGE", "Edge Visual Property", NETWORK);
-       
 
        public static final VisualProperty<Color> NODE_PAINT = new 
PaintVisualProperty<Color>(
                        Color.gray, "NODE_PAINT", "Node Paint", NODE);
        public static final VisualProperty<Color> NODE_COLOR = new 
PaintVisualProperty<Color>(
                        Color.RED, "NODE_COLOR", "Node Color", NODE_PAINT);
        public static final VisualProperty<Color> NODE_SELECTED_COLOR = new 
PaintVisualProperty<Color>(
-                       Color.YELLOW, "NODE_SELECTED_COLOR", "Node Selected 
Color", NODE_PAINT);
+                       Color.YELLOW, "NODE_SELECTED_COLOR", "Node Selected 
Color",
+                       NODE_PAINT);
        public static final VisualProperty<Color> NODE_LABEL_COLOR = new 
PaintVisualProperty<Color>(
                        Color.BLACK, "NODE_LABEL_COLOR", "Node Label Color", 
NODE_PAINT);
-       
-       
+
        public static final VisualProperty<String> NODE_TEXT = new 
StringVisualProperty(
                        "", "NODE_TEXT", "Node Text", NODE);
        public static final VisualProperty<String> NODE_LABEL = new 
StringVisualProperty(
                        "", "NODE_LABEL", "Node Label", NODE_TEXT);
-       
 
        public static final VisualProperty<Double> NODE_LOCATION = new 
DoubleVisualProperty(
                        Double.NaN, "NODE_LOCATION", "Node Location", NODE, 
true);
        public static final VisualProperty<Double> NODE_X_LOCATION = new 
DoubleVisualProperty(
-                       Double.NaN, "NODE_X_LOCATION", "Node X Location", 
NODE_LOCATION, true);
+                       Double.NaN, "NODE_X_LOCATION", "Node X Location", 
NODE_LOCATION,
+                       true);
        public static final VisualProperty<Double> NODE_Y_LOCATION = new 
DoubleVisualProperty(
-                       Double.NaN, "NODE_Y_LOCATION", "Node Y Location", 
NODE_LOCATION, true);
-       
+                       Double.NaN, "NODE_Y_LOCATION", "Node Y Location", 
NODE_LOCATION,
+                       true);
 
        public static final VisualProperty<Double> NODE_SIZE = new 
DoubleVisualProperty(
                        50.0, "NODE_SIZE", "Node size", NODE);
@@ -90,53 +87,47 @@
        public static final VisualProperty<Double> NODE_Y_SIZE = new 
DoubleVisualProperty(
                        30.0, "NODE_Y_SIZE", "Node y size (height)", NODE_SIZE);
 
-       
-
        public static final VisualProperty<Boolean> NODE_VISIBLE = new 
BooleanVisualProperty(
                        true, "NODE_VISIBLE", "Node Visible", NODE);
 
        public static final VisualProperty<Boolean> NODE_SELECTED = new 
BooleanVisualProperty(
                        false, "NODE_SELECTED", "Node Selected", NODE);
 
-       
        public static final VisualProperty<? extends Paint> EDGE_PAINT = new 
PaintVisualProperty<Color>(
                        Color.gray, "EDGE_PAINT", "Edge Paint", EDGE);
        public static final VisualProperty<? extends Paint> EDGE_COLOR = new 
PaintVisualProperty<Color>(
                        Color.gray, "EDGE_COLOR", "Edge Color", EDGE_PAINT);
        public static final VisualProperty<? extends Paint> EDGE_LABEL_COLOR = 
new PaintVisualProperty<Color>(
                        Color.BLACK, "EDGE_LABEL_COLOR", "Edge Label Color", 
EDGE_PAINT);
-       
-       
+
        public static final VisualProperty<String> EDGE_TEXT = new 
StringVisualProperty(
                        "", "EDGE_TEXT", "Edge Text", EDGE);
        public static final VisualProperty<String> EDGE_LABEL = new 
StringVisualProperty(
                        "", "EDGE_LABEL", "Edge Label", EDGE_TEXT);
-       
-       
+
        public static final VisualProperty<Double> EDGE_SIZE = new 
DoubleVisualProperty(
                        1d, "EDGE_SIZE", "Edge Size", EDGE);
        public static final VisualProperty<Double> EDGE_WIDTH = new 
DoubleVisualProperty(
                        1d, "EDGE_WIDTH", "Edge Width", EDGE_SIZE);
-       
-       
+
        public static final VisualProperty<Boolean> EDGE_VISIBLE = new 
BooleanVisualProperty(
                        true, "EDGE_VISIBLE", "Edge Visible", EDGE);
-       
+
        public static final VisualProperty<Boolean> EDGE_SELECTED = new 
BooleanVisualProperty(
                        false, "EDGE_SELECTED", "Edge Selected", EDGE);
-       
-       
+
        public static final VisualProperty<Double> NETWORK_SCALE_FACTOR = new 
DoubleVisualProperty(
                        1.0, "NETWORK_SCALE_FACTOR", "Network Scale Factor", 
NETWORK);
-       
+
        public static final VisualProperty<Double> NETWORK_CENTER_LOCATION = 
new DoubleVisualProperty(
                        0.0, "NETWORK_CENTER_LOCATION", "Network Center 
Location", NETWORK);
        public static final VisualProperty<Double> NETWORK_CENTER_X_LOCATION = 
new DoubleVisualProperty(
-                       0.0, "NETWORK_CENTER_X_LOCATION", "Network Center X 
Location", NETWORK_CENTER_LOCATION);
+                       0.0, "NETWORK_CENTER_X_LOCATION", "Network Center X 
Location",
+                       NETWORK_CENTER_LOCATION);
        public static final VisualProperty<Double> NETWORK_CENTER_Y_LOCATION = 
new DoubleVisualProperty(
-                       0.0, "NETWORK_CENTER_Y_LOCATION", "Network Center Y 
Location", NETWORK_CENTER_LOCATION);
-       
-       
+                       0.0, "NETWORK_CENTER_Y_LOCATION", "Network Center Y 
Location",
+                       NETWORK_CENTER_LOCATION);
+
        public static final VisualProperty<Double> NETWORK_SIZE = new 
DoubleVisualProperty(
                        100.0, "NETWORK_SIZE", "Network Size", NETWORK);
        public static final VisualProperty<Double> NETWORK_WIDTH = new 
DoubleVisualProperty(
@@ -144,8 +135,6 @@
        public static final VisualProperty<Double> NETWORK_HEIGHT = new 
DoubleVisualProperty(
                        100.0, "NETWORK_HEIGHT", "Network Height", 
NETWORK_SIZE);
 
-       
-
        public static final VisualProperty<String> NETWORK_TEXT = new 
StringVisualProperty(
                        "", "NETWORK_TEXT", "Network Text", NETWORK);
        public static final VisualProperty<String> NETWORK_TITLE = new 
StringVisualProperty(
@@ -154,9 +143,9 @@
        public static final VisualProperty<Color> NETWORK_PAINT = new 
PaintVisualProperty<Color>(
                        Color.WHITE, "NETWORK_PAINT", "Network Paint", NETWORK);
        public static final VisualProperty<Paint> NETWORK_BACKGROUND_COLOR = 
new PaintVisualProperty<Paint>(
-                       Color.WHITE, "NETWORK_BACKGROUND_COLOR", "Network 
Background Color", NETWORK_PAINT);
+                       Color.WHITE, "NETWORK_BACKGROUND_COLOR",
+                       "Network Background Color", NETWORK_PAINT);
 
-       
        /**
         * Build basic VP tree.
         * 
@@ -164,76 +153,40 @@
         */
        public TwoDVisualLexicon(final VisualProperty<NullDataType> root) {
                super(root);
+               root.getChildren().add(NETWORK);
                
                addVisualProperty(NETWORK);
-               ((DefaultVisualizableVisualProperty)NETWORK).setParent(root);
+               ((DefaultVisualizableVisualProperty) NETWORK).setParent(root);
 
-               NETWORK.getChildren().add(NODE);
-               NETWORK.getChildren().add(EDGE);
                addVisualProperty(NODE);
                addVisualProperty(EDGE);
-               
-               
-               NETWORK.getChildren().add(NETWORK_TEXT);
-               NETWORK.getChildren().add(NETWORK_PAINT);
-               NETWORK.getChildren().add(NETWORK_SIZE);
-               NETWORK.getChildren().add(NETWORK_CENTER_LOCATION);
-               NETWORK.getChildren().add(NETWORK_SCALE_FACTOR);
+
                addVisualProperty(NETWORK_TEXT);
                addVisualProperty(NETWORK_PAINT);
                addVisualProperty(NETWORK_SIZE);
                addVisualProperty(NETWORK_CENTER_LOCATION);
                addVisualProperty(NETWORK_SCALE_FACTOR);
 
-               
-               NODE.getChildren().add(NODE_LOCATION);
-               NODE.getChildren().add(NODE_PAINT);
-               NODE.getChildren().add(NODE_SIZE);
-               NODE.getChildren().add(NODE_TEXT);
-               NODE.getChildren().add(NODE_VISIBLE);
-               NODE.getChildren().add(NODE_SELECTED);
                addVisualProperty(NODE_LOCATION);
                addVisualProperty(NODE_PAINT);
                addVisualProperty(NODE_SIZE);
                addVisualProperty(NODE_TEXT);
                addVisualProperty(NODE_VISIBLE);
                addVisualProperty(NODE_SELECTED);
-               
-               
-               EDGE.getChildren().add(EDGE_PAINT);
-               EDGE.getChildren().add(EDGE_SIZE);
-               EDGE.getChildren().add(EDGE_TEXT);
-               EDGE.getChildren().add(EDGE_VISIBLE);
-               EDGE.getChildren().add(EDGE_SELECTED);
+
                addVisualProperty(EDGE_PAINT);
                addVisualProperty(EDGE_SIZE);
                addVisualProperty(EDGE_TEXT);
                addVisualProperty(EDGE_VISIBLE);
                addVisualProperty(EDGE_SELECTED);
-               
-               
-               NETWORK_TEXT.getChildren().add(NETWORK_TITLE);
-               NETWORK_PAINT.getChildren().add(NETWORK_BACKGROUND_COLOR);
-               NETWORK_SIZE.getChildren().add(NETWORK_WIDTH);
-               NETWORK_SIZE.getChildren().add(NETWORK_HEIGHT);
-               
NETWORK_CENTER_LOCATION.getChildren().add(NETWORK_CENTER_X_LOCATION);
-               
NETWORK_CENTER_LOCATION.getChildren().add(NETWORK_CENTER_Y_LOCATION);
+
                addVisualProperty(NETWORK_TITLE);
                addVisualProperty(NETWORK_BACKGROUND_COLOR);
                addVisualProperty(NETWORK_WIDTH);
                addVisualProperty(NETWORK_HEIGHT);
                addVisualProperty(NETWORK_CENTER_X_LOCATION);
                addVisualProperty(NETWORK_CENTER_Y_LOCATION);
-               
-               
-               NODE_LOCATION.getChildren().add(NODE_X_LOCATION);
-               NODE_LOCATION.getChildren().add(NODE_Y_LOCATION);
-               NODE_PAINT.getChildren().add(NODE_COLOR);
-               NODE_PAINT.getChildren().add(NODE_LABEL_COLOR);
-               NODE_PAINT.getChildren().add(NODE_SELECTED_COLOR);
-               NODE_SIZE.getChildren().add(NODE_X_SIZE);
-               NODE_SIZE.getChildren().add(NODE_Y_SIZE);
-               NODE_TEXT.getChildren().add(NODE_LABEL);
+
                addVisualProperty(NODE_X_LOCATION);
                addVisualProperty(NODE_Y_LOCATION);
                addVisualProperty(NODE_COLOR);
@@ -242,12 +195,7 @@
                addVisualProperty(NODE_X_SIZE);
                addVisualProperty(NODE_Y_SIZE);
                addVisualProperty(NODE_LABEL);
-               
 
-               EDGE_PAINT.getChildren().add(EDGE_COLOR);
-               EDGE_PAINT.getChildren().add(EDGE_LABEL_COLOR);
-               EDGE_SIZE.getChildren().add(EDGE_WIDTH);
-               EDGE_TEXT.getChildren().add(EDGE_LABEL);
                addVisualProperty(EDGE_COLOR);
                addVisualProperty(EDGE_LABEL_COLOR);
                addVisualProperty(EDGE_WIDTH);

Added: 
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/AbstractVisualLexiconTest.java
===================================================================
--- 
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/AbstractVisualLexiconTest.java
                                (rev 0)
+++ 
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/AbstractVisualLexiconTest.java
        2010-09-20 20:05:30 UTC (rev 21953)
@@ -0,0 +1,65 @@
+package org.cytoscape.view.presentation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.cytoscape.view.model.NullDataType;
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.model.VisualProperty;
+import org.junit.After;
+import org.junit.Before;
+
+public abstract class AbstractVisualLexiconTest {
+
+       @Before
+       public void setUp() throws Exception {
+               
+               
+       }
+
+       
+       @After
+       public void tearDown() throws Exception {
+               
+               
+       }
+       
+       
+       protected void testTree(VisualLexicon lextcon) throws Exception {
+               final VisualProperty<NullDataType> root = 
lextcon.getRootVisualProperty();
+               assertNotNull(root);
+               assertEquals(lextcon.getRootVisualProperty(), root);
+               
+               Collection<VisualProperty<?>> firstChildren = 
root.getChildren();
+               assertFalse(0 == firstChildren.size());
+               traverse(firstChildren);
+       }
+       
+
+       private void traverse(final Collection<VisualProperty<?>> vpSet) {
+
+               Collection<VisualProperty<?>> children = vpSet;
+               Collection<VisualProperty<?>> nextChildren = new 
HashSet<VisualProperty<?>>();
+
+               for (VisualProperty<?> child : children) {
+                       final VisualProperty<?> parent = child.getParent();
+                       assertNotNull(parent);
+                       System.out.println(child.getParent().getDisplayName()
+                                       + "\thas_child\t" + 
child.getDisplayName());
+
+                       for (final VisualProperty<?> nextCh : 
child.getChildren())
+                               assertEquals(child, nextCh.getParent());
+
+                       nextChildren.addAll(child.getChildren());
+               }
+
+               if (nextChildren.size() == 0)
+                       return;
+               else
+                       traverse(nextChildren);
+       }
+}

Added: 
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
===================================================================
--- 
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
                          (rev 0)
+++ 
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
  2010-09-20 20:05:30 UTC (rev 21953)
@@ -0,0 +1,44 @@
+package org.cytoscape.view.presentation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.cytoscape.view.model.NullDataType;
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.presentation.property.NullVisualProperty;
+import org.cytoscape.view.presentation.property.ThreeDVisualLexicon;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ThreeDVisualLexiconTest extends AbstractVisualLexiconTest {
+
+       private VisualLexicon threeDLex;
+       private VisualProperty<NullDataType> threeDRoot;
+
+       @Before
+       public void setUp() throws Exception {
+
+               // Create root node.
+               threeDRoot = new NullVisualProperty("THREE_D_ROOT",
+                               "3D Root Visual Property");
+
+               threeDLex = new ThreeDVisualLexicon(threeDRoot);
+       }
+
+       @Test
+       public void testLexiconInstances() {
+               assertNotNull(threeDLex);
+       }
+
+       @Test
+       public void test2DLexicon() throws Exception {
+               assertEquals(42, threeDLex.getAllVisualProperties().size());
+       }
+
+       @Test
+       public void testTree() throws Exception {
+               testTree(threeDLex);
+       }
+
+}

Copied: 
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
 (from rev 21939, 
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/VisualLexiconTest.java)
===================================================================
--- 
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
                            (rev 0)
+++ 
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
    2010-09-20 20:05:30 UTC (rev 21953)
@@ -0,0 +1,43 @@
+package org.cytoscape.view.presentation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.cytoscape.view.model.NullDataType;
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.presentation.property.NullVisualProperty;
+import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TwoDVisualLexiconTest extends AbstractVisualLexiconTest {
+
+       private VisualLexicon twoDLex;
+       private VisualProperty<NullDataType> twoDRoot;
+
+       @Before
+       public void setUp() throws Exception {
+
+               // Create root node.
+               twoDRoot = new NullVisualProperty("TWO_D_ROOT",
+                               "2D Root Visual Property");
+
+               twoDLex = new TwoDVisualLexicon(twoDRoot);
+       }
+
+       @Test
+       public void testLexiconInstances() {
+               assertNotNull(twoDLex);
+       }
+
+       @Test
+       public void test2DLexicon() throws Exception {
+               assertEquals(38, twoDLex.getAllVisualProperties().size());
+       }
+
+       @Test
+       public void testTree() throws Exception {
+               testTree(twoDLex);
+       }
+}
\ No newline at end of file

Deleted: 
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/VisualLexiconTest.java
===================================================================
--- 
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/VisualLexiconTest.java
        2010-09-20 20:04:23 UTC (rev 21952)
+++ 
core3/presentation-api/branches/vp-tree/src/test/java/org/cytoscape/view/presentation/VisualLexiconTest.java
        2010-09-20 20:05:30 UTC (rev 21953)
@@ -1,52 +0,0 @@
-package org.cytoscape.view.presentation;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.cytoscape.view.model.NullDataType;
-import org.cytoscape.view.model.VisualLexicon;
-import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.presentation.property.NullVisualProperty;
-import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class VisualLexiconTest {
-       
-       private VisualLexicon twoDLex;
-
-       @Before
-       public void setUp() throws Exception {
-               
-               // Create root node.
-               final VisualProperty<NullDataType> twoDRoot = new 
NullVisualProperty(
-                               "TWO_D_ROOT", "2D Root Visual Property");
-               
-               twoDLex = new TwoDVisualLexicon(twoDRoot);
-       }
-
-       
-       @After
-       public void tearDown() throws Exception {
-       }
-       
-       @Test
-       public void testLexiconInstances() {
-               assertNotNull(twoDLex);
-       }
-       
-       @Test
-       public void test2DLexicon() throws Exception {
-               
-               assertEquals(38, twoDLex.getAllVisualProperties().size());
-               
-       }
-       
-       @Test
-       public void testTree() throws Exception {
-               
-       }
-
-}
\ No newline at end of file

Modified: 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualLexicon.java
===================================================================
--- 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualLexicon.java
      2010-09-20 20:04:23 UTC (rev 21952)
+++ 
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualLexicon.java
      2010-09-20 20:05:30 UTC (rev 21953)
@@ -47,9 +47,6 @@
        
        // Returns all visual properties as a set.
        public Set<VisualProperty<?>> getAllVisualProperties() {
-               System.out.println("Keys = " + 
visualPropertyMap.keySet().size());
-               System.out.println("Values = " + 
visualPropertyMap.values().size());
-               
                return new 
HashSet<VisualProperty<?>>(visualPropertyMap.values());
        }
 

-- 
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.

Reply via email to