Author: kono
Date: 2010-10-01 16:55:42 -0700 (Fri, 01 Oct 2010)
New Revision: 22131
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DNodeView.java
core3/ding-presentation-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
Start converting Actions to general Task framework.
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
===================================================================
---
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2010-10-01 23:55:19 UTC (rev 22130)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2010-10-01 23:55:42 UTC (rev 22131)
@@ -1566,9 +1566,9 @@
} else if (vp == DVisualLexicon.EDGE_SOURCE_ARROW_SHAPE) {
setSourceEdgeEnd(((ArrowShape) value).getGinyArrow());
} else if (vp == TwoDVisualLexicon.EDGE_LABEL) {
- setText((String) value);
+ setText(value.toString());
} else if (vp == DVisualLexicon.EDGE_TOOLTIP) {
- setToolTip((String) value);
+ setToolTip(value.toString());
} else if (vp == DVisualLexicon.EDGE_LABEL_EDGE_ANCHOR) {
setEdgeLabelAnchor(((Anchor) value).getGinyAnchor());
} else if (vp == DVisualLexicon.EDGE_LABEL_TEXT_ANCHOR) {
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DNodeView.java
===================================================================
---
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2010-10-01 23:55:19 UTC (rev 22130)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2010-10-01 23:55:42 UTC (rev 22131)
@@ -1395,7 +1395,7 @@
} else if (vp == TwoDVisualLexicon.NODE_Y_SIZE) {
setHeight(((Double) value).doubleValue());
} else if (vp == TwoDVisualLexicon.NODE_LABEL) {
- setText((String) value);
+ setText(value.toString());
} else if (vp == TwoDVisualLexicon.NODE_X_LOCATION) {
setXPosition(((Double) value).doubleValue());
} else if (vp == TwoDVisualLexicon.NODE_Y_LOCATION) {
Modified:
core3/ding-presentation-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/ding-presentation-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-10-01 23:55:19 UTC (rev 22130)
+++
core3/ding-presentation-impl/branches/vp-tree/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-10-01 23:55:42 UTC (rev 22131)
@@ -64,8 +64,13 @@
</osgi:service>
+ <!-- Visual Lexicon for Ding -->
<osgi:service id="dVisualLexiconService" ref="dVisualLexicon"
interface="org.cytoscape.view.model.VisualLexicon">
+ <osgi:service-properties>
+ <entry key="serviceType" value="visualLexicon" />
+ <entry key="id" value="ding" />
+ </osgi:service-properties>
</osgi:service>
<osgi:set id="nodeViewTaskFactorySet"
interface="org.cytoscape.task.NodeViewTaskFactory"
--
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.
