Author: kono
Date: 2009-08-12 20:48:10 -0700 (Wed, 12 Aug 2009)
New Revision: 17802
Modified:
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
Log:
Accepts null default value.
Modified:
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
===================================================================
---
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2009-08-13 03:42:01 UTC (rev 17801)
+++
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2009-08-13 03:48:10 UTC (rev 17802)
@@ -615,7 +615,7 @@
this.setVerticalAlignment(SwingConstants.CENTER);
this.setIconTextGap(55);
- if (vp != null && vp.getType().equals(String.class))
+ if (vp != null && vp.getType()!= null &&
vp.getType().equals(String.class))
this.setToolTipText(vp.getDefault().toString());
setBackground(isSelected ? SELECTED_COLOR :
list.getBackground());
Modified:
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
===================================================================
---
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2009-08-13 03:42:01 UTC (rev 17801)
+++
core3/vizmap-gui/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2009-08-13 03:48:10 UTC (rev 17802)
@@ -185,8 +185,7 @@
// FIXME
setDiscreteProps(vp, discMapping, attrSet, editorFactory
- .getVisualPropertyEditor(vp),
editorFactory
-
.getVisualPropertyEditor(vp).getTableCellRenderer(10, 10),
+ .getVisualPropertyEditor(vp),
calculatorTypeProp, propertySheetPanel);
} else if (visualMapping instanceof ContinuousMapping
&& (attrName != null)) {
@@ -257,8 +256,7 @@
*/
private <K, V> void setDiscreteProps(VisualProperty<V> vp,
Map<K, V> discMapping, SortedSet<K> attrSet,
- VisualPropertyEditor<V> visualPropertyEditor,
- TableCellRenderer rend, DefaultProperty parent,
PropertySheetPanel propertySheetPanel) {
+ VisualPropertyEditor<V> visualPropertyEditor,
DefaultProperty parent, PropertySheetPanel propertySheetPanel) {
if (attrSet == null)
return;
@@ -282,9 +280,11 @@
valProp.setType(val.getClass());
children.add(valProp);
- ((PropertyRendererRegistry)
propertySheetPanel.getTable()
-
.getRendererFactory()).registerRenderer(valProp, rend);
+ //FIXME!
+// ((PropertyRendererRegistry)
propertySheetPanel.getTable()
+//
.getRendererFactory()).registerRenderer(valProp, rend);
+
//FIXME!!
// ((PropertyEditorRegistry) propertySheetPanel.getTable()
//
.getEditorFactory()).registerEditor(valProp, editor);
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
