Author: kono
Date: 2012-04-24 12:18:42 -0700 (Tue, 24 Apr 2012)
New Revision: 28966
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/FontVisualPropertyEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
Log:
Minor API update. Parameter type changed for VisualPropertyEditor.
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2012-04-24 19:17:24 UTC (rev 28965)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2012-04-24 19:18:42 UTC (rev 28966)
@@ -53,6 +53,7 @@
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
+import org.cytoscape.view.vizmap.gui.editor.ContinuousMappingEditor;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
import org.cytoscape.view.vizmap.gui.editor.VisualPropertyEditor;
import org.cytoscape.view.vizmap.gui.internal.event.CellType;
@@ -230,7 +231,7 @@
throw new NullPointerException("Continuous
Mapping cell editor is null.");
else {
// Renderer for Continuous mapping icon cell
- final TableCellRenderer continuousRenderer =
vpEditor.getContinuousTableCellRenderer(continuousCellEditor);
+ final TableCellRenderer continuousRenderer =
vpEditor.getContinuousTableCellRenderer((ContinuousMappingEditor<? extends
Number, V>) continuousCellEditor);
rendReg.registerRenderer(graphicalView,
continuousRenderer);
continuousCellEditor.setValue(visualMapping);
cellEditorFactory.registerEditor(graphicalView,
continuousCellEditor);
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2012-04-24 19:17:24 UTC (rev 28965)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2012-04-24 19:18:42 UTC (rev 28966)
@@ -316,4 +316,5 @@
return null;
}
+
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/FontVisualPropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/FontVisualPropertyEditor.java
2012-04-24 19:17:24 UTC (rev 28965)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/FontVisualPropertyEditor.java
2012-04-24 19:18:42 UTC (rev 28966)
@@ -10,6 +10,7 @@
import org.cytoscape.view.vizmap.gui.VizMapGUI;
import org.cytoscape.view.vizmap.gui.editor.AbstractVisualPropertyEditor;
import org.cytoscape.view.vizmap.gui.editor.ContinuousEditorType;
+import org.cytoscape.view.vizmap.gui.editor.ContinuousMappingEditor;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyFontPropertyEditor;
@@ -29,7 +30,7 @@
}
@Override
- public TableCellRenderer getContinuousTableCellRenderer(PropertyEditor
continuousMappingEditor) {
+ public TableCellRenderer
getContinuousTableCellRenderer(ContinuousMappingEditor<? extends Number, Font>
continuousMappingEditor) {
// TODO Auto-generated method stub
//return new C2DMappingEditor<Font>(vp, editorManager,
vizMapGUI);
return null;
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
2012-04-24 19:17:24 UTC (rev 28965)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
2012-04-24 19:18:42 UTC (rev 28966)
@@ -34,8 +34,6 @@
*/
package org.cytoscape.view.vizmap.gui.internal.editor;
-import java.beans.PropertyEditor;
-
import javax.swing.table.TableCellRenderer;
import org.cytoscape.application.CyApplicationManager;
@@ -64,8 +62,7 @@
}
@Override
- public TableCellRenderer getContinuousTableCellRenderer(PropertyEditor
continuousMappingEditor) {
- // TODO Auto-generated method stub
+ public TableCellRenderer
getContinuousTableCellRenderer(ContinuousMappingEditor<? extends Number, T>
continuousMappingEditor) {
return new
NumberContinuousCellRenderer((ContinuousMappingEditor<?, ?>)
continuousMappingEditor);
}
--
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.
