Author: abeld
Date: 2009-03-12 04:17:55 -0700 (Thu, 12 Mar 2009)
New Revision: 16228
Modified:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ViewColumn.java
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewColumn.java
Log:
in viewmodel: small fix in generics-usage
hopefully this fixes the following compile-breaking error:
(in MappingCalculator implementations)
setValues(java.util.Map<org.cytoscape.view.model.View<?>,T>,java.util.List<org.cytoscape.view.model.View<?>>)
in org.cytoscape.view.model.ViewColumn<T> cannot be applied to
(java.util.Map<org.cytoscape.view.model.View<V>,T>,java.util.List<org.cytoscape.view.model.View<V>>)
Modified:
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ViewColumn.java
===================================================================
---
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ViewColumn.java
2009-03-12 10:45:31 UTC (rev 16227)
+++
core3/viewmodel-api/trunk/src/main/java/org/cytoscape/view/model/ViewColumn.java
2009-03-12 11:17:55 UTC (rev 16228)
@@ -30,7 +30,7 @@
/**
* Bulk method for setting many values at once. This fires only a
single event and is thus much more efficient.
*/
- public void setValues(Map<View<?>, T> values, List<View<?>> toClear);
+ public void setValues(Map<? extends View<?>, T> values, List<? extends
View<?>> toClear);
/**
* Remove the value stored for the given view.
Modified:
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewColumn.java
===================================================================
---
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewColumn.java
2009-03-12 10:45:31 UTC (rev 16227)
+++
core3/viewmodel-impl/trunk/src/main/java/org/cytoscape/view/model/internal/ColumnOrientedViewColumn.java
2009-03-12 11:17:55 UTC (rev 16228)
@@ -78,8 +78,8 @@
/**
* Bulk method for setting many values at once. This fires only a
single event and is thus much more efficient.
*/
- public void setValues(Map<View<?>, T> values, List<View<?>> toClear) {
- for (Map.Entry<View<?>, T> entry : values.entrySet()){
+ public void setValues(Map<? extends View<?>, T> values, List<? extends
View<?>> toClear) {
+ for (Map.Entry<? extends View<?>, T> entry : values.entrySet()){
internal_setValue(entry.getKey(), entry.getValue());
}
for (View<?>v: toClear){
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
