Author: kono
Date: 2012-01-19 15:08:42 -0800 (Thu, 19 Jan 2012)
New Revision: 28060
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
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/VizMapperProperty.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ContinuousMappingCellRenderer.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/NumberContinuousCellRenderer.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
Log:
fixes #613 Assigned correct ID for Continuous Mapping Property Cell.
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2012-01-19 23:02:48 UTC (rev 28059)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2012-01-19 23:08:42 UTC (rev 28060)
@@ -86,7 +86,6 @@
// Visual Properties which are not used in mapping now.
public static final String CATEGORY_UNUSED = "Unused Properties";
- // TODO remove this
public static final String GRAPHICAL_MAP_VIEW = "Graphical View";
protected final SelectedVisualStyleManager manager;
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-01-19 23:02:48 UTC (rev 28059)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2012-01-19 23:08:42 UTC (rev 28060)
@@ -100,8 +100,6 @@
final VisualMappingFunction<K, V> visualMapping, final
String categoryName,
final PropertySheetPanel propertySheetPanel, final
VisualMappingFunctionFactory factory) {
- logger.debug("\n\n\n************************* buildProp called:
Root VP = " + categoryName);
-
// Mapping is empty
if (visualMapping == null)
throw new NullPointerException("Mapping is null.");
@@ -208,19 +206,21 @@
setDiscreteProps(vp, visualMapping, attrSet, vpEditor,
topProperty, propertySheetPanel);
} else if (visualMapping instanceof ContinuousMapping &&
(attrName != null)) {
-
- logger.debug("==========>>>>>> Setting Continuous:" +
vpEditor);
final VizMapperProperty<String, VisualMappingFunction,
VisualMappingFunction<K, V>> graphicalView =
- new VizMapperProperty<String,
VisualMappingFunction, VisualMappingFunction<K, V>>(CellType.CONTINUOUS,
AbstractVizMapperPanel.GRAPHICAL_MAP_VIEW, visualMapping.getClass());
+ new VizMapperProperty<String,
VisualMappingFunction, VisualMappingFunction<K, V>>(
+ CellType.CONTINUOUS,
visualMapping.getVisualProperty().getDisplayName()+ "_" +
AbstractVizMapperPanel.GRAPHICAL_MAP_VIEW, visualMapping.getClass());
+
+ graphicalView.setShortDescription("Continuous Mapping
from " + visualMapping.getMappingColumnName()
+ + " to " +
visualMapping.getVisualProperty().getDisplayName());
graphicalView.setValue(visualMapping);
-
graphicalView.setDisplayName(AbstractVizMapperPanel.GRAPHICAL_MAP_VIEW);
+ graphicalView.setDisplayName("Current Mapping");
graphicalView.setParentProperty(topProperty);
topProperty.addSubProperty(graphicalView);
+ // Renderer for Continuous mapping icon cell
final TableCellRenderer continuousRenderer =
vpEditor.getContinuousTableCellRenderer();
- //FIXME
final PropertySheetTable table =
propertySheetPanel.getTable();
final PropertyRendererRegistry rendReg =
(PropertyRendererRegistry) table.getRendererFactory();
rendReg.registerRenderer(graphicalView,
continuousRenderer);
@@ -229,7 +229,9 @@
final PropertyEditor continuousCellEditor =
editorManager.getVisualPropertyEditor(vp)
.getContinuousMappingEditor();
- if (continuousCellEditor != null)
+ if (continuousCellEditor == null)
+ throw new NullPointerException("Continuous
Mapping cell editor is null.");
+ else
cellEditorFactory.registerEditor(graphicalView,
continuousCellEditor);
} else if (visualMapping instanceof PassthroughMapping &&
(attrName != null)) {
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperProperty.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperProperty.java
2012-01-19 23:02:48 UTC (rev 28059)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperProperty.java
2012-01-19 23:08:42 UTC (rev 28060)
@@ -34,6 +34,7 @@
this.cellType = cellType;
this.key = key;
+ // In fact, this should be a unique ID of this property.
super.setName(key.toString());
super.setType(valueType);
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ContinuousMappingCellRenderer.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ContinuousMappingCellRenderer.java
2012-01-19 23:02:48 UTC (rev 28059)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ContinuousMappingCellRenderer.java
2012-01-19 23:08:42 UTC (rev 28060)
@@ -19,31 +19,29 @@
public class ContinuousMappingCellRenderer extends DefaultCellRenderer {
private static final long serialVersionUID = -6734053848878359286L;
-
+
private static final Logger logger =
LoggerFactory.getLogger(ContinuousMappingCellRenderer.class);
-
private final AbstractContinuousMappingEditor<?, ?> editor;
-
public ContinuousMappingCellRenderer(final
AbstractContinuousMappingEditor<?, ?> editor) {
- if(editor == null)
+ if (editor == null)
throw new NullPointerException("Editor object is
null.");
-
+
this.editor = editor;
}
-
-
- @Override public Component getTableCellRendererComponent(JTable table,
Object value,
- boolean isSelected, boolean hasFocus, int row, int
column) {
-
- if(value == null || value instanceof ContinuousMapping ==
false) {
+
+ @Override
+ public Component getTableCellRendererComponent(JTable table, Object
value, boolean isSelected, boolean hasFocus,
+ int row, int column) {
+
+ if (value == null || value instanceof ContinuousMapping ==
false) {
this.setText("Unkonown Mapping");
return this;
}
-
- logger.debug("!!!!!!!!! CM cell renderer called: " +
value.toString());
-
+
+ logger.debug("Continuous Mapping cell renderer called: " +
value.getClass().toString());
+
if (isSelected) {
setBackground(table.getSelectionBackground());
setForeground(table.getSelectionForeground());
@@ -51,10 +49,10 @@
setBackground(table.getBackground());
setForeground(table.getForeground());
}
-
+
final int height = table.getRowHeight(row);
final int width =
table.getColumnModel().getColumn(column).getWidth();
- final ImageIcon icon = editor.drawIcon(width, height-2, false);
+ final ImageIcon icon = editor.drawIcon(width, height - 2,
false);
this.setIcon(icon);
return this;
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/NumberContinuousCellRenderer.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/NumberContinuousCellRenderer.java
2012-01-19 23:02:48 UTC (rev 28059)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/NumberContinuousCellRenderer.java
2012-01-19 23:08:42 UTC (rev 28060)
@@ -38,7 +38,7 @@
return this;
}
- logger.debug("!!!!!!!!! Number cell renderer called: " +
value.toString());
+ logger.debug("Number cell renderer called: " +
value.toString());
if (isSelected) {
setBackground(table.getSelectionBackground());
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
2012-01-19 23:02:48 UTC (rev 28059)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
2012-01-19 23:08:42 UTC (rev 28060)
@@ -34,7 +34,6 @@
*/
package org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor;
-import java.awt.Color;
import java.awt.event.ActionEvent;
import java.beans.PropertyChangeEvent;
--
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.
