Author: kono
Date: 2010-08-03 15:44:17 -0700 (Tue, 03 Aug 2010)
New Revision: 21163

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/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 names are changed to parse/toSerializableString in viewmodel-api, and 
implementations refactored accordingly.

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:42:39 UTC (rev 21162)
+++ 
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AnchorTwoDVisualProperty.java
      2010-08-03 22:44:17 UTC (rev 21163)
@@ -43,11 +43,11 @@
                super(ot,def,id,name);
        }
        
-       public String toString(final Anchor value) {
+       public String toSerializableString(final Anchor value) {
                return value.toString();
        }
 
-       public Anchor parse(final String text) {
+       public Anchor parseSerializableString(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:42:39 UTC (rev 21162)
+++ 
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/ArrowShapeTwoDVisualProperty.java
  2010-08-03 22:44:17 UTC (rev 21163)
@@ -44,11 +44,11 @@
                super(ot,def,id,name);
        }
        
-       public String toString(final ArrowShape value) {
+       public String toSerializableString(final ArrowShape value) {
                return value.toString();
        }
 
-       public ArrowShape parse(final String text) {
+       public ArrowShape parseSerializableString(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:42:39 UTC (rev 21162)
+++ 
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/FontTwoDVisualProperty.java
        2010-08-03 22:44:17 UTC (rev 21163)
@@ -44,11 +44,11 @@
                super(ot,def,id,name);
        }
        
-       public String toString(final Font value) {
+       public String toSerializableString(final Font value) {
                return value.toString();
        }
 
-       public Font parse(final String text) {
+       public Font parseSerializableString(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:42:39 UTC (rev 21162)
+++ 
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/IntegerTwoDVisualProperty.java
     2010-08-03 22:44:17 UTC (rev 21163)
@@ -43,11 +43,11 @@
                super(ot,def,id,name);
        }
        
-       public String toString(final Integer value) {
+       public String toSerializableString(final Integer value) {
                return value.toString();
        }
 
-       public Integer parse(final String text) {
+       public Integer parseSerializableString(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:42:39 UTC (rev 21162)
+++ 
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/JustifyTwoDVisualProperty.java
     2010-08-03 22:44:17 UTC (rev 21163)
@@ -45,11 +45,11 @@
                super(ot,def,id,name);
        }
        
-       public String toString(final Justify value) {
+       public String toSerializableString(final Justify value) {
                return value.toString();
        }
 
-       public Justify parse(final String text) {
+       public Justify parseSerializableString(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:42:39 UTC (rev 21162)
+++ 
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/NodeShapeTwoDVisualProperty.java
   2010-08-03 22:44:17 UTC (rev 21163)
@@ -44,11 +44,11 @@
                super(ot,def,id,name);
        }
        
-       public String toString(final NodeShape value) {
+       public String toSerializableString(final NodeShape value) {
                return value.toString();
        }
 
-       public NodeShape parse(final String text) {
+       public NodeShape parseSerializableString(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:42:39 UTC (rev 21162)
+++ 
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/StrokeTwoDVisualProperty.java
      2010-08-03 22:44:17 UTC (rev 21163)
@@ -44,11 +44,11 @@
                super(ot,def,id,name);
        }
        
-       public String toString(final Stroke value) {
+       public String toSerializableString(final Stroke value) {
                return value.toString();
        }
 
-       public Stroke parse(final String text) {
+       public Stroke parseSerializableString(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.

Reply via email to