svn commit: r1140139 - in /incubator/jena/Jena2/ARQ/trunk: src-test/org/openjena/atlas/iterator/TS_Iterator.java src-test/org/openjena/atlas/iterator/TestIteratorSlotted.java src/org/openjena/atlas/iterator/IteratorSlotted.java

[an...@apache.org]

Author: andy
Date: Mon Jun 27 12:30:28 2011
New Revision: 1140139

URL: http://svn.apache.org/viewvc?rev=1140139&view=rev
Log:
Move up code in common library

Added:
    incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/atlas/iterator/TestIteratorSlotted.java
      - copied, changed from r1140034, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestIteratorSlotted.java
    incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/iterator/IteratorSlotted.java
      - copied, changed from r1140034, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/IteratorSlotted.java
Modified:
    incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/atlas/iterator/TS_Iterator.java

Modified: incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/atlas/iterator/TS_Iterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/atlas/iterator/TS_Iterator.java?rev=1140139&r1=1140138&r2=1140139&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/atlas/iterator/TS_Iterator.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/atlas/iterator/TS_Iterator.java Mon Jun 27 12:30:28 2011
@@ -1,5 +1,6 @@
 /*
  * (c) Copyright 2008, 2009 Hewlett-Packard Development Company, LP
+ * (c) Copyright 2011 Epimorphics Ltd.
  * All rights reserved.
  * [See end of file]
  */
@@ -17,6 +18,7 @@ import org.junit.runners.Suite ;
     , TestIteratorPushback.class
     , TestIteratorWithHistory.class
     , TestIteratorWithBuffer.class
+    , TestIteratorSlotted.class
 } )
 
 public class TS_Iterator
@@ -26,6 +28,7 @@ public class TS_Iterator
 
 /*
  * (c) Copyright 2008, 2009 Hewlett-Packard Development Company, LP
+ * (c) Copyright 2011 Epimorphics Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Copied: incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/atlas/iterator/TestIteratorSlotted.java (from r1140034, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestIteratorSlotted.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/atlas/iterator/TestIteratorSlotted.java?p2=incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/atlas/iterator/TestIteratorSlotted.java&p1=incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestIteratorSlotted.java&r1=1140034&r2=1140139&rev=1140139&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestIteratorSlotted.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-test/org/openjena/atlas/iterator/TestIteratorSlotted.java Mon Jun 27 12:30:28 2011
@@ -4,13 +4,14 @@
  * [See end of file]
  */
 
-package tx;
+package org.openjena.atlas.iterator;
 
 import java.util.Arrays ;
 import java.util.Iterator ;
 import java.util.List ;
 
 import org.junit.Test ;
+import org.openjena.atlas.iterator.IteratorSlotted ;
 import org.openjena.atlas.junit.BaseTest ;
 
 public class TestIteratorSlotted extends BaseTest

Copied: incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/iterator/IteratorSlotted.java (from r1140034, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/IteratorSlotted.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/iterator/IteratorSlotted.java?p2=incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/iterator/IteratorSlotted.java&p1=incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/IteratorSlotted.java&r1=1140034&r2=1140139&rev=1140139&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/IteratorSlotted.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/iterator/IteratorSlotted.java Mon Jun 27 12:30:28 2011
@@ -4,7 +4,7 @@
  * [See end of file]
  */
 
-package tx;
+package org.openjena.atlas.iterator;
 
 import java.util.Iterator ;
 import java.util.NoSuchElementException ;
@@ -38,7 +38,7 @@ public abstract class IteratorSlotted<T>
     protected boolean isFinished() { return finished ; }
 
     /** final - subclasses implement hasNextBinding() */
-    @Override
+    //@Override
     public final boolean hasNext()
     {
         if ( finished )
@@ -59,7 +59,7 @@ public abstract class IteratorSlotted<T>
     }
     
     /** final - autoclose and registration relies on it - implement moveToNextBinding() */
-    @Override
+    //@Override
     public final T next()
     {
         if ( ! hasNext() ) throw new NoSuchElementException(Utils.className(this)) ;
@@ -84,7 +84,7 @@ public abstract class IteratorSlotted<T>
         return slot ;
     }
     
-    @Override
+    //@Override
     public final void remove()
     {
         throw new UnsupportedOperationException(Utils.className(this)+".remove") ;