Merge pull request #1674 from mbenson/MODE-2732

Mode 2732 eclipse soothing

Author: blafond

modeshape-jcr-api/src/main/java/org/modeshape/jcr/api/Session.java

@@ -34,7 +34,6 @@
  * A specialization of the standard JCR {@link javax.jcr.Session} interface that returns the ModeShape-specific extension
  * interfaces from {@link #getWorkspace()}, {@link #getRepository()}, and {@link #getValueFactory()}.
  */
-@SuppressWarnings("deprectation")
 public interface Session extends javax.jcr.Session {
 
     @Override

modeshape-jcr/src/main/java/org/modeshape/jcr/JcrNodeTypeIterator.java

@@ -30,7 +30,7 @@ final class JcrNodeTypeIterator implements NodeTypeIterator {
 
     private int size;
     private int position;
-    private Iterator<NodeType> iterator;
+    private Iterator<? extends NodeType> iterator;
 
     JcrNodeTypeIterator( Collection<? extends NodeType> values ) {
         this.iterator = Collections.unmodifiableCollection(values).iterator();
@@ -69,8 +69,7 @@ public boolean hasNext() {
 
     @Override
     public Object next() {
-        position++;
-        return iterator.next();
+        return nextNodeType();
     }
 
     @Override