Author: kono
Date: 2012-02-01 11:23:57 -0800 (Wed, 01 Feb 2012)
New Revision: 28174
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/ArrowShapeVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyValue.java
Log:
Unnecessary method had been deleted. Parsing should be done in VisualProperty,
not VisualPropertyValue.
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/ArrowShapeVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/ArrowShapeVisualProperty.java
2012-02-01 03:21:38 UTC (rev 28173)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/ArrowShapeVisualProperty.java
2012-02-01 19:23:57 UTC (rev 28174)
@@ -68,16 +68,8 @@
}
private static final class ArrowShapeImpl extends
AbstractVisualPropertyValue implements ArrowShape {
-
- public ArrowShapeImpl(String displayName, String
serializableString) {
+ public ArrowShapeImpl(final String displayName, final String
serializableString) {
super(displayName, serializableString);
}
-
- @Override
- public VisualPropertyValue parseSerializableString(String
serializableString) {
- // TODO: FIXME
- // Should be overridden by child class.
- return null;
- }
}
}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
2012-02-01 03:21:38 UTC (rev 28173)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
2012-02-01 19:23:57 UTC (rev 28174)
@@ -63,15 +63,8 @@
}
private static final class LineTypeImpl extends
AbstractVisualPropertyValue implements LineType {
-
public LineTypeImpl(String displayName, String
serializableString) {
super(displayName, serializableString);
}
-
- @Override
- public VisualPropertyValue parseSerializableString(String
serializableString) {
- // TODO Auto-generated method stub
- return null;
- }
}
}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
2012-02-01 03:21:38 UTC (rev 28173)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
2012-02-01 19:23:57 UTC (rev 28174)
@@ -13,8 +13,7 @@
*
* @CyAPI.Final.Class
*/
-public final class NodeShapeVisualProperty extends
- AbstractVisualProperty<NodeShape> {
+public final class NodeShapeVisualProperty extends
AbstractVisualProperty<NodeShape> {
// Presets
public static final NodeShape RECTANGLE = new
NodeShapeImpl("Rectangle", "RECTANGLE");
@@ -64,7 +63,7 @@
}
@Override
- public NodeShape parseSerializableString(String value) {
+ public NodeShape parseSerializableString(final String value) {
NodeShape shape = null;
if (value != null)
@@ -77,24 +76,9 @@
return DEFAULT_SHAPES.containsValue(shape);
}
- private static final class NodeShapeImpl extends
- AbstractVisualPropertyValue implements NodeShape {
-
- public NodeShapeImpl(final String displayName,
- final String serializableString) {
+ private static final class NodeShapeImpl extends
AbstractVisualPropertyValue implements NodeShape {
+ public NodeShapeImpl(final String displayName, final String
serializableString) {
super(displayName, serializableString);
}
-
- @Override
- public VisualPropertyValue parseSerializableString(final String
serializableString) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public String toString() {
- return super.toString();
- }
}
-
}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyValue.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyValue.java
2012-02-01 03:21:38 UTC (rev 28173)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyValue.java
2012-02-01 19:23:57 UTC (rev 28174)
@@ -25,11 +25,4 @@
*/
String getSerializableString();
- /**
- * Create actual value from serializable String.
- *
- * @param serializableString serialized form of this value
- * @return Value created from given text representation.
- */
- VisualPropertyValue parseSerializableString(final String
serializableString);
}
--
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.
