Author: kono
Date: 2012-04-24 12:17:24 -0700 (Tue, 24 Apr 2012)
New Revision: 28965
Modified:
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditor.java
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/VisualPropertyEditor.java
core3/api/trunk/vizmap-gui-api/src/test/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditorTest.java
Log:
New tests added.
Modified:
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditor.java
===================================================================
---
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditor.java
2012-04-24 18:58:28 UTC (rev 28964)
+++
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditor.java
2012-04-24 19:17:24 UTC (rev 28965)
@@ -119,9 +119,8 @@
}
@Override
- public TableCellRenderer getContinuousTableCellRenderer(PropertyEditor
continuousMappingEditor) {
- // Return default cell renderer for
- return new
ContinuousMappingCellRenderer((ContinuousMappingEditor<?, ?>)
continuousMappingEditor);
+ public TableCellRenderer getContinuousTableCellRenderer(final
ContinuousMappingEditor<? extends Number, T> continuousMappingEditor) {
+ return new
ContinuousMappingCellRenderer(continuousMappingEditor);
}
@@ -136,7 +135,7 @@
return null;
}
- private final class ContinuousMappingCellRenderer extends
DefaultCellRenderer {
+ private static final class ContinuousMappingCellRenderer extends
DefaultCellRenderer {
private static final long serialVersionUID =
-6734053848878359286L;
Modified:
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/VisualPropertyEditor.java
===================================================================
---
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/VisualPropertyEditor.java
2012-04-24 18:58:28 UTC (rev 28964)
+++
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/VisualPropertyEditor.java
2012-04-24 19:17:24 UTC (rev 28965)
@@ -54,16 +54,17 @@
/**
* Returns the type of object managed in the Visual property.
+ *
* @return the type of object managed in the Visual property.
*/
Class<T> getType();
-// /**
-// * Returns continuous mapping editor for the Visual Property. Return
value
-// * is null if Continuous Editor does not exist.
-// * @return a continuous mapping editor for the Visual Property.
-// */
-// PropertyEditor getContinuousMappingEditor();
+
+ /**
+ * Returns type of Continuous Editor.
+ *
+ * @return type of {@link ContinuousMappingEditor}
+ */
ContinuousEditorType getContinuousEditorType();
/**
@@ -72,14 +73,6 @@
*/
PropertyEditor getPropertyEditor();
-// /**
-// * Display editor and get user input. Note: editor is associated with
data
-// * type (String, Number, Color...), so we do not need to provide
-// * VisualProperty as parameter.
-// *
-// * @return the user input or null.
-// */
-// T showVisualPropertyValueEditor();
/**
* A custom cell renderer for Discrete table cells.
@@ -93,7 +86,7 @@
*
* @return a TableCellRenderer Continuous table cells.
*/
- TableCellRenderer getContinuousTableCellRenderer(PropertyEditor
continuousMappingEditor);
+ TableCellRenderer
getContinuousTableCellRenderer(ContinuousMappingEditor<? extends Number, T>
continuousMappingEditor);
/**
* This is for default view editor.
Modified:
core3/api/trunk/vizmap-gui-api/src/test/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditorTest.java
===================================================================
---
core3/api/trunk/vizmap-gui-api/src/test/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditorTest.java
2012-04-24 18:58:28 UTC (rev 28964)
+++
core3/api/trunk/vizmap-gui-api/src/test/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditorTest.java
2012-04-24 19:17:24 UTC (rev 28965)
@@ -29,6 +29,7 @@
DummyEditor editor;
PropertyEditor propertyEditor;
ContinuousEditorType continuousEditorType;
+
@Before
public void testAbstractVisualPropertyEditor(){
@@ -48,6 +49,12 @@
}
@Test
+ public void testGetContinuousTableCellRenderer(){
+ ContinuousMappingEditor<?,?> continuousEditor =
mock(ContinuousMappingEditor.class);
+
assertNotNull(editor.getContinuousTableCellRenderer((ContinuousMappingEditor<?
extends Number, Object>) continuousEditor));
+ }
+
+ @Test
public void testGetContinuousEditorType(){
assertEquals(continuousEditorType,
editor.getContinuousEditorType());
}
--
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.
