Author: kono
Date: 2010-10-25 18:14:26 -0700 (Mon, 25 Oct 2010)
New Revision: 22423
Added:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/VisualLexiconNodeTest.java
Removed:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexiconNodeFactory.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractVisualLexiconFactoryTest.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractVisualLexiconNodeTest.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyObjectExtended.java
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeFactoryImpl.java
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeImpl.java
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
core3/ding-presentation-impl/trunk/src/test/java/org/cytoscape/view/DVisualLexiconTest.java
core3/presentation-api/trunk/pom.xml
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/ThreeDVisualLexicon.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyUtil.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyUtilTest.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/property/AbstractVisualLexiconTest.java
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/AbstractVisualProperty.java
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexiconNode.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractViewTest.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractVisualPropertyTest.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualProperty.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualPropertyTest.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/IntegerVisualProperty.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/StringVisualProperty.java
core3/viewmodel-impl/trunk/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
core3/viewmodel-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/viewmodel-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
core3/vizmap-impl/trunk/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
Log:
Refactored to use final class VisualLexiconNode. VisualLexiconNodeFactory had
been removed.
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -42,13 +42,11 @@
import org.cytoscape.ding.ArrowShape;
import org.cytoscape.ding.NodeShape;
import org.cytoscape.view.model.NullDataType;
-import org.cytoscape.view.model.VisualLexiconNodeFactory;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.presentation.property.BooleanVisualProperty;
-import
org.cytoscape.view.presentation.property.DefaultVisualizableVisualProperty;
+import org.cytoscape.view.presentation.property.ColorVisualProperty;
import org.cytoscape.view.presentation.property.DoubleVisualProperty;
import org.cytoscape.view.presentation.property.NullVisualProperty;
-import org.cytoscape.view.presentation.property.ColorVisualProperty;
import org.cytoscape.view.presentation.property.StringVisualProperty;
import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
@@ -162,8 +160,8 @@
public static final VisualProperty<Justify> EDGE_LABEL_JUSTIFY = new
JustifyTwoDVisualProperty(
Justify.LEFT, "EDGE_LABEL_JUSTIFY", "Edge Label
Justify");
- public DVisualLexicon(final VisualLexiconNodeFactory nodeFactory) {
- super(DING_ROOT, nodeFactory);
+ public DVisualLexicon() {
+ super(DING_ROOT);
addVisualProperty(NODE_BORDER_PAINT, NODE_PAINT);
Modified:
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-26 01:14:26 UTC (rev 22423)
@@ -18,9 +18,6 @@
<context:annotation-config />
- <bean id="dVisualLexicon"
class="org.cytoscape.ding.impl.DVisualLexicon">
- <constructor-arg ref="visualLexiconNodeFactoryServiceRef" />
- </bean>
<bean id="dingRenderingEngineFactory"
class="org.cytoscape.ding.impl.DingRenderingEngineFactory">
<constructor-arg ref="cyDataTableFactoryServiceRef" />
Modified:
core3/ding-presentation-impl/trunk/src/test/java/org/cytoscape/view/DVisualLexiconTest.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/test/java/org/cytoscape/view/DVisualLexiconTest.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/ding-presentation-impl/trunk/src/test/java/org/cytoscape/view/DVisualLexiconTest.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -7,7 +7,6 @@
import org.cytoscape.view.model.NullDataType;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.model.internal.VisualLexiconNodeFactoryImpl;
import org.cytoscape.view.presentation.property.AbstractVisualLexiconTest;
import org.junit.After;
import org.junit.Before;
@@ -19,7 +18,7 @@
@Before
public void setUp() throws Exception {
- dLexicon = new DVisualLexicon(new
VisualLexiconNodeFactoryImpl());
+ dLexicon = new DVisualLexicon();
}
@After
Modified: core3/presentation-api/trunk/pom.xml
===================================================================
--- core3/presentation-api/trunk/pom.xml 2010-10-26 00:23:58 UTC (rev
22422)
+++ core3/presentation-api/trunk/pom.xml 2010-10-26 01:14:26 UTC (rev
22423)
@@ -102,12 +102,6 @@
<version>${easymock.version}</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/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-10-26 00:23:58 UTC (rev 22422)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/AbstractVisualLexicon.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -9,7 +9,6 @@
import org.cytoscape.view.model.NullDataType;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualLexiconNode;
-import org.cytoscape.view.model.VisualLexiconNodeFactory;
import org.cytoscape.view.model.VisualProperty;
/**
@@ -24,8 +23,6 @@
// Root of this tree.
protected final VisualProperty<NullDataType> rootVisualProperty;
- protected final VisualLexiconNodeFactory nodeFactory;
-
/**
* Constructor for VisualLexicon. The parameters are required for all
lexicons.
@@ -33,12 +30,11 @@
* @param rootVisualProperty Root of the visual property tree.
* @param nodeFactory factory to create tree nodes for a lexicon.
*/
- public AbstractVisualLexicon(final VisualProperty<NullDataType>
rootVisualProperty, final VisualLexiconNodeFactory nodeFactory) {
- this.nodeFactory = nodeFactory;
+ public AbstractVisualLexicon(final VisualProperty<NullDataType>
rootVisualProperty) {
this.visualPropertyMap = new HashMap<VisualProperty<?>,
VisualLexiconNode>();
this.rootVisualProperty = rootVisualProperty;
- final VisualLexiconNode rootNode =
this.nodeFactory.createNode(rootVisualProperty, null);
+ final VisualLexiconNode rootNode = new
VisualLexiconNode(rootVisualProperty, null);
visualPropertyMap.put(rootVisualProperty, rootNode);
}
@@ -101,7 +97,7 @@
if(parentNode == null)
throw new IllegalArgumentException("Parent does not
exist in the lexicon: " + parent.getDisplayName());
- final VisualLexiconNode newNode =
this.nodeFactory.createNode(vp, parentNode);
+ final VisualLexiconNode newNode = new VisualLexiconNode(vp,
parentNode);
this.visualPropertyMap.put(vp, newNode);
}
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/ThreeDVisualLexicon.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/ThreeDVisualLexicon.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/ThreeDVisualLexicon.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -1,7 +1,6 @@
package org.cytoscape.view.presentation.property;
import org.cytoscape.view.model.NullDataType;
-import org.cytoscape.view.model.VisualLexiconNodeFactory;
import org.cytoscape.view.model.VisualProperty;
public class ThreeDVisualLexicon extends TwoDVisualLexicon {
@@ -18,9 +17,8 @@
public static final VisualProperty<Double> NETWORK_DEPTH = new
DoubleVisualProperty(
0.0, "NETWORK_DEPTH", "Network Depth");
- public ThreeDVisualLexicon(final VisualProperty<NullDataType> root,
- final VisualLexiconNodeFactory nodeFactory) {
- super(root, nodeFactory);
+ public ThreeDVisualLexicon(final VisualProperty<NullDataType> root) {
+ super(root);
addVisualProperty(NODE_Z_LOCATION, NODE_LOCATION);
addVisualProperty(NODE_Z_SIZE, NODE_SIZE);
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -35,12 +35,11 @@
package org.cytoscape.view.presentation.property;
import java.awt.Color;
-import java.awt.Paint;
import org.cytoscape.view.model.NullDataType;
-import org.cytoscape.view.model.VisualLexiconNodeFactory;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.model.Visualizable;
+import org.cytoscape.view.presentation.RenderingEngine;
/**
* Minimal set of {...@linkplain VisualProperty} objects which will be
required for
@@ -150,9 +149,8 @@
* @param root
* @param nodeFactory
*/
- public TwoDVisualLexicon(final VisualProperty<NullDataType> root,
- final VisualLexiconNodeFactory nodeFactory) {
- super(root, nodeFactory);
+ public TwoDVisualLexicon(final VisualProperty<NullDataType> root) {
+ super(root);
addVisualProperty(NETWORK, root);
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyUtil.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyUtil.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyUtil.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -16,10 +16,11 @@
if(lexicon == null)
throw new NullPointerException("Lexicon is null.");
+ if(lexicon.getAllVisualProperties().contains(vp) == false)
+ throw new IllegalArgumentException("No such Visual
Porperty in the lexicon: " + vp.getDisplayName());
+
VisualLexiconNode node = lexicon.getVisualLexiconNode(vp);
- if(node == null)
- throw new IllegalArgumentException("No such visual
property is available in the lexicon: " + vp.getDisplayName());
// This is a root
if(node.getParent() == null)
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -6,7 +6,6 @@
import org.cytoscape.view.model.NullDataType;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.model.internal.VisualLexiconNodeFactoryImpl;
import org.cytoscape.view.presentation.property.AbstractVisualLexiconTest;
import org.cytoscape.view.presentation.property.NullVisualProperty;
import org.cytoscape.view.presentation.property.ThreeDVisualLexicon;
@@ -25,7 +24,7 @@
threeDRoot = new NullVisualProperty("THREE_D_ROOT",
"3D Root Visual Property");
- threeDLex = new ThreeDVisualLexicon(threeDRoot, new
VisualLexiconNodeFactoryImpl());
+ threeDLex = new ThreeDVisualLexicon(threeDRoot);
}
@Test
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -9,7 +9,6 @@
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualLexiconNode;
import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.model.internal.VisualLexiconNodeFactoryImpl;
import org.cytoscape.view.presentation.property.AbstractVisualLexiconTest;
import org.cytoscape.view.presentation.property.NullVisualProperty;
import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
@@ -28,7 +27,7 @@
twoDRoot = new NullVisualProperty("TWO_D_ROOT",
"2D Root Visual Property");
- twoDLex = new TwoDVisualLexicon(twoDRoot, new
VisualLexiconNodeFactoryImpl());
+ twoDLex = new TwoDVisualLexicon(twoDRoot);
}
@Test
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyUtilTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyUtilTest.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyUtilTest.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -1,15 +1,15 @@
package org.cytoscape.view.presentation;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
-import org.cytoscape.view.model.internal.VisualLexiconNodeFactoryImpl;
import org.cytoscape.view.presentation.property.DoubleVisualProperty;
import org.cytoscape.view.presentation.property.NullVisualProperty;
import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
import org.cytoscape.view.presentation.property.VisualPropertyUtil;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -23,16 +23,16 @@
@Before
public void setUp() throws Exception {
dummy = new DoubleVisualProperty(new Double(10), "DUMMY",
"Dummy Prop");
+
// Create root node.
twoDRoot = new NullVisualProperty("TWO_D_ROOT",
"2D Root Visual Property");
- lexicon = new TwoDVisualLexicon(twoDRoot,
- new VisualLexiconNodeFactoryImpl());
+ lexicon = new TwoDVisualLexicon(twoDRoot);
}
@Test
- public void testIsChildOf() {
+ public void testIsChildOf1() {
assertTrue(VisualPropertyUtil.isChildOf(twoDRoot,
TwoDVisualLexicon.EDGE, lexicon));
try {
@@ -43,18 +43,53 @@
assertFalse(VisualPropertyUtil.isChildOf(TwoDVisualLexicon.NODE,
TwoDVisualLexicon.EDGE, lexicon));
}
+
+ @Test
+ public void testIsChildOf2() {
+ assertEquals(false, VisualPropertyUtil.isChildOf(twoDRoot,
twoDRoot, lexicon));
+ }
+
+ @Test
+ public void testIsChildOf3() {
+ assertEquals(true,
VisualPropertyUtil.isChildOf(TwoDVisualLexicon.NODE_COLOR,
TwoDVisualLexicon.NODE_COLOR, lexicon));
+ }
+
+ @Test
+ public void testIsChildOf4() {
+ assertEquals(true,
VisualPropertyUtil.isChildOf(TwoDVisualLexicon.NODE_PAINT,
TwoDVisualLexicon.NODE_COLOR, lexicon));
+ }
+
+ @Test(expected=NullPointerException.class)
+ public void testIsChildOfInvalid1() {
+ VisualPropertyUtil.isChildOf(twoDRoot, null, lexicon);
+ }
+
+ @Test(expected=NullPointerException.class)
+ public void testIsChildOfInvalid2() {
+ VisualPropertyUtil.isChildOf(twoDRoot, dummy, null);
+ }
+
+
@Test
- public void testGetGraphObjectType() {
+ public void testGetGraphObjectType1() {
assertEquals("NODE",
VisualPropertyUtil.getGraphObjectType(TwoDVisualLexicon.NODE_COLOR, lexicon));
+ }
+
+ @Test
+ public void testGetGraphObjectType2() {
assertEquals("EDGE",
VisualPropertyUtil.getGraphObjectType(TwoDVisualLexicon.EDGE_COLOR, lexicon));
- assertEquals("NETWORK",
VisualPropertyUtil.getGraphObjectType(TwoDVisualLexicon.NETWORK_BACKGROUND_COLOR,
lexicon));
-
- try {
- VisualPropertyUtil.getGraphObjectType(dummy, lexicon);
- } catch(Exception e) {
- assertTrue(e instanceof IllegalStateException);
- }
}
+
+ @Test
+ public void testGetGraphObjectType3() {
+ final String type =
VisualPropertyUtil.getGraphObjectType(TwoDVisualLexicon.NETWORK_PAINT, lexicon);
+ assertEquals("NETWORK", type);
+ }
+
+ @Test(expected=IllegalArgumentException.class)
+ public void testGetGraphObjectTypeInvalid() {
+ VisualPropertyUtil.getGraphObjectType(dummy, lexicon);
+ }
}
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/property/AbstractVisualLexiconTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/property/AbstractVisualLexiconTest.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/property/AbstractVisualLexiconTest.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -10,6 +10,7 @@
import org.cytoscape.view.model.VisualLexiconNode;
import org.cytoscape.view.model.VisualProperty;
import
org.cytoscape.view.presentation.property.DefaultVisualizableVisualProperty;
+import org.junit.Test;
public abstract class AbstractVisualLexiconTest {
@@ -42,9 +43,31 @@
traverse(children, lexicon);
// Test adding
- ((AbstractVisualLexicon) lexicon).addVisualProperty(new
DoubleVisualProperty(new Double(10), "DUMMY", "Dummy VP"), root);
+ final DoubleVisualProperty dummyVP = new
DoubleVisualProperty(new Double(10), "DUMMY", "Dummy VP");
+
+
+ try {
+ ((AbstractVisualLexicon)
lexicon).addVisualProperty(TwoDVisualLexicon.NODE_COLOR, root);
+ } catch(Exception e) {
+ assertTrue(e instanceof IllegalStateException);
+ }
+
+ try {
+ ((AbstractVisualLexicon)
lexicon).addVisualProperty(dummyVP, null);
+ } catch(Exception e) {
+ assertTrue(e instanceof NullPointerException);
+ }
+
+ try {
+ ((AbstractVisualLexicon)
lexicon).addVisualProperty(dummyVP, dummyVP);
+ } catch(Exception e) {
+ assertTrue(e instanceof IllegalArgumentException);
+ }
+
+ ((AbstractVisualLexicon) lexicon).addVisualProperty(dummyVP,
root);
}
+
private void traverse(final Collection<VisualLexiconNode> vpSet,
VisualLexicon lexicon) {
Modified:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/AbstractVisualProperty.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/AbstractVisualProperty.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/AbstractVisualProperty.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -76,9 +76,6 @@
if(displayName == null)
throw new NullPointerException("displayName should not
be null.");
- if(dataType.isAssignableFrom(defaultValue.getClass()) == false)
- throw new IllegalArgumentException();
-
this.dataType = dataType;
this.defaultValue = defaultValue;
Modified:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexiconNode.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexiconNode.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexiconNode.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -1,6 +1,7 @@
package org.cytoscape.view.model;
import java.util.Collection;
+import java.util.HashSet;
/**
* A node in the visual property tree (lexicon).
@@ -12,8 +13,26 @@
* @author kono
*
*/
-public interface VisualLexiconNode {
+public final class VisualLexiconNode {
+ private final VisualProperty<?> vp;
+
+ private final VisualLexiconNode parent;
+ private final Collection<VisualLexiconNode> children;
+
+ public VisualLexiconNode(final VisualProperty<?> vp, final
VisualLexiconNode parent) {
+ if(vp == null)
+ throw new NullPointerException("Visual Property cannot
be null.");
+
+ this.vp = vp;
+ this.parent = parent;
+ this.children = new HashSet<VisualLexiconNode>();
+
+ if(parent != null)
+ parent.getChildren().add(this);
+
+ }
+
/**
* Returns wrapped {...@linkplain VisualProerty} object.
*
@@ -22,7 +41,9 @@
*
* @return wrapped {...@linkplain VisualProeprty} object.
*/
- VisualProperty<?> getVisualProperty();
+ public VisualProperty<?> getVisualProperty() {
+ return vp;
+ }
/**
@@ -31,13 +52,17 @@
*
* @return parent VisualProperty object.
*/
- VisualLexiconNode getParent();
+ public VisualLexiconNode getParent() {
+ return parent;
+ }
/**
* Returns collection of all children of this node.
*
* @return collection of all children
*/
- Collection<VisualLexiconNode> getChildren();
+ public Collection<VisualLexiconNode> getChildren() {
+ return children;
+ }
}
Deleted:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexiconNodeFactory.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexiconNodeFactory.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/VisualLexiconNodeFactory.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -1,19 +0,0 @@
-package org.cytoscape.view.model;
-
-/**
- * Factory for nodes in the visual lexicon.
- *
- */
-public interface VisualLexiconNodeFactory {
-
- /**
- * Simple factory to create tree node for VisualLexicon.
- *
- * @param vp visual property to be wrapped by the tree node.
- * @param parent parent of new tree node.
- *
- * @return new tree node in the lexicon.
- */
- VisualLexiconNode createNode(final VisualProperty<?> vp, final
VisualLexiconNode parent);
-
-}
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractViewTest.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractViewTest.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractViewTest.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -17,8 +17,8 @@
@Before
public void setUp() throws Exception {
- integerVP = new IntegerVisualProperty(Integer.valueOf(0),
"integerVP", "INTVP");
- stringVP = new StringVisualProperty("", "stringVP", "STRVP");
+ integerVP = new IntegerVisualProperty();
+ stringVP = new StringVisualProperty();
}
Deleted:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractVisualLexiconFactoryTest.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractVisualLexiconFactoryTest.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractVisualLexiconFactoryTest.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -1,47 +0,0 @@
-package org.cytoscape.view.model;
-
-
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-
-import java.util.Collection;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public abstract class AbstractVisualLexiconFactoryTest {
-
- protected VisualLexiconNodeFactory nodeFactory;
-
-
-
- protected VisualProperty<?> parentVisualProp;
-
- protected VisualProperty<?> vp1;
- protected VisualProperty<?> vp2;
-
- @Before
- public void setUp() throws Exception {
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
- @Test
- public void testCreateNode() {
- assertNotNull(nodeFactory);
-
- final VisualLexiconNode parentNode =
nodeFactory.createNode(parentVisualProp, null);
- Collection<VisualLexiconNode> children =
parentNode.getChildren();
- assertEquals(0, children.size());
-
- final VisualLexiconNode vp1Node = nodeFactory.createNode(vp1,
parentNode);
- final VisualLexiconNode vp2Node = nodeFactory.createNode(vp2,
parentNode);
-
- assertEquals(2, parentNode.getChildren().size());
-
- }
-
-}
Deleted:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractVisualLexiconNodeTest.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractVisualLexiconNodeTest.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractVisualLexiconNodeTest.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -1,73 +0,0 @@
-package org.cytoscape.view.model;
-
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.awt.Color;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public abstract class AbstractVisualLexiconNodeTest {
-
- protected VisualProperty<NullDataType> vp1;
- protected VisualProperty<Number> vp2;
- protected VisualProperty<Color> vp3;
- protected VisualProperty<Visualizable> vp4;
-
- protected VisualLexiconNode node1;
- protected VisualLexiconNode node2;
- protected VisualLexiconNode node3;
- protected VisualLexiconNode node4;
-
- protected VisualLexiconNodeFactory factory;
-
-
- @Before
- public void setUp() throws Exception {
- node1 = factory.createNode(vp1, null);
- node2 = factory.createNode(vp2, node1);
- node4 = factory.createNode(vp4, node1);
- node3 = factory.createNode(vp3, node4);
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
- @Test
- public void testVisualLexiconNodeImpl() {
- assertNotNull(node1);
- assertNotNull(node2);
- assertNotNull(node3);
- assertNotNull(node4);
- }
-
- @Test
- public void testGetVisualProperty() {
- assertEquals(vp1, node1.getVisualProperty());
- assertEquals(vp2, node2.getVisualProperty());
- assertEquals(vp3, node3.getVisualProperty());
- assertEquals(vp4, node4.getVisualProperty());
- }
-
- @Test
- public void testGetParent() {
- assertNull(node1.getParent());
- assertEquals(node1, node2.getParent());
- assertEquals(node1, node4.getParent());
- assertEquals(node4, node3.getParent());
- }
-
- @Test
- public void testGetChildren() {
- assertEquals(2, node1.getChildren().size());
- assertEquals(0, node2.getChildren().size());
- assertEquals(1, node4);
- assertEquals(0, node3.getChildren().size());
- }
-
-}
\ No newline at end of file
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractVisualPropertyTest.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractVisualPropertyTest.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractVisualPropertyTest.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -3,8 +3,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
Deleted:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyObjectExtended.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyObjectExtended.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyObjectExtended.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -1,5 +0,0 @@
-package org.cytoscape.view.model;
-
-public class DummyObjectExtended extends DummyObject {
-
-}
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualProperty.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualProperty.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualProperty.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -2,10 +2,12 @@
public class DummyVisualProperty extends AbstractVisualProperty<DummyObject> {
- public DummyVisualProperty(DummyObject defaultValue, String id, String
name) {
- super(defaultValue, DummyObject.class, id, name);
+
+ public DummyVisualProperty(DummyObject defaultValue, String id, String
displayName) {
+ super(defaultValue, DummyObject.class, id, displayName);
}
+
@Override
public String toSerializableString(DummyObject value) {
return "test";
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualPropertyTest.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualPropertyTest.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualPropertyTest.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -11,7 +11,7 @@
@Before
public void setUp() throws Exception {
id = "DummyVisualProperty";
- defaultVal = new DummyObjectExtended();
+ defaultVal = new DummyObject();
displayName = "Dummy Visual Property";
type = DummyObject.class;
ignore = false;
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/IntegerVisualProperty.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/IntegerVisualProperty.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/IntegerVisualProperty.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -38,9 +38,9 @@
class IntegerVisualProperty extends AbstractVisualProperty<Integer> {
- public IntegerVisualProperty(final Integer def, final String id, final
String name) {
+ public IntegerVisualProperty() {
// isolated node. No parent/children.
- super(def, Integer.class, id, name);
+ super(10, Integer.class, "integer", "Integer Visual Property");
}
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/StringVisualProperty.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/StringVisualProperty.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/StringVisualProperty.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -2,10 +2,9 @@
public class StringVisualProperty extends AbstractVisualProperty<String> {
- public StringVisualProperty(final String defaultValue, final String id,
- final String name) {
+ public StringVisualProperty() {
// isolated node. No parent/children.
- super(defaultValue, String.class, id, name);
+ super("test", String.class, "string", "String Visual Property");
}
public String parseSerializableString(final String text) {
Copied:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/VisualLexiconNodeTest.java
(from rev 22289,
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractVisualLexiconNodeTest.java)
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/VisualLexiconNodeTest.java
(rev 0)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/VisualLexiconNodeTest.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -0,0 +1,66 @@
+package org.cytoscape.view.model;
+
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class VisualLexiconNodeTest {
+
+ private VisualProperty<DummyObject> vp1;
+ private VisualProperty<Integer> vp2;
+ private VisualProperty<String> vp3;
+
+ private VisualLexiconNode node1;
+ private VisualLexiconNode node2;
+ private VisualLexiconNode node3;
+
+
+ @Before
+ public void setUp() throws Exception {
+ vp1 = new DummyVisualProperty(new DummyObject(), "dummy",
"Dummy Visual Property");
+ vp2 = new IntegerVisualProperty();
+ vp3 = new StringVisualProperty();
+ node1 = new VisualLexiconNode(vp1, null);
+ node2 = new VisualLexiconNode(vp2, node1);
+ node3 = new VisualLexiconNode(vp3, node2);
+ }
+
+ @Test(expected=NullPointerException.class)
+ public void testNullVP() {
+ VisualLexiconNode dummyNode = new VisualLexiconNode(null, null);
+ }
+
+
+ @Test
+ public void testVisualLexiconNodeImpl() {
+ assertNotNull(node1);
+ assertNotNull(node2);
+ assertNotNull(node3);
+ }
+
+ @Test
+ public void testGetVisualProperty() {
+ assertEquals(vp1, node1.getVisualProperty());
+ assertEquals(vp2, node2.getVisualProperty());
+ assertEquals(vp3, node3.getVisualProperty());
+ }
+
+ @Test
+ public void testGetParent() {
+ assertNull(node1.getParent());
+ assertEquals(node1, node2.getParent());
+ assertEquals(node2, node3.getParent());
+ }
+
+ @Test
+ public void testGetChildren() {
+ assertEquals(1, node1.getChildren().size());
+ assertEquals(1, node2.getChildren().size());
+ assertEquals(0, node3.getChildren().size());
+ }
+
+}
\ No newline at end of file
Modified:
core3/viewmodel-impl/trunk/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
===================================================================
---
core3/viewmodel-impl/trunk/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-impl/trunk/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -2,7 +2,6 @@
import org.cytoscape.integration.AbstractIntegrationTester;
import org.cytoscape.view.model.CyNetworkViewFactory;
-import org.cytoscape.view.model.VisualLexiconNodeFactory;
/**
* Integration test for viewmodel-impl bundle.
@@ -23,9 +22,9 @@
"org.cytoscape, viewmodel-api,
1.0-SNAPSHOT",
"org.cytoscape, viewmodel-impl,
1.0-SNAPSHOT", },
new String[] {
- "cyNetworkViewFactory",
"visualLexiconNodeFactory" },
+ "cyNetworkViewFactory" },
new Class[] {
- CyNetworkViewFactory.class,
VisualLexiconNodeFactory.class },
+ CyNetworkViewFactory.class },
new String[] { "org.cytoscape.view.model" }
);
}
Deleted:
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeFactoryImpl.java
===================================================================
---
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeFactoryImpl.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeFactoryImpl.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -1,15 +0,0 @@
-package org.cytoscape.view.model.internal;
-
-import org.cytoscape.view.model.VisualLexiconNode;
-import org.cytoscape.view.model.VisualLexiconNodeFactory;
-import org.cytoscape.view.model.VisualProperty;
-
-public class VisualLexiconNodeFactoryImpl implements VisualLexiconNodeFactory {
-
- @Override
- public VisualLexiconNode createNode(VisualProperty<?> vp,
- VisualLexiconNode parent) {
- return new VisualLexiconNodeImpl(vp, parent);
- }
-
-}
Deleted:
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeImpl.java
===================================================================
---
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeImpl.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeImpl.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -1,42 +0,0 @@
-package org.cytoscape.view.model.internal;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.cytoscape.view.model.VisualLexiconNode;
-import org.cytoscape.view.model.VisualProperty;
-
-public class VisualLexiconNodeImpl implements VisualLexiconNode {
-
- protected final VisualProperty<?> vp;
-
- protected final VisualLexiconNode parent;
- protected final Collection<VisualLexiconNode> children;
-
-
- public VisualLexiconNodeImpl(final VisualProperty<?> vp, final
VisualLexiconNode parent) {
- this.vp = vp;
- this.parent = parent;
- this.children = new HashSet<VisualLexiconNode>();
-
- if(parent != null)
- parent.getChildren().add(this);
-
- }
-
- @Override
- public VisualProperty<?> getVisualProperty() {
- return vp;
- }
-
- @Override
- public VisualLexiconNode getParent() {
- return parent;
- }
-
- @Override
- public Collection<VisualLexiconNode> getChildren() {
- return children;
- }
-
-}
Modified:
core3/viewmodel-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/viewmodel-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-10-26 01:14:26 UTC (rev 22423)
@@ -17,25 +17,5 @@
<entry key="service.type" value="factory" />
</osgi:service-properties>
</osgi:service>
-
- <osgi:service id="visualLexiconNodeFactoryService"
ref="visualLexiconNodeFactory"
- interface="org.cytoscape.view.model.VisualLexiconNodeFactory">
- <osgi:service-properties>
- <entry key="service.type" value="factory" />
- </osgi:service-properties>
- </osgi:service>
- <!--<osgi:service id="visualLexiconManagerService" ref="lexiconManager"
- interface="org.cytoscape.view.model.VisualLexiconManager">
- <osgi:service-properties>
- <entry key="service.type" value="objectFacade" />
- </osgi:service-properties>
- </osgi:service>
-
- Define OSGi Service Listener
- <osgi:set id="renderers"
interface="org.cytoscape.view.model.VisualLexicon"
- cardinality="0..N">
- <osgi:listener bind-method="addVisualLexicon"
- unbind-method="removeVisualLexicon"
ref="lexiconManager" />
- </osgi:set>
---></beans>
+</beans>
Modified:
core3/viewmodel-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/viewmodel-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/viewmodel-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-26 01:14:26 UTC (rev 22423)
@@ -18,7 +18,4 @@
<constructor-arg ref="cyServiceRegistrarRef" />
</bean>
- <bean id="visualLexiconNodeFactory"
class="org.cytoscape.view.model.internal.VisualLexiconNodeFactoryImpl">
- </bean>
-
</beans>
Modified:
core3/vizmap-impl/trunk/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
===================================================================
---
core3/vizmap-impl/trunk/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
2010-10-26 00:23:58 UTC (rev 22422)
+++
core3/vizmap-impl/trunk/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
2010-10-26 01:14:26 UTC (rev 22423)
@@ -1,14 +1,12 @@
package org.cytoscape.view.vizmap;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.createMock;
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;
import org.junit.Before;
@@ -22,8 +20,7 @@
final VisualProperty<NullDataType> twoDRoot = new
NullVisualProperty(
"TWO_D_ROOT", "2D Root Visual Property");
- lexicon = new TwoDVisualLexicon(twoDRoot,
- new VisualLexiconNodeFactoryImpl());
+ lexicon = new TwoDVisualLexicon(twoDRoot);
final CyEventHelper helperMock =
createMock(CyEventHelper.class);
final VisualStyleFactoryImpl visualStyleFactory = new
VisualStyleFactoryImpl(
--
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.
