Author: kono
Date: 2011-09-14 13:46:48 -0700 (Wed, 14 Sep 2011)
New Revision: 26798
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/VizMapperMainPanel.java
Log:
Confirmed no null value to be set as a entry in the Discrete Properties.
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
2011-09-14 19:25:20 UTC (rev 26797)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2011-09-14 20:46:48 UTC (rev 26798)
@@ -64,7 +64,6 @@
import com.l2fprod.common.propertysheet.DefaultProperty;
import com.l2fprod.common.propertysheet.PropertyEditorRegistry;
-import com.l2fprod.common.propertysheet.PropertyRendererFactory;
import com.l2fprod.common.propertysheet.PropertyRendererRegistry;
import com.l2fprod.common.propertysheet.PropertySheetPanel;
import com.l2fprod.common.propertysheet.PropertySheetTable;
@@ -73,6 +72,7 @@
* Create property for the Property Sheet object.
*/
public class VizMapPropertyBuilder {
+
private static final Logger logger =
LoggerFactory.getLogger(VizMapPropertyBuilder.class);
private DefaultTableCellRenderer emptyBoxRenderer;
@@ -171,10 +171,11 @@
}
final VisualPropertyEditor<V> vpEditor =
editorManager.getVisualPropertyEditor(vp);
- logger.debug("==========>>>>>> Setting vpEditor:" + vpEditor);
if (visualMapping instanceof DiscreteMapping && (attrName !=
null)) {
// Discrete Mapping
+
+ // This set should not contain null!
final SortedSet<K> attrSet = new TreeSet<K>();
for (CyTableEntry go : graphObjectSet) {
@@ -194,8 +195,7 @@
}
}
} else {
- Object id = row.get(attrName,
attrClass);
-
+ final Object id =
row.get(attrName, attrClass);
if (id != null)
attrSet.add((K) id);
}
@@ -217,7 +217,7 @@
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/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2011-09-14 19:25:20 UTC (rev 26797)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2011-09-14 20:46:48 UTC (rev 26798)
@@ -340,25 +340,9 @@
// mappingTypes.toArray());
}
-
/**
- * Loads the Key Set. private Set<Object> loadKeySet(final Map
mapAttrs) {
- * final Set<Object> mappedKeys = new TreeSet<Object>();
*
- * final Iterator keyIter = mapAttrs.values().iterator();
- *
- * Object o = null;
- *
- * while (keyIter.hasNext()) { o = keyIter.next();
- *
- * if (o instanceof List) { List list = (List) o;
- *
- * for (int i = 0; i < list.size(); i++) { Object vo = list.get(i);
- *
- * if (!mappedKeys.contains(vo)) mappedKeys.add(vo); } } else { if
- * (!mappedKeys.contains(o)) mappedKeys.add(o); } }
- *
- * return mappedKeys; }
+ * @param defImage
*/
public void setDefaultViewImagePanel(final Image defImage) {
if (defImage == 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.
