sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1518344 - in /sis/branches/JDK7: CHANGES core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
Date Wed, 28 Aug 2013 19:55:50 GMT
Author: desruisseaux
Date: Wed Aug 28 19:55:50 2013
New Revision: 1518344

URL: http://svn.apache.org/r1518344
Log:
Ported from the JDK6 branch the workaround for Eclipse compiler,
since experience shows that Eclipse still insists for redundancy
on JDK7 too despite what the Java specification saids.

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

Modified: sis/branches/JDK7/CHANGES
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/CHANGES?rev=1518344&r1=1518343&r2=1518344&view=diff
==============================================================================
--- sis/branches/JDK7/CHANGES (original)
+++ sis/branches/JDK7/CHANGES Wed Aug 28 19:55:50 2013
@@ -13,6 +13,9 @@ Release 0.3 - 06/29/2013
 * SIS-31 Website needs a facelift (aestrada, Ross Laidlaw,
   Suresh Marru, mattmann)
 
+* 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/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java?rev=1518344&r1=1518343&r2=1518344&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
[UTF-8] Wed Aug 28 19:55:50 2013
@@ -60,7 +60,8 @@ 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();
+        // The "extends Object" part is unnecessary according Java specification, but Eclipse
compiler insists for it.
+        ObjectConverter<String, ? extends Object> c = new StringConverter.Short();
         assertEquals(String.class, c.getSourceClass());
         assertEquals(Short.class,  c.getTargetClass());
         assertEquals(INVERTIBLE,   c.properties());



Mime
View raw message