svn commit: r1604201 - in /jena/trunk/jena-arq/src: main/java/org/apache/jena/atlas/iterator/ main/java/org/apache/jena/atlas/lib/ test/java/com/hp/hpl/jena/sparql/graph/

[an...@apache.org]

Author: andy
Date: Fri Jun 20 16:09:48 2014
New Revision: 1604201

URL: http://svn.apache.org/r1604201
Log:
Java7/8 clean up

Modified:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java?rev=1604201&r1=1604200&r2=1604201&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java Fri Jun 20 16:09:48 2014
@@ -105,7 +105,8 @@ public class Iter<T> implements Iterable
      * exceptions. This materializes the input iterator.
      */
     public static <T> Iterator<T> iterator(Iterator<? extends T> iterator) {
-        return Iter.toList(iterator).iterator() ;
+        List<T> x = Iter.toList(iterator) ;
+        return x.iterator() ;
     }
 
     public interface Folder<X, Y> {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java?rev=1604201&r1=1604200&r2=1604201&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java Fri Jun 20 16:09:48 2014
@@ -48,7 +48,7 @@ public abstract class MultiMap<K, V>
         return c.iterator().next() ;
     }
     
-    public void putAll(K key, V ... values)
+    public void putAll(K key, @SuppressWarnings("unchecked") V ... values)
     {
         for ( V v : values)
             put(key, v) ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java?rev=1604201&r1=1604200&r2=1604201&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java Fri Jun 20 16:09:48 2014
@@ -30,7 +30,7 @@ import org.apache.jena.atlas.iterator.Tr
 public class Tuple<T> implements Iterable<T> {
     // Interface this?
     // Classes: TupleImpl, TupleSlice
-    public static <X> Tuple<X> createTuple(/* @SuppressWarnings("unchecked") */X... elements) {
+    public static <X> Tuple<X> createTuple(@SuppressWarnings("unchecked") X... elements) {
         X[] els = elements ; // ArrayUtils.copy(elements) ;
         return create(els) ;
     }
@@ -70,7 +70,7 @@ public class Tuple<T> implements Iterabl
 
     protected final T[] tuple ;
 
-    protected Tuple(/* @SuppressWarnings("unchecked") */ T... tuple) {
+    protected Tuple(T... tuple) {
         this.tuple = tuple ;
     }
 

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java?rev=1604201&r1=1604200&r2=1604201&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java Fri Jun 20 16:09:48 2014
@@ -115,7 +115,7 @@ public class TestGraphUnionRead extends 
         assertEquals(2, x) ;
     }
 
-    static <T> List<T> list(/* Java 7 @SuppressWarnings("unchecked")*/ T...x)
+    static <T> List<T> list(@SuppressWarnings("unchecked") T...x)
     {
         // Warning: "Potential heap pollution via varargs parameter x"
         // Presumably because x is passed into a method.