JDK1.7対応

[jovsonz/Jovsonz.git] / src / main / java / jp / sourceforge / jovsonz / UnmodIterator.java

diff --git a/src/main/java/jp/sourceforge/jovsonz/UnmodIterator.java b/src/main/java/jp/sourceforge/jovsonz/UnmodIterator.java
index 2d42f95..db27e1c 100644 (file)
--- a/src/main/java/jp/sourceforge/jovsonz/UnmodIterator.java
+++ b/src/main/java/jp/sourceforge/jovsonz/UnmodIterator.java
@@ -41,7 +41,7 @@ public class UnmodIterator<E> implements Iterator<E> {
     public static <E> Iterator<E> wrapUnmod(Iterator<E> iterator)
             throws NullPointerException{
         if(iterator == null) throw new NullPointerException();
     public static <E> Iterator<E> wrapUnmod(Iterator<E> iterator)
             throws NullPointerException{
         if(iterator == null) throw new NullPointerException();

-        return new UnmodIterator<E>(iterator);
+        return new UnmodIterator<>(iterator);

     }
 
     /**
     }
 
     /**


@@ -56,9 +56,10 @@ public class UnmodIterator<E> implements Iterator<E> {
         if(iterable == null) throw new NullPointerException();
         final Iterable<E> innerArg = iterable;
         return new Iterable<E>(){
         if(iterable == null) throw new NullPointerException();
         final Iterable<E> innerArg = iterable;
         return new Iterable<E>(){

+            @Override

             public Iterator<E> iterator(){
                 Iterator<E> iterator = innerArg.iterator();
             public Iterator<E> iterator(){
                 Iterator<E> iterator = innerArg.iterator();

-                return new UnmodIterator<E>(iterator);
+                return new UnmodIterator<>(iterator);

             }
         };
     }
             }
         };
     }


@@ -74,7 +75,7 @@ public class UnmodIterator<E> implements Iterator<E> {
             throws NullPointerException{
         if(iterable == null) throw new NullPointerException();
         Iterator<E> iterator = iterable.iterator();
             throws NullPointerException{
         if(iterable == null) throw new NullPointerException();
         Iterator<E> iterator = iterable.iterator();

-        return new UnmodIterator<E>(iterator);
+        return new UnmodIterator<>(iterator);

     }
 
     /**
     }
 
     /**