svn commit: r1464356 - in /sis/branches/JDK6: CHANGES sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java

[desruisseaux]

Author: desruisseaux
Date: Thu Apr  4 08:43:30 2013
New Revision: 1464356

URL: http://svn.apache.org/r1464356
Log:
Merge the SIS-95 fix from trunk.

Modified:
    sis/branches/JDK6/CHANGES
    
sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java

Modified: sis/branches/JDK6/CHANGES
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK6/CHANGES?rev=1464356&r1=1464355&r2=1464356&view=diff
==============================================================================
--- sis/branches/JDK6/CHANGES (original)
+++ sis/branches/JDK6/CHANGES Thu Apr  4 08:43:30 2013
@@ -3,6 +3,9 @@ Apache SIS Change Log
 
 Release 0.3-incubating - Current Development
 
+* SIS-95: Explicitly specify Typed extends Object parameters 
+  in FallbackConverterTest (mattmann, desruisseaux)
+
 * SIS-77: Provide an IDE build for Eclipse (mattmann)
 
 * SIS-70: Make QuadTreeNode and associated classes package private

Modified: 
sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java?rev=1464356&r1=1464355&r2=1464356&view=diff
==============================================================================
--- 
sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
 [UTF-8] Thu Apr  4 08:43:30 2013
@@ -60,7 +60,7 @@ public final strictfp class FallbackConv
         final EnumSet<FunctionProperty> SURJECTIVE = 
EnumSet.of(FunctionProperty.SURJECTIVE);
         final EnumSet<FunctionProperty> INVERTIBLE = 
EnumSet.of(FunctionProperty.SURJECTIVE, FunctionProperty.INVERTIBLE);
 
-        ObjectConverter<String,?> c = new StringConverter.Short();
+        ObjectConverter<String,? extends Object> c = new 
StringConverter.Short();
         assertEquals(String.class, c.getSourceClass());
         assertEquals(Short.class,  c.getTargetClass());
         assertEquals(INVERTIBLE,   c.properties());