Author: kono
Date: 2011-11-21 15:33:16 -0800 (Mon, 21 Nov 2011)
New Revision: 27542
Modified:
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunction.java
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/mappings/AbstractVisualMappingFunction.java
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/AbstractVisualMappingFunctionTest.java
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializer.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/select/RowsSetViewUpdater.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/action/EditSelectedCellAction.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousTrackRenderer.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/DiscreteTrackRenderer.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/mappings/DiscreteMappingTest.java
Log:
Method names had been updated for consistency.
Modified:
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunction.java
===================================================================
---
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunction.java
2011-11-21 22:58:11 UTC (rev 27541)
+++
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunction.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -76,14 +76,14 @@
* @return name of attribute (a column name in data table) associated
with
* this mapping.
*/
- String getMappingAttributeName();
+ String getMappingColumnName();
/**
* Returns data type of mapping attribute.
*
* @return data type of controlling attribute.
*/
- Class<K> getMappingAttributeType();
+ Class<K> getMappingColumnType();
/**
Modified:
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/mappings/AbstractVisualMappingFunction.java
===================================================================
---
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/mappings/AbstractVisualMappingFunction.java
2011-11-21 22:58:11 UTC (rev 27541)
+++
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/mappings/AbstractVisualMappingFunction.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -42,12 +42,12 @@
this.table = table;
}
- @Override public String getMappingAttributeName() {
+ @Override public String getMappingColumnName() {
return attrName;
}
- @Override public Class<K> getMappingAttributeType() {
+ @Override public Class<K> getMappingColumnType() {
return attrType;
}
Modified:
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/AbstractVisualMappingFunctionTest.java
===================================================================
---
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/AbstractVisualMappingFunctionTest.java
2011-11-21 22:58:11 UTC (rev 27541)
+++
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/AbstractVisualMappingFunctionTest.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -34,8 +34,8 @@
assertNotNull(mapping);
- assertEquals(attrName, mapping.getMappingAttributeName());
- assertEquals(attrType, mapping.getMappingAttributeType());
+ assertEquals(attrName, mapping.getMappingColumnName());
+ assertEquals(attrType, mapping.getMappingColumnType());
assertEquals(vp, mapping.getVisualProperty());
}
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializer.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializer.java
2011-11-21 22:58:11 UTC (rev 27541)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializer.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -276,20 +276,20 @@
if (mapping instanceof PassthroughMapping<?,
?>) {
PassthroughMapping<K, V> pm =
(PassthroughMapping<K, V>) mapping;
- AttributeType attrType =
toAttributeType(pm.getMappingAttributeType());
+ AttributeType attrType =
toAttributeType(pm.getMappingColumnType());
org.cytoscape.io.internal.util.vizmap.model.PassthroughMapping pmModel = new
org.cytoscape.io.internal.util.vizmap.model.PassthroughMapping();
-
pmModel.setAttributeName(pm.getMappingAttributeName());
+
pmModel.setAttributeName(pm.getMappingColumnName());
pmModel.setAttributeType(attrType);
vpModel.setPassthroughMapping(pmModel);
} else if (mapping instanceof
DiscreteMapping<?, ?>) {
DiscreteMapping<K, V> dm =
(DiscreteMapping<K, V>) mapping;
- AttributeType attrType =
toAttributeType(dm.getMappingAttributeType());
+ AttributeType attrType =
toAttributeType(dm.getMappingColumnType());
org.cytoscape.io.internal.util.vizmap.model.DiscreteMapping dmModel = new
org.cytoscape.io.internal.util.vizmap.model.DiscreteMapping();
-
dmModel.setAttributeName(dm.getMappingAttributeName());
+
dmModel.setAttributeName(dm.getMappingColumnName());
dmModel.setAttributeType(attrType);
Map<K, V> map = dm.getAll();
@@ -306,10 +306,10 @@
} else if (mapping instanceof
ContinuousMapping<?, ?>) {
ContinuousMapping<K, V> cm =
(ContinuousMapping<K, V>) mapping;
- AttributeType attrType =
toAttributeType(cm.getMappingAttributeType());
+ AttributeType attrType =
toAttributeType(cm.getMappingColumnType());
org.cytoscape.io.internal.util.vizmap.model.ContinuousMapping cmModel = new
org.cytoscape.io.internal.util.vizmap.model.ContinuousMapping();
-
cmModel.setAttributeName(cm.getMappingAttributeName());
+
cmModel.setAttributeName(cm.getMappingColumnName());
cmModel.setAttributeType(attrType);
List<ContinuousMappingPoint<K, V>>
points = cm.getAllPoints();
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/select/RowsSetViewUpdater.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/select/RowsSetViewUpdater.java
2011-11-21 22:58:11 UTC (rev 27541)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/select/RowsSetViewUpdater.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -108,7 +108,7 @@
while (it.hasNext()){
VisualMappingFunction<?,?> f = it.next();
- if
(f.getMappingAttributeName().equalsIgnoreCase(columnName)){
+ if
(f.getMappingColumnName().equalsIgnoreCase(columnName)){
vp = f.getVisualProperty();
break;
}
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-11-21 22:58:11 UTC (rev 27541)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -120,7 +120,7 @@
topProperty.setDisplayName(vp.getDisplayName());
topProperty.setInternalValue(factory);
- final String attrName = visualMapping.getMappingAttributeName();
+ final String attrName = visualMapping.getMappingColumnName();
final VizMapperProperty<String, VisualMappingFunctionFactory,
VisualMappingFunction<K, V>> mappingHeader = new VizMapperProperty<String,
VisualMappingFunctionFactory, VisualMappingFunction<K, V>>(
CellType.MAPPING_TYPE, "Mapping Type",
VisualMappingFunctionFactory.class);
@@ -323,7 +323,7 @@
// In that case "controllerType=-2" means that the
attribute type is
// List, but we don't know the
// type of the list items.
- if (mapping.getMappingAttributeType() == String.class
&& !(key instanceof String))
+ if (mapping.getMappingColumnType() == String.class &&
!(key instanceof String))
val = discMapping.get(key.toString());
else
val = discMapping.get(key);
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/EditSelectedCellAction.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/EditSelectedCellAction.java
2011-11-21 22:58:11 UTC (rev 27541)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/EditSelectedCellAction.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -113,7 +113,7 @@
if (newValue == null)
return;
- final Class<?> keyClass =dm.getMappingAttributeType();
+ final Class<?> keyClass =dm.getMappingColumnType();
for (int i = 0; i < selected.length; i++) {
final Item currentItem = ((Item)
propertySheetPanel.getTable().getValueAt(selected[i], 0));
// First, update property sheet
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2011-11-21 22:58:11 UTC (rev 27541)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -130,7 +130,7 @@
this.style = style;
this.mainPanel = new JPanel();
- final String controllingAttrName =
mapping.getMappingAttributeName();
+ final String controllingAttrName =
mapping.getMappingColumnName();
final Class<?> attrType =
attr.getColumn(controllingAttrName).getType();
logger.debug("Selected attr type is " + attrType);
@@ -410,7 +410,7 @@
if (tracer.getRange(type) == 0) {
Double maxValue = Double.NEGATIVE_INFINITY;
Double minValue = Double.POSITIVE_INFINITY;
- final List<K> valueList =
dataTable.getColumn(mapping.getMappingAttributeName()).getValues(this.dataType);
+ final List<K> valueList =
dataTable.getColumn(mapping.getMappingColumnName()).getValues(this.dataType);
for (K val : valueList) {
if (val.doubleValue() > maxValue)
maxValue = val.doubleValue();
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousTrackRenderer.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousTrackRenderer.java
2011-11-21 22:58:11 UTC (rev 27541)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousTrackRenderer.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -156,7 +156,7 @@
this.style = style;
cMapping = mapping;
- title = cMapping.getMappingAttributeName();
+ title = cMapping.getMappingColumnName();
Float val;
//TODO: where should I put this property value?
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/DiscreteTrackRenderer.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/DiscreteTrackRenderer.java
2011-11-21 22:58:11 UTC (rev 27541)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/DiscreteTrackRenderer.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -134,7 +134,7 @@
for (V value : values)
iconMap.put(value, engine.createIcon(vp, value,
ICON_SIZE, ICON_SIZE));
- this.title = mapping.getMappingAttributeName();
+ this.title = mapping.getMappingColumnName();
this.setBackground(BACKGROUND_COLOR);
this.setMinimumSize(MIN_SIZE);
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2011-11-21 22:58:11 UTC (rev 27541)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -295,7 +295,7 @@
CyGradientTrackRenderer gRend = new CyGradientTrackRenderer(
(VisualProperty<Color>) type, (Color) below,
(Color) above,
- mapping.getMappingAttributeName(), tracer);
+ mapping.getMappingColumnName(), tracer);
slider.setThumbRenderer(thumbRend);
slider.setTrackRenderer(gRend);
@@ -318,7 +318,7 @@
final CyGradientTrackRenderer gRend = new
CyGradientTrackRenderer(
(VisualProperty<Color>) type, below,
above,
- mapping.getMappingAttributeName(),
tracer);
+ mapping.getMappingColumnName(), tracer);
slider.setTrackRenderer(gRend);
repaint();
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
2011-11-21 22:58:11 UTC (rev 27541)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -494,7 +494,7 @@
}
// If same, do nothing.
- if (ctrAttrName.equals(mapping.getMappingAttributeName())) {
+ if (ctrAttrName.equals(mapping.getMappingColumnName())) {
logger.debug("Same controlling attr. Do nothing for: "
+ ctrAttrName);
return;
@@ -507,8 +507,8 @@
dataType, attrForTest, vp);
currentStyle.addVisualMappingFunction(newMapping);
logger.debug("Changed to new Map from "
- + mapping.getMappingAttributeName() + "
to "
- + newMapping.getMappingAttributeName());
+ + mapping.getMappingColumnName() + " to
"
+ + newMapping.getMappingColumnName());
} else if (mapping instanceof ContinuousMapping) {
if ((dataType == Double.class) || (dataType ==
Integer.class)) {
// Do nothing
@@ -528,8 +528,8 @@
dataType, attrForTest, vp);
currentStyle.addVisualMappingFunction(newMapping);
logger.debug("Changed to new Map from "
- + mapping.getMappingAttributeName() + "
to "
- + newMapping.getMappingAttributeName());
+ + mapping.getMappingColumnName() + " to
"
+ + newMapping.getMappingColumnName());
// final String curMappingName = mapping.toString() +
"-" +
// mapping.getMappingAttributeName();
// final String newMappingName = mapping.toString() +
"-" +
@@ -556,7 +556,7 @@
// Create new one.
logger.debug("Creating new prop sheet objects for "
- + newMapping.getMappingAttributeName() + ", "
+ + newMapping.getMappingColumnName() + ", "
+ vp.getDisplayName());
final VisualProperty<Visualizable> category =
util.getCategory((Class<? extends CyTableEntry>) vp.getTargetDataType());
@@ -617,7 +617,7 @@
logger.debug("New VisualMappingFunction Created: Mapping Type =
"
+
style.getVisualMappingFunction(vp).toString());
logger.debug("New VisualMappingFunction Created: Controlling
attr = "
- +
style.getVisualMappingFunction(vp).getMappingAttributeName());
+ +
style.getVisualMappingFunction(vp).getMappingColumnName());
// First, remove current property
Property parent = prop.getParentProperty();
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
2011-11-21 22:58:11 UTC (rev 27541)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -52,7 +52,7 @@
Collection<VisualMappingFunction<?, ?>> allMapping =
original.getAllVisualMappingFunctions();
for (VisualMappingFunction<?, ?> mapping : allMapping) {
- String attrName = mapping.getMappingAttributeName();
+ String attrName = mapping.getMappingColumnName();
VisualProperty<?> vp = mapping.getVisualProperty();
// TODO: clone mappings
Modified:
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/mappings/DiscreteMappingTest.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/mappings/DiscreteMappingTest.java
2011-11-21 22:58:11 UTC (rev 27541)
+++
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/mappings/DiscreteMappingTest.java
2011-11-21 23:33:16 UTC (rev 27542)
@@ -39,8 +39,8 @@
final String attrName = "sample attr 1";
final DiscreteMapping<String, Paint> mapping =
createDiscreteMapping(attrName);
- assertEquals(attrName, mapping.getMappingAttributeName());
- assertEquals(String.class, mapping.getMappingAttributeType());
+ assertEquals(attrName, mapping.getMappingColumnName());
+ assertEquals(String.class, mapping.getMappingColumnType());
assertEquals(MinimalVisualLexicon.NODE_FILL_COLOR,
mapping.getVisualProperty());
mapping.putMapValue("r", Color.RED);
--
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.
