Author: kono
Date: 2010-10-25 12:59:22 -0700 (Mon, 25 Oct 2010)
New Revision: 22374
Modified:
core3/default-mappingcalculators/trunk/src/test/java/org/cytoscape/vizmap/ColorVisualProperty.java
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/DVisualLexicon.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
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/BooleanVisualProperty.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DoubleVisualProperty.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/PaintVisualProperty.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/StringVisualProperty.java
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyTest.java
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/AbstractVisualProperty.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualProperty.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualPropertyTest.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/IntegerVisualProperty.java
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/StringVisualProperty.java
Log:
VisualProperty implementation needs dataType parameter. This is necessary to
return correct data type (interface) instead of concrete class type
(implementation).
Modified:
core3/default-mappingcalculators/trunk/src/test/java/org/cytoscape/vizmap/ColorVisualProperty.java
===================================================================
---
core3/default-mappingcalculators/trunk/src/test/java/org/cytoscape/vizmap/ColorVisualProperty.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/default-mappingcalculators/trunk/src/test/java/org/cytoscape/vizmap/ColorVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -8,7 +8,7 @@
public ColorVisualProperty(final Color defaultValue,
final String id, final String name) {
- super(defaultValue, id, name);
+ super(defaultValue, Color.class, id, name);
}
public Color parseSerializableString(final String text) {
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-10-25 19:38:52 UTC (rev 22373)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/AnchorTwoDVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -40,7 +40,7 @@
public class AnchorTwoDVisualProperty extends AbstractVisualProperty<Anchor> {
public AnchorTwoDVisualProperty(final Anchor def, final String id,
final String name) {
- super(def,id,name);
+ super(def, Anchor.class, id,name);
}
public String toSerializableString(final Anchor value) {
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-10-25 19:38:52 UTC (rev 22373)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/ArrowShapeTwoDVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -41,7 +41,7 @@
public class ArrowShapeTwoDVisualProperty extends
AbstractVisualProperty<ArrowShape> {
public ArrowShapeTwoDVisualProperty(final ArrowShape def, final String
id, final String name) {
- super(def,id,name);
+ super(def, ArrowShape.class, id,name);
}
public String toSerializableString(final ArrowShape value) {
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -72,10 +72,10 @@
NodeShape.ROUND_RECT, "NODE_SHAPE", "Node Shape");
public static final VisualProperty<Color> NODE_SELECTED_PAINT = new
PaintVisualProperty<Color>(
- Color.YELLOW, "NODE_SELECTED_PAINT", "Node Selected
Paint");
+ Color.YELLOW, Color.class, "NODE_SELECTED_PAINT", "Node
Selected Paint");
public static final VisualProperty<Color> NODE_BORDER_PAINT = new
PaintVisualProperty<Color>(
- Color.BLACK, "NODE_BORDER_PAINT", "Node Border Paint");
+ Color.BLACK, Color.class, "NODE_BORDER_PAINT", "Node
Border Paint");
public static final VisualProperty<Double> NODE_BORDER_WIDTH = new
DoubleVisualProperty(
DEF_BORDER_WIDTH, "NODE_BORDER_WIDTH", "Node Border
Width");
@@ -113,21 +113,21 @@
200, "NODE_TRANSPARENCY", "Node Transparency");
public static final VisualProperty<Color> EDGE_SELECTED_PAINT = new
PaintVisualProperty<Color>(
- Color.RED, "EDGE_SELECTED_PAINT", "Edge Selected
Paint");
+ Color.RED, Color.class, "EDGE_SELECTED_PAINT", "Edge
Selected Paint");
public static final VisualProperty<? extends Stroke> EDGE_STROKE = new
StrokeTwoDVisualProperty(
new BasicStroke(), "EDGE_STROKE", "Edge Stroke");
public static final VisualProperty<Color>
EDGE_SOURCE_ARROW_SELECTED_PAINT = new PaintVisualProperty<Color>(
- Color.YELLOW, "EDGE_SOURCE_ARROW_SELECTED_PAINT", "Edge
Source Arrow Selected Paint");
+ Color.YELLOW, Color.class,
"EDGE_SOURCE_ARROW_SELECTED_PAINT", "Edge Source Arrow Selected Paint");
public static final VisualProperty<Color>
EDGE_TARGET_ARROW_SELECTED_PAINT = new PaintVisualProperty<Color>(
- Color.YELLOW, "EDGE_TARGET_ARROW_SELECTED_PAINT",
+ Color.YELLOW, Color.class,
"EDGE_TARGET_ARROW_SELECTED_PAINT",
"Edge Target Arrow Selected Paint");
public static final VisualProperty<Color>
EDGE_SOURCE_ARROW_UNSELECTED_PAINT = new PaintVisualProperty<Color>(
- Color.BLACK, "EDGE_SOURCE_ARROW_UNSELECTED_PAINT",
+ Color.BLACK, Color.class,
"EDGE_SOURCE_ARROW_UNSELECTED_PAINT",
"Edge Source Arrow Unselected Paint");
public static final VisualProperty<Color>
EDGE_TARGET_ARROW_UNSELECTED_PAINT = new PaintVisualProperty<Color>(
- Color.BLACK, "EDGE_TARGET_ARROW_UNSELECTED_PAINT",
+ Color.BLACK, Color.class,
"EDGE_TARGET_ARROW_UNSELECTED_PAINT",
"Edge Target Arrow Unselected Paint");
public static final VisualProperty<ArrowShape> EDGE_SOURCE_ARROW_SHAPE
= new ArrowShapeTwoDVisualProperty(
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-10-25 19:38:52 UTC (rev 22373)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/FontTwoDVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -42,7 +42,7 @@
public class FontTwoDVisualProperty extends AbstractVisualProperty<Font> {
public FontTwoDVisualProperty(final Font def, final String id, final
String name) {
- super(def,id,name);
+ super(def,Font.class, id,name);
}
public String toSerializableString(final Font value) {
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-10-25 19:38:52 UTC (rev 22373)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/IntegerTwoDVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -40,7 +40,7 @@
public class IntegerTwoDVisualProperty extends AbstractVisualProperty<Integer>
{
public IntegerTwoDVisualProperty(final Integer def, final String id,
final String name) {
- super(def,id,name);
+ super(def,Integer.class, id,name);
}
public String toSerializableString(final Integer value) {
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-10-25 19:38:52 UTC (rev 22373)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/JustifyTwoDVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -42,7 +42,7 @@
public class JustifyTwoDVisualProperty extends AbstractVisualProperty<Justify>
{
public JustifyTwoDVisualProperty(final Justify def, final String id,
final String name) {
- super(def,id,name);
+ super(def,Justify.class, id,name);
}
public String toSerializableString(final Justify value) {
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-10-25 19:38:52 UTC (rev 22373)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/NodeShapeTwoDVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -41,7 +41,7 @@
AbstractVisualProperty<NodeShape> {
public NodeShapeTwoDVisualProperty(final NodeShape def, final String
id, final String name) {
- super(def, id, name);
+ super(def, NodeShape.class, id, name);
}
public String toSerializableString(final NodeShape value) {
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-10-25 19:38:52 UTC (rev 22373)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/StrokeTwoDVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -42,7 +42,7 @@
public class StrokeTwoDVisualProperty extends AbstractVisualProperty<Stroke> {
public StrokeTwoDVisualProperty(final Stroke def, final String id,
final String name) {
- super(def,id,name);
+ super(def,Stroke.class, id,name);
}
public String toSerializableString(final Stroke value) {
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/BooleanVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/BooleanVisualProperty.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/BooleanVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -40,7 +40,7 @@
public class BooleanVisualProperty extends AbstractVisualProperty<Boolean> {
public BooleanVisualProperty(final Boolean def, final String id, final
String name) {
- super(def,id,name);
+ super(def, Boolean.class, id,name);
}
public String toSerializableString(final Boolean value) {
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -9,7 +9,7 @@
private static final Visualizable visualizable = new VisualizableImpl();
public DefaultVisualizableVisualProperty(final String id, final String
name) {
- super(visualizable, id, name);
+ super(visualizable, Visualizable.class, id, name);
}
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DoubleVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DoubleVisualProperty.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/DoubleVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -44,7 +44,7 @@
public DoubleVisualProperty(final Double def, final String id,
final String name, final boolean ignoreDefault) {
- super(def, id, name);
+ super(def, Double.class, id, name);
this.shouldIgnoreDefault = ignoreDefault;
}
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -9,7 +9,7 @@
private static final NullDataType dummyObject = new NullDataTypeImpl();
public NullVisualProperty(final String id, final String name) {
- super(dummyObject, id, name);
+ super(dummyObject, NullDataType.class, id, name);
}
public String toSerializableString(final NullDataType value) {
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/PaintVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/PaintVisualProperty.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/PaintVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -43,8 +43,8 @@
public class PaintVisualProperty<T extends Paint> extends
AbstractVisualProperty<T> {
- public PaintVisualProperty(final T def, final String id, final String
name) {
- super(def, id, name);
+ public PaintVisualProperty(final T def, final Class<T> dataType, final
String id, final String name) {
+ super(def, dataType, id, name);
}
public String toSerializableString(final T color) {
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/StringVisualProperty.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/StringVisualProperty.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/StringVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -39,7 +39,7 @@
public class StringVisualProperty extends AbstractVisualProperty<String> {
public StringVisualProperty(final String def, final String id, final
String name) {
- super(def, id, name);
+ super(def, String.class, id, name);
}
public String toSerializableString(final String value) {
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/TwoDVisualLexicon.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -64,13 +64,13 @@
"EDGE", "Edge Visual Property");
public static final VisualProperty<Color> NODE_PAINT = new
PaintVisualProperty<Color>(
- Color.gray, "NODE_PAINT", "Node Paint");
+ Color.gray, Color.class, "NODE_PAINT", "Node Paint");
public static final VisualProperty<Color> NODE_COLOR = new
PaintVisualProperty<Color>(
- Color.RED, "NODE_COLOR", "Node Color");
+ Color.RED, Color.class, "NODE_COLOR", "Node Color");
public static final VisualProperty<Color> NODE_SELECTED_COLOR = new
PaintVisualProperty<Color>(
- Color.YELLOW, "NODE_SELECTED_COLOR", "Node Selected
Color");
+ Color.YELLOW, Color.class, "NODE_SELECTED_COLOR", "Node
Selected Color");
public static final VisualProperty<Color> NODE_LABEL_COLOR = new
PaintVisualProperty<Color>(
- Color.BLACK, "NODE_LABEL_COLOR", "Node Label Color");
+ Color.BLACK, Color.class, "NODE_LABEL_COLOR", "Node
Label Color");
public static final VisualProperty<String> NODE_TEXT = new
StringVisualProperty(
"", "NODE_TEXT", "Node Text");
@@ -98,11 +98,11 @@
false, "NODE_SELECTED", "Node Selected");
public static final VisualProperty<? extends Paint> EDGE_PAINT = new
PaintVisualProperty<Color>(
- Color.gray, "EDGE_PAINT", "Edge Paint");
+ Color.gray, Color.class, "EDGE_PAINT", "Edge Paint");
public static final VisualProperty<Color> EDGE_COLOR = new
PaintVisualProperty<Color>(
- Color.gray, "EDGE_COLOR", "Edge Color");
+ Color.gray, Color.class, "EDGE_COLOR", "Edge Color");
public static final VisualProperty<Color> EDGE_LABEL_COLOR = new
PaintVisualProperty<Color>(
- Color.BLACK, "EDGE_LABEL_COLOR", "Edge Label Color");
+ Color.BLACK, Color.class, "EDGE_LABEL_COLOR", "Edge
Label Color");
public static final VisualProperty<String> EDGE_TEXT = new
StringVisualProperty(
"", "EDGE_TEXT", "Edge Text");
@@ -139,9 +139,9 @@
"", "NETWORK_TITLE", "Network Title");
public static final VisualProperty<Color> NETWORK_PAINT = new
PaintVisualProperty<Color>(
- Color.WHITE, "NETWORK_PAINT", "Network Paint");
- public static final VisualProperty<Paint> NETWORK_BACKGROUND_COLOR =
new PaintVisualProperty<Paint>(
- Color.WHITE, "NETWORK_BACKGROUND_COLOR", "Network
Background Color");
+ Color.WHITE, Color.class, "NETWORK_PAINT", "Network
Paint");
+ public static final VisualProperty<Color> NETWORK_BACKGROUND_COLOR =
new PaintVisualProperty<Color>(
+ Color.WHITE, Color.class, "NETWORK_BACKGROUND_COLOR",
"Network Background Color");
/**
* Build tree-structure for the set of Visual Properties defined in this
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyTest.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyTest.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -6,6 +6,7 @@
import java.awt.Color;
import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.model.Visualizable;
import org.cytoscape.view.presentation.property.PaintVisualProperty;
import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
import org.junit.After;
@@ -35,11 +36,15 @@
assertEquals(false,
booleanProp.parseSerializableString("FALSE"));
final VisualProperty<Double> doubleProp =
TwoDVisualLexicon.NODE_SIZE;
- assertEquals(Boolean.class, booleanProp.getType());
- assertEquals("false",
booleanProp.toSerializableString(Boolean.FALSE));
- assertEquals(false,
booleanProp.parseSerializableString("false"));
- assertEquals(false,
booleanProp.parseSerializableString("False"));
- assertEquals(false,
booleanProp.parseSerializableString("FALSE"));
+ assertEquals(Double.class, doubleProp.getType());
+ assertEquals("20.0",
doubleProp.toSerializableString(Double.valueOf(20)));
+ assertEquals(Double.valueOf(100.12),
doubleProp.parseSerializableString("100.12"));
+
+ final VisualProperty<Visualizable> visualizableProp =
TwoDVisualLexicon.NODE;
+ assertEquals(Visualizable.class, visualizableProp.getType());
+
+
+
}
}
Modified:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/AbstractVisualProperty.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/AbstractVisualProperty.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/AbstractVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -66,7 +66,7 @@
*
*/
@SuppressWarnings("unchecked")
- public AbstractVisualProperty(final T defaultValue, final String id,
final String displayName) {
+ public AbstractVisualProperty(final T defaultValue, final Class<T>
dataType, final String id, final String displayName) {
if(defaultValue == null)
throw new NullPointerException("defaultValue should not
be null.");
@@ -76,8 +76,10 @@
if(displayName == null)
throw new NullPointerException("displayName should not
be null.");
+ if(dataType.isAssignableFrom(defaultValue.getClass()) == false)
+ throw new IllegalArgumentException();
- this.dataType = (Class<T>) defaultValue.getClass();
+ this.dataType = dataType;
this.defaultValue = defaultValue;
this.id = id;
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualProperty.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualProperty.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -3,7 +3,7 @@
public class DummyVisualProperty extends AbstractVisualProperty<DummyObject> {
public DummyVisualProperty(DummyObject defaultValue, String id, String
name) {
- super(defaultValue, id, name);
+ super(defaultValue, DummyObject.class, id, name);
}
@Override
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualPropertyTest.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualPropertyTest.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/DummyVisualPropertyTest.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -13,7 +13,7 @@
id = "DummyVisualProperty";
defaultVal = new DummyObjectExtended();
displayName = "Dummy Visual Property";
- type = (Class<DummyObject>) defaultVal.getClass();
+ type = DummyObject.class;
ignore = false;
vp = new DummyVisualProperty(defaultVal, id, displayName);
}
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/IntegerVisualProperty.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/IntegerVisualProperty.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/IntegerVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -40,7 +40,7 @@
public IntegerVisualProperty(final Integer def, final String id, final
String name) {
// isolated node. No parent/children.
- super(def, id, name);
+ super(def, Integer.class, id, name);
}
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/StringVisualProperty.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/StringVisualProperty.java
2010-10-25 19:38:52 UTC (rev 22373)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/StringVisualProperty.java
2010-10-25 19:59:22 UTC (rev 22374)
@@ -5,7 +5,7 @@
public StringVisualProperty(final String defaultValue, final String id,
final String name) {
// isolated node. No parent/children.
- super(defaultValue, id, name);
+ super(defaultValue, String.class, id, name);
}
public String parseSerializableString(final String text) {
--
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.
