Author: kono
Date: 2011-06-17 18:10:34 -0700 (Fri, 17 Jun 2011)
New Revision: 25802
Added:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/NumberContinuousCellRenderer.java
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetMouseAdapter.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperProperty.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ContinuousMappingCellRenderer.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValuePropertyEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
Log:
Icon generator related bugs had been fixed.
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2011-06-18 01:09:56 UTC (rev 25801)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2011-06-18 01:10:34 UTC (rev 25802)
@@ -208,15 +208,15 @@
logger.debug("==========>>>>>> Setting Continuous:" +
vpEditor);
- final VizMapperProperty<String, String,
VisualMappingFunction<K, V>> graphicalView =
- new VizMapperProperty<String, String,
VisualMappingFunction<K, V>>(CellType.CONTINUOUS,
AbstractVizMapperPanel.GRAPHICAL_MAP_VIEW, String.class);
+ final VizMapperProperty<String, VisualMappingFunction,
VisualMappingFunction<K, V>> graphicalView =
+ new VizMapperProperty<String,
VisualMappingFunction, VisualMappingFunction<K, V>>(CellType.CONTINUOUS,
AbstractVizMapperPanel.GRAPHICAL_MAP_VIEW, visualMapping.getClass());
graphicalView.setValue(visualMapping);
graphicalView.setDisplayName(AbstractVizMapperPanel.GRAPHICAL_MAP_VIEW);
graphicalView.setParentProperty(topProperty);
topProperty.addSubProperty(graphicalView);
final TableCellRenderer continuousRenderer =
vpEditor.getContinuousTableCellRenderer();
-
+ logger.debug("@@@@@@@@@@@@@ Continuous renderer:" +
continuousRenderer);
//FIXME
final PropertySheetTable table =
propertySheetPanel.getTable();
final PropertyRendererRegistry rendReg =
(PropertyRendererRegistry) table.getRendererFactory();
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2011-06-18 01:09:56 UTC (rev 25801)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2011-06-18 01:10:34 UTC (rev 25802)
@@ -30,7 +30,6 @@
import org.cytoscape.view.vizmap.gui.internal.event.CellType;
import org.cytoscape.view.vizmap.gui.internal.theme.ColorManager;
import org.cytoscape.view.vizmap.gui.internal.util.VizMapperUtil;
-import org.cytoscape.view.vizmap.mappings.ContinuousMapping;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,8 +46,7 @@
*/
public class VizMapPropertySheetBuilder {
- private static final Logger logger = LoggerFactory
- .getLogger(VizMapPropertySheetBuilder.class);
+ private static final Logger logger =
LoggerFactory.getLogger(VizMapPropertySheetBuilder.class);
private PropertySheetPanel propertySheetPanel;
@@ -90,9 +88,7 @@
this.editorManager = editorManager;
propertyMap = new HashMap<VisualStyle, List<Property>>();
-
- vizMapPropertyBuilder = new
VizMapPropertyBuilder(cyNetworkManager,
- editorManager, tableMgr);
+ vizMapPropertyBuilder = new
VizMapPropertyBuilder(cyNetworkManager, editorManager, tableMgr);
}
@@ -108,18 +104,13 @@
// Remove all.
for (Property item : propertySheetPanel.getProperties())
propertySheetPanel.removeProperty(item);
-
- /*
- * Add properties to the property sheet.
- */
+
final List<Property> propRecord =
getPropertyListFromVisualStyle(style);
// Save it for later use.
propertyMap.put(style, propRecord);
- /*
- * Finally, build unused list
- */
+ // Create unused prop section.
setUnused(propRecord, style);
}
@@ -337,44 +328,18 @@
public void updateTableView() {
logger.debug("Table update called:");
final PropertySheetTable table = propertySheetPanel.getTable();
- VizMapperProperty<?, ?, ?> shownProp = null;
final DefaultTableCellRenderer empRenderer = new
DefaultTableCellRenderer();
// Number of rows shown now.
int rowCount = table.getRowCount();
for (int i = 0; i < rowCount; i++) {
- shownProp = (VizMapperProperty<?, ?, ?>) ((Item)
table.getValueAt(i, 0)).getProperty();
+
+ final VizMapperProperty<?, ?, ?> shownProp =
(VizMapperProperty<?, ?, ?>) ((Item) table.getValueAt(i, 0)).getProperty();
if(shownProp == null)
continue;
-
-// if ((shownProp != null)) {
-////
-//// if(shownProp.getParentProperty() != null &&
-////
shownProp.getParentProperty().getDisplayName().equals()) {
-//// // This is label position cell. Need laeger
cell.
-//// table.setRowHeight(i, 50);
-// } else if ((shownProp != null)
- if(shownProp.getCellType().equals(CellType.CONTINUOUS))
{
-
- logger.debug("Continuous found: " +
shownProp.getDisplayName());
+ if(shownProp.getCellType().equals(CellType.CONTINUOUS))
{
table.setRowHeight(i, 80);
-
-
- // FIXME!!
-
-// ContinuousMapping<?> mapping =
(ContinuousMapping<?>)
-// type;
-//
-//
-// int wi = table.getCellRect(0, 1,
true).width;
-// final TableCellRenderer cRenderer =
-//
editorManager.getVisualPropertyEditor(vp)
-//
.getContinuousCellRenderer((VisualProperty) type,
-// wi, 70);
-// rendReg.registerRenderer(shownProp,
cRenderer);
-
-
} else if ((shownProp.getCategory() != null)
&& shownProp.getCategory().equals(
AbstractVizMapperPanel.CATEGORY_UNUSED)) {
@@ -405,7 +370,6 @@
if (item.isVisible() == false) {
item.toggle();
}
-
return;
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetMouseAdapter.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetMouseAdapter.java
2011-06-18 01:09:56 UTC (rev 25801)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetMouseAdapter.java
2011-06-18 01:10:34 UTC (rev 25802)
@@ -116,17 +116,9 @@
}
- /**
- * DOCUMENT ME!
- *
- * @param e
- * DOCUMENT ME!
- */
+
@Override public void mouseClicked(MouseEvent e) {
- logger.debug("====================> VizMapper GUI got mouse
event: Click = " + e.getClickCount());
-
-
int selected = propertySheetPanel.getTable().getSelectedRow();
/*
* Adjust height if it's an legend icon.
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperProperty.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperProperty.java
2011-06-18 01:09:56 UTC (rev 25801)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperProperty.java
2011-06-18 01:10:34 UTC (rev 25802)
@@ -11,7 +11,7 @@
* Refactored for 3 to keep more information.
*
*/
-public final class VizMapperProperty<K, V, T> extends DefaultProperty {
+public class VizMapperProperty<K, V, T> extends DefaultProperty {
private final static long serialVersionUID = 1202339868680341L;
@@ -21,7 +21,7 @@
private T internalValue;
- public VizMapperProperty(final CellType cellType, final K key, final
Class<V> valueType) {
+ public <S extends V> VizMapperProperty(final CellType cellType, final K
key, final Class<S> valueType) {
super();
if(key == null)
@@ -55,10 +55,9 @@
super.setValue(original.getValue());
this.internalValue = original.getInternalValue();
-
-
}
+
/**
* Make name immutable.
*/
@@ -70,17 +69,6 @@
return key.toString();
}
-// @Override public void setValue(Object value) {
-// if(value == null)
-// super.setValue(null);
-//
-// final Class<?> valClass = value.getClass();
-// if(true )
-// super.setValue(value);
-// else
-// throw new IllegalArgumentException("Cannot not set
value: " + value.getClass() +". Type should be " + this.getType());
-//
-// }
public void setInternalValue(final T internalValue) {
this.internalValue = internalValue;
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ContinuousMappingCellRenderer.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ContinuousMappingCellRenderer.java
2011-06-18 01:09:56 UTC (rev 25801)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ContinuousMappingCellRenderer.java
2011-06-18 01:10:34 UTC (rev 25802)
@@ -7,19 +7,25 @@
import
org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.AbstractContinuousMappingEditor;
import org.cytoscape.view.vizmap.mappings.ContinuousMapping;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.l2fprod.common.swing.renderer.DefaultCellRenderer;
/**
- * Cell renderer for Continuous Color mapping
+ * Cell renderer for continuous mappings
*
*/
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)
throw new NullPointerException("Editor object is
null.");
@@ -35,7 +41,9 @@
this.setText("Unkonown Mapping");
return this;
}
-
+
+ logger.debug("!!!!!!!!! CM cell renderer called: " +
value.toString());
+
if (isSelected) {
setBackground(table.getSelectionBackground());
setForeground(table.getSelectionForeground());
@@ -51,5 +59,4 @@
return this;
}
-
}
Added:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/NumberContinuousCellRenderer.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/NumberContinuousCellRenderer.java
(rev 0)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/NumberContinuousCellRenderer.java
2011-06-18 01:10:34 UTC (rev 25802)
@@ -0,0 +1,58 @@
+package org.cytoscape.view.vizmap.gui.internal.cellrenderer;
+
+import java.awt.Component;
+
+import javax.swing.ImageIcon;
+import javax.swing.JTable;
+
+import
org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.AbstractContinuousMappingEditor;
+import org.cytoscape.view.vizmap.mappings.ContinuousMapping;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2fprod.common.swing.renderer.DefaultCellRenderer;
+
+public class NumberContinuousCellRenderer extends DefaultCellRenderer {
+
+ private static final long serialVersionUID = -6734053848878359286L;
+
+ private static final Logger logger =
LoggerFactory.getLogger(NumberContinuousCellRenderer.class);
+
+
+ private final AbstractContinuousMappingEditor<?, ?> editor;
+
+
+ public NumberContinuousCellRenderer(final
AbstractContinuousMappingEditor<?, ?> editor) {
+ 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) {
+ this.setText("Unkonown Mapping");
+ return this;
+ }
+
+ logger.debug("!!!!!!!!! Number cell renderer called: " +
value.toString());
+
+ if (isSelected) {
+ setBackground(table.getSelectionBackground());
+ setForeground(table.getSelectionForeground());
+ } else {
+ 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);
+ this.setIcon(icon);
+
+ return this;
+ }
+}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
2011-06-18 01:09:56 UTC (rev 25801)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
2011-06-18 01:10:34 UTC (rev 25802)
@@ -64,9 +64,9 @@
final SelectedVisualStyleManager selectedManager, final
EditorManager editorManager, final VisualMappingManager vmm) {
super(type, new CyColorPropertyEditor());
- discreteTableCellRenderer = REG.getRenderer(Color.class);
+ this.discreteTableCellRenderer = REG.getRenderer(Color.class);
- continuousEditor = new GradientEditor(manager, appManager,
selectedManager, editorManager, vmm);
- continuousTableCellRenderer = new
ContinuousMappingCellRenderer((AbstractContinuousMappingEditor<?, ?>)
continuousEditor);
+ this.continuousEditor = new GradientEditor(manager, appManager,
selectedManager, editorManager, vmm);
+ this.continuousTableCellRenderer = new
ContinuousMappingCellRenderer((AbstractContinuousMappingEditor<?, ?>)
continuousEditor);
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValuePropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValuePropertyEditor.java
2011-06-18 01:09:56 UTC (rev 25801)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValuePropertyEditor.java
2011-06-18 01:10:34 UTC (rev 25802)
@@ -28,10 +28,9 @@
discreteTableCellRenderer = REG.getRenderer(type);
-
CyComboBoxPropertyEditor cbe = (CyComboBoxPropertyEditor)
propertyEditor;
cbe.setAvailableValues(values.toArray());
- continuousEditor = new C2DEditor<T>(manager, appManager,
selectedManager, editorManager, vmm);
- continuousTableCellRenderer = new
ContinuousMappingCellRenderer((AbstractContinuousMappingEditor<?, ?>)
continuousEditor);
+ this.continuousEditor = new C2DEditor<T>(manager, appManager,
selectedManager, editorManager, vmm);
+ this.continuousTableCellRenderer = new
ContinuousMappingCellRenderer((AbstractContinuousMappingEditor<?, ?>)
continuousEditor);
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2011-06-18 01:09:56 UTC (rev 25801)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2011-06-18 01:10:34 UTC (rev 25802)
@@ -45,7 +45,6 @@
import java.util.Set;
import javax.swing.JOptionPane;
-import javax.swing.table.TableCellRenderer;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
@@ -158,14 +157,7 @@
this.valueEditors.put(ve.getType(), ve);
}
- /*
- * (non-Javadoc)
- *
- * @see
org.cytoscape.application.swing.vizmap.gui.editors.EditorFactory#
- * removeEditorDisplayer(
- * org.cytoscape.application.swing.vizmap.gui.editors.EditorDisplayer,
- * java.util.Map)
- */
+
public void removeValueEditor(ValueEditor<?> valueEditor,
@SuppressWarnings("rawtypes") Map properties) {
logger.debug("************* Removing Value Editor
****************");
valueEditors.remove(valueEditor.getType());
@@ -251,42 +243,7 @@
return ret;
}
- /*
- * (non-Javadoc)
- *
- * @see
org.cytoscape.application.swing.vizmap.gui.editors.EditorFactory#
- * getContinuousCellEditor
- * (org.cytoscape.application.swing.viewmodel.VisualProperty)
- */
- public PropertyEditor getContinuousCellEditor(VisualProperty type) {
- return null;
- // return findEditor(type,
- // EditorDisplayer.MappingType.VisualPropertyEditor)
- // .getVisualPropertyEditor();
- }
- /*
- * (non-Javadoc)
- *
- * @see
- *
- * org.cytoscape.application.swing.vizmap.gui.editors.EditorFactory#
- * getContinuousCellRenderer
- * (org.cytoscape.application.swing.viewmodel.VisualProperty, int, int)
- */
- public TableCellRenderer getContinuousCellRenderer(VisualProperty type,
int w, int h) {
- return null;
- // return findEditor(type,
- // EditorDisplayer.MappingType.VisualPropertyEditor)
- // .getCellRenderer(type, w, h);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
org.cytoscape.application.swing.vizmap.gui.editors.EditorFactory#
- * getDefaultComboBoxEditor (java.lang.String)
- */
public PropertyEditor getDefaultComboBoxEditor(String editorName) {
PropertyEditor editor = comboBoxEditors.get(editorName);
if (editor == null) {
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
2011-06-18 01:09:56 UTC (rev 25801)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
2011-06-18 01:10:34 UTC (rev 25802)
@@ -39,7 +39,7 @@
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
-import
org.cytoscape.view.vizmap.gui.internal.cellrenderer.ContinuousMappingCellRenderer;
+import
org.cytoscape.view.vizmap.gui.internal.cellrenderer.NumberContinuousCellRenderer;
import
org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.AbstractContinuousMappingEditor;
import org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.C2CEditor;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyNumberPropertyEditor;
@@ -56,7 +56,7 @@
discreteTableCellRenderer = REG.getRenderer(type);
continuousEditor = new C2CEditor(manager, appManager,
selectedManager, editorManager, vmm);
- continuousTableCellRenderer = new
ContinuousMappingCellRenderer((AbstractContinuousMappingEditor<?, ?>)
continuousEditor);;
+ continuousTableCellRenderer = new
NumberContinuousCellRenderer((AbstractContinuousMappingEditor<?, ?>)
continuousEditor);;
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2011-06-18 01:09:56 UTC (rev 25801)
+++
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2011-06-18 01:10:34 UTC (rev 25802)
@@ -132,7 +132,7 @@
<constructor-arg ref="stringClass" />
</bean>
- <!-- VP Editors -->
+ <!-- Visual Property Editors -->
<bean id="colorPropertyEditor"
class="org.cytoscape.view.vizmap.gui.internal.editor.ColorVisualPropertyEditor">
<constructor-arg ref="paintClass" />
--
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.
