Author: kono
Date: 2010-07-22 16:09:09 -0700 (Thu, 22 Jul 2010)
New Revision: 21001
Modified:
cytoscape/trunk/src/cytoscape/visual/ui/CellRendererFactory.java
cytoscape/trunk/src/cytoscape/visual/ui/DiscretePropertySetter.java
cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
Log:
Minor changes for property sheet setting.
Modified: cytoscape/trunk/src/cytoscape/visual/ui/CellRendererFactory.java
===================================================================
--- cytoscape/trunk/src/cytoscape/visual/ui/CellRendererFactory.java
2010-07-22 22:28:51 UTC (rev 21000)
+++ cytoscape/trunk/src/cytoscape/visual/ui/CellRendererFactory.java
2010-07-22 23:09:09 UTC (rev 21001)
@@ -30,10 +30,10 @@
CellRendererFactory() {
rendererMap = new HashMap<Class<?>, TableCellRenderer>();
- registerDefaultEditors();
+ registerDefaultRenderers();
}
- private void registerDefaultEditors() {
+ private void registerDefaultRenderers() {
rendererMap.put(Color.class, new CyColorCellRenderer());
rendererMap.put(NodeShape.class, new
ShapeCellRenderer(VisualPropertyType.NODE_SHAPE));
rendererMap.put(LineStyle.class, new
ShapeCellRenderer(VisualPropertyType.EDGE_LINE_STYLE));
@@ -43,9 +43,9 @@
rendererMap.put(CyCustomGraphics.class, new
CustomGraphicsCellRenderer());
rendererMap.put(String.class, DEF_RENDERER);
rendererMap.put(Number.class, DEF_RENDERER);
-
}
+
protected TableCellRenderer getCellRenderer(final Class<?> type) {
final TableCellRenderer rend = this.rendererMap.get(type);
if(rend == null)
@@ -54,6 +54,7 @@
return rend;
}
+
protected void register(final Class<?> type, final TableCellRenderer
renderer) {
this.rendererMap.put(type, renderer);
}
Modified: cytoscape/trunk/src/cytoscape/visual/ui/DiscretePropertySetter.java
===================================================================
--- cytoscape/trunk/src/cytoscape/visual/ui/DiscretePropertySetter.java
2010-07-22 22:28:51 UTC (rev 21000)
+++ cytoscape/trunk/src/cytoscape/visual/ui/DiscretePropertySetter.java
2010-07-22 23:09:09 UTC (rev 21001)
@@ -60,8 +60,7 @@
children.add(valProp);
rendReg.registerRenderer(valProp,
rendFactory.getCellRenderer(type.getDataType()));
- editorReg.registerEditor(valProp, editorFactory
- .getPropertyEditor(type.getDataType()));
+ editorReg.registerEditor(valProp,
editorFactory.getPropertyEditor(type.getDataType()));
valProp.setValue(val);
}
Modified: cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
===================================================================
--- cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
2010-07-22 22:28:51 UTC (rev 21000)
+++ cytoscape/trunk/src/cytoscape/visual/ui/VizMapperMainPanel.java
2010-07-22 23:09:09 UTC (rev 21001)
@@ -1133,9 +1133,8 @@
if ((e.getClickCount() == 2) && (category != null)
&& category.equalsIgnoreCase("Unused Properties")) {
- ((VizMapperProperty) curProp).setEditable(true);
-
- VisualPropertyType type = (VisualPropertyType)
((VizMapperProperty) curProp) .getHiddenObject();
+
+ VisualPropertyType type = (VisualPropertyType)
((VizMapperProperty) curProp).getHiddenObject();
visualPropertySheetPanel.removeProperty(curProp);
final VizMapperProperty newProp = new
VizMapperProperty();
@@ -1155,8 +1154,7 @@
mapProp.setDisplayName("Mapping Type");
mapProp.setValue("Please select a mapping
type!");
- editorReg.registerEditor(mapProp,
mappingTypeEditor);
-
+
newProp.addSubProperty(mapProp);
mapProp.setParentProperty(newProp);
visualPropertySheetPanel.addProperty(0,
newProp);
@@ -1166,6 +1164,7 @@
visualPropertySheetPanel.getTable().scrollRectToVisible(new Rectangle(0, 0, 10,
10));
visualPropertySheetPanel.repaint();
+ editorReg.registerEditor(mapProp,
mappingTypeEditor);
return;
} else if ((e.getClickCount() == 1) && (category ==
null)) {
/*
@@ -1307,14 +1306,13 @@
attrName = firstMap.getControllingAttributeName();
- if (attrName == null) {
+ if (attrName == null)
calculatorTypeProp.setValue("Select Value");
- rendReg.registerRenderer(calculatorTypeProp,
CellRendererFactory.DEF_RENDERER);
- } else {
+ else
calculatorTypeProp.setValue(attrName);
- rendReg.registerRenderer(calculatorTypeProp,
CellRendererFactory.DEF_RENDERER);
- }
+ rendReg.registerRenderer(calculatorTypeProp,
CellRendererFactory.DEF_RENDERER);
+
mappingHeader.setDisplayName("Mapping Type");
mappingHeader.setHiddenObject(firstMap.getClass());
@@ -2133,6 +2131,9 @@
*
*/
private class NewStyleListener extends AbstractAction {
+
+ private static final long serialVersionUID =
-401235126133833279L;
+
public void actionPerformed(ActionEvent e) {
final String name = getStyleName(null);
--
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.
