Author: kono
Date: 2009-08-11 20:16:27 -0700 (Tue, 11 Aug 2009)
New Revision: 17785
Modified:
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
Log:
Generics parameter boundary condition had been changed.
Modified:
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
===================================================================
---
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
2009-08-12 03:13:54 UTC (rev 17784)
+++
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
2009-08-12 03:16:27 UTC (rev 17785)
@@ -181,8 +181,6 @@
String attrName, Class<K> attrType, VisualProperty<V>
vp) {
-
- // TODO Auto-generated method stub
return null;
}
}
Modified:
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
===================================================================
---
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2009-08-12 03:13:54 UTC (rev 17784)
+++
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2009-08-12 03:16:27 UTC (rev 17785)
@@ -146,7 +146,7 @@
* @return DOCUMENT ME!
*/
@SuppressWarnings("unchecked")
- public <V> V getDefaultValue(final VisualProperty<V> vp) {
+ public <V> V getDefaultValue(final VisualProperty<? extends V> vp) {
// Since setter checks type, this cast is always legal.
return (V) perVSDefaults.get(vp);
}
@@ -158,7 +158,7 @@
* @param vp DOCUMENT ME!
* @param value DOCUMENT ME!
*/
- public <T> void setDefaultValue(final VisualProperty<T> vp, final T
value) {
+ public <T> void setDefaultValue(final VisualProperty<? extends T> vp,
final T value) {
perVSDefaults.put(vp, value);
System.out.print("!!!!! Setting Default: " +
vp.getDisplayName() + " = " + value);
System.out.println("-----> Setting New Default: " +
perVSDefaults.get(vp));
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
