Author: kono
Date: 2012-08-02 10:53:45 -0700 (Thu, 02 Aug 2012)
New Revision: 30070
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
Log:
Code cleanup only.
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-08-02 14:26:05 UTC (rev 30069)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2012-08-02 17:53:45 UTC (rev 30070)
@@ -48,8 +48,6 @@
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyRow;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
@@ -177,26 +175,25 @@
// Discrete Mapping
// This set should not contain null!
final SortedSet<Object> attrSet = new TreeSet<Object>();
-
-
+
for (CyNetwork net : graphObjectSet.keySet()) {
if (vp.getTargetDataType() == CyNetwork.class) {
final CyRow row = net.getRow(net);
final CyColumn column =
row.getTable().getColumn(attrName);
- if(column != null)
+ if (column != null)
processDiscretValues(row,
attrName, column, column.getType(), attrSet);
} else {
// Assule all data sets are same data
type.
final Set<CyIdentifiable> graphObjects
= graphObjectSet.get(net);
- if(graphObjects.isEmpty())
+ if (graphObjects.isEmpty())
continue;
-
+
CyIdentifiable firstEntry =
graphObjects.iterator().next();
final CyRow firstRow =
net.getRow(firstEntry);
final CyColumn column =
firstRow.getTable().getColumn(attrName);
- if(column == null)
+ if (column == null)
continue;
-
+
final Class<?> type = column.getType();
for (final CyIdentifiable go :
graphObjects) {
final CyRow row =
net.getRow(go);
@@ -204,8 +201,6 @@
}
}
}
-
-
// FIXME
setDiscreteProps(vp, visualMapping, attrSet, vpEditor,
topProperty, propertySheetPanel);
@@ -248,10 +243,10 @@
return topProperty;
}
-
- private void processDiscretValues(final CyRow row, final String
columnName, final CyColumn column, final Class<?> attrClass,
- final SortedSet<Object> attrSet) {
+ private void processDiscretValues(final CyRow row, final String
columnName, final CyColumn column,
+ final Class<?> attrClass, final SortedSet<Object>
attrSet) {
+
if (column.getListElementType() != null) {
// Expand list contents as a flat list.
final List<?> list = row.getList(columnName,
column.getListElementType());
@@ -262,14 +257,11 @@
}
}
} else {
- Object id = row.get(columnName, attrClass);
-
+ final Object id = row.get(columnName, attrClass);
if (id != null) {
- //System.out.println(id + ": id is " +
id.getClass() + ", col type is " + attrClass);
-
- if (id.getClass() != attrClass && id instanceof
Number)
+ if (id.getClass() != attrClass && id instanceof
Number) {
attrSet.add(NumberConverter.convert(attrClass, (Number) id));
- else {
+ } else {
try {
attrSet.add(id);
} catch (Exception e) {
@@ -303,7 +295,7 @@
for (Object key : attrSet) {
- valProp = new VizMapperProperty<K, V,
VisualMappingFunction<K, V>>(CellType.DISCRETE, (K)key, mapping
+ valProp = new VizMapperProperty<K, V,
VisualMappingFunction<K, V>>(CellType.DISCRETE, (K) key, mapping
.getVisualProperty().getRange().getType());
strVal = key.toString();
valProp.setDisplayName(strVal);
--
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.
