Author: kono
Date: 2010-08-03 15:15:01 -0700 (Tue, 03 Aug 2010)
New Revision: 21160
Modified:
core3/ding-presentation-impl/trunk/pom.xml
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AnchorTwoDVisualProperty.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/ArrowShapeTwoDVisualProperty.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/FontTwoDVisualProperty.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/IntegerTwoDVisualProperty.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/JustifyTwoDVisualProperty.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/NodeShapeTwoDVisualProperty.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/StrokeTwoDVisualProperty.java
Log:
Method name changed in viewmodel-api, and implementations refactored
accordingly.
Modified: core3/ding-presentation-impl/trunk/pom.xml
===================================================================
--- core3/ding-presentation-impl/trunk/pom.xml 2010-08-03 22:02:14 UTC (rev
21159)
+++ core3/ding-presentation-impl/trunk/pom.xml 2010-08-03 22:15:01 UTC (rev
21160)
@@ -83,7 +83,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>${maven-bundle-plugin.version}</version>
<!--
| the following instructions build a simple set of public/private
classes into an OSGi bundle
-->
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AnchorTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AnchorTwoDVisualProperty.java
2010-08-03 22:02:14 UTC (rev 21159)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AnchorTwoDVisualProperty.java
2010-08-03 22:15:01 UTC (rev 21160)
@@ -43,11 +43,11 @@
super(ot,def,id,name);
}
- public String getSerializableString(final Anchor value) {
+ public String toString(final Anchor value) {
return value.toString();
}
- public Anchor parseSerializableString(final String text) {
+ public Anchor parse(final String text) {
return Anchor.valueOf(text);
}
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/ArrowShapeTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/ArrowShapeTwoDVisualProperty.java
2010-08-03 22:02:14 UTC (rev 21159)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/ArrowShapeTwoDVisualProperty.java
2010-08-03 22:15:01 UTC (rev 21160)
@@ -44,11 +44,11 @@
super(ot,def,id,name);
}
- public String getSerializableString(final ArrowShape value) {
+ public String toString(final ArrowShape value) {
return value.toString();
}
- public ArrowShape parseSerializableString(final String text) {
+ public ArrowShape parse(final String text) {
return ArrowShape.valueOf(text);
}
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/FontTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/FontTwoDVisualProperty.java
2010-08-03 22:02:14 UTC (rev 21159)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/FontTwoDVisualProperty.java
2010-08-03 22:15:01 UTC (rev 21160)
@@ -44,11 +44,11 @@
super(ot,def,id,name);
}
- public String getSerializableString(final Font value) {
+ public String toString(final Font value) {
return value.toString();
}
- public Font parseSerializableString(final String text) {
+ public Font parse(final String text) {
// TODO
return null;
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/IntegerTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/IntegerTwoDVisualProperty.java
2010-08-03 22:02:14 UTC (rev 21159)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/IntegerTwoDVisualProperty.java
2010-08-03 22:15:01 UTC (rev 21160)
@@ -43,11 +43,11 @@
super(ot,def,id,name);
}
- public String getSerializableString(final Integer value) {
+ public String toString(final Integer value) {
return value.toString();
}
- public Integer parseSerializableString(final String text) {
+ public Integer parse(final String text) {
return Integer.valueOf(text);
}
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/JustifyTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/JustifyTwoDVisualProperty.java
2010-08-03 22:02:14 UTC (rev 21159)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/JustifyTwoDVisualProperty.java
2010-08-03 22:15:01 UTC (rev 21160)
@@ -45,11 +45,11 @@
super(ot,def,id,name);
}
- public String getSerializableString(final Justify value) {
+ public String toString(final Justify value) {
return value.toString();
}
- public Justify parseSerializableString(final String text) {
+ public Justify parse(final String text) {
return Justify.valueOf(text);
}
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/NodeShapeTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/NodeShapeTwoDVisualProperty.java
2010-08-03 22:02:14 UTC (rev 21159)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/NodeShapeTwoDVisualProperty.java
2010-08-03 22:15:01 UTC (rev 21160)
@@ -44,11 +44,11 @@
super(ot,def,id,name);
}
- public String getSerializableString(final NodeShape value) {
+ public String toString(final NodeShape value) {
return value.toString();
}
- public NodeShape parseSerializableString(final String text) {
+ public NodeShape parse(final String text) {
return NodeShape.valueOf(text);
}
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/StrokeTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/StrokeTwoDVisualProperty.java
2010-08-03 22:02:14 UTC (rev 21159)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/StrokeTwoDVisualProperty.java
2010-08-03 22:15:01 UTC (rev 21160)
@@ -44,11 +44,11 @@
super(ot,def,id,name);
}
- public String getSerializableString(final Stroke value) {
+ public String toString(final Stroke value) {
return value.toString();
}
- public Stroke parseSerializableString(final String text) {
+ public Stroke parse(final String text) {
// TODO
return null;
}
--
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.
