Author: kono
Date: 2010-09-20 18:22:52 -0700 (Mon, 20 Sep 2010)
New Revision: 21958
Added:
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeFactoryImpl.java
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeImpl.java
Modified:
core3/viewmodel-impl/branches/vp-tree/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Refactored version of visual property tree. Tree structure is now managed in
wrapper object VisualLexiconNode.
Modified:
core3/viewmodel-impl/branches/vp-tree/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
2010-09-21 01:22:11 UTC (rev 21957)
+++
core3/viewmodel-impl/branches/vp-tree/src/integration/java/org/cytoscape/view/ITViewModelImpl.java
2010-09-21 01:22:52 UTC (rev 21958)
@@ -2,6 +2,7 @@
import org.cytoscape.integration.AbstractIntegrationTester;
import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.model.VisualLexiconNodeFactory;
/**
* Integration test for viewmodel-impl bundle.
@@ -22,9 +23,9 @@
"org.cytoscape, viewmodel-api,
1.0-SNAPSHOT",
"org.cytoscape, viewmodel-impl,
1.0-SNAPSHOT", },
new String[] {
- "cyNetworkViewFactory" },
+ "cyNetworkViewFactory",
"visualLexiconNodeFactory" },
new Class[] {
- CyNetworkViewFactory.class },
+ CyNetworkViewFactory.class,
VisualLexiconNodeFactory.class },
new String[] { "org.cytoscape.view.model" }
);
}
Added:
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeFactoryImpl.java
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeFactoryImpl.java
(rev 0)
+++
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeFactoryImpl.java
2010-09-21 01:22:52 UTC (rev 21958)
@@ -0,0 +1,15 @@
+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);
+ }
+
+}
Added:
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeImpl.java
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeImpl.java
(rev 0)
+++
core3/viewmodel-impl/branches/vp-tree/src/main/java/org/cytoscape/view/model/internal/VisualLexiconNodeImpl.java
2010-09-21 01:22:52 UTC (rev 21958)
@@ -0,0 +1,42 @@
+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/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-09-21 01:22:11 UTC (rev 21957)
+++
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-09-21 01:22:52 UTC (rev 21958)
@@ -17,6 +17,13 @@
<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">
Modified:
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context.xml
2010-09-21 01:22:11 UTC (rev 21957)
+++
core3/viewmodel-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context.xml
2010-09-21 01:22:52 UTC (rev 21958)
@@ -18,4 +18,7 @@
<constructor-arg ref="cyServiceRegistrarRef" />
</bean>
+ <bean id="visualLexiconNodeFactory"
class="org.cytoscape.view.model.internal.VisualLexiconNodeFactoryImpl">
+ </bean>
+
</beans>
--
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.
