You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/09/29 22:30:46 UTC
svn commit: r1391868 - in /jena/trunk/jena-core/src:
main/java/com/hp/hpl/jena/util/ main/java/com/hp/hpl/jena/util/cache/
main/java/com/hp/hpl/jena/util/iterator/
main/java/com/hp/hpl/jena/util/tuple/ test/java/com/hp/hpl/jena/n3/
Author: andy
Date: Sat Sep 29 20:30:44 2012
New Revision: 1391868
URL: http://svn.apache.org/viewvc?rev=1391868&view=rev
Log:
Tidy up in c.h.h.jena.util
1/ Move code only used in some tests in the test area
2/ Fix some comments.
3/ Remove wrong @version and some not-applicable @author
Added:
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TupleItem.java
- copied, changed from r1388565, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/tuple/TupleItem.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TupleSet.java
- copied, changed from r1388565, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/tuple/TupleSet.java
Removed:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/tuple/TupleItem.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/tuple/TupleSet.java
Modified:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/CharEncoding.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/CollectionFactory.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocationMapper.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Locator.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorFile.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorURL.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorZip.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/MonitorGraph.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/MonitorModel.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/OneToManyMap.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/PrintUtil.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/ResourceUtils.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/SystemUtils.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Tokenizer.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/URIref.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/Cache.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/CacheControl.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/CacheManager.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/RandCache.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ArrayIterator.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ClosableIterator.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ConcatenatedIterator.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/EarlyBindingIterator.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/LateBindingIterator.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/LazyIterator.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/Map1.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/Map1Iterator.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/RandomOrderIterator.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/SingletonIterator.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/UniqueExtendedIterator.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/N3ExternalTestsCom.java
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/CharEncoding.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/CharEncoding.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/CharEncoding.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/CharEncoding.java Sat Sep 29 20:30:44 2012
@@ -25,9 +25,6 @@ import java.util.*;
* This class provides a number of static methods which interact with
* java.nio.charset.Charset to analyze and transform the strings identifing
* character encodings.
- *
- * @author Jeremy J. Carroll
- *
*/
abstract public class CharEncoding {
static Set<String> macEncodings = new HashSet<String>() ;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/CollectionFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/CollectionFactory.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/CollectionFactory.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/CollectionFactory.java Sat Sep 29 20:30:44 2012
@@ -23,8 +23,6 @@ import java.util.*;
/**
CollectionFactory - a central place for allocating sets and maps, mostly so that
it's easy to plug in new implementations (eg trove).
-
- @author kers
*/
public class CollectionFactory
{
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java Sat Sep 29 20:30:44 2012
@@ -64,10 +64,6 @@ import com.hp.hpl.jena.shared.*;
*
* @see LocationMapper
* @see FileUtils
- *
- *
- * @author Andy Seaborne
- * @version $Id: FileManager.java,v 1.3 2010-03-08 13:23:13 andy_seaborne Exp $
*/
public class FileManager
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocationMapper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocationMapper.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocationMapper.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocationMapper.java Sat Sep 29 20:30:44 2012
@@ -41,9 +41,6 @@ import com.hp.hpl.jena.shared.JenaExcept
* There is a default LocationMapper which is used by the global @link{FileManager}.
*
* @see FileManager
- *
- * @author Andy Seaborne
- * @version $Id: LocationMapper.java,v 1.1 2009-06-29 08:55:47 castagna Exp $
*/
public class LocationMapper
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Locator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Locator.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Locator.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Locator.java Sat Sep 29 20:30:44 2012
@@ -21,15 +21,10 @@ package com.hp.hpl.jena.util;
/**
* Interface to things that open streams by some string reference
- *
- * @author Andy Seaborne
- * @version $Id: Locator.java,v 1.1 2009-06-29 08:55:47 castagna Exp $
*/
public interface Locator
{
public TypedStream open(String filenameOrURI) ;
- // Too expensive for LocatorURL - just try to open the thing!
- //public boolean exists(String filenameOrURI) ;
public String getName() ;
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorFile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorFile.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorFile.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorFile.java Sat Sep 29 20:30:44 2012
@@ -30,9 +30,6 @@ import org.slf4j.LoggerFactory;
/** Location files in the filing system.
* A FileLocator can have a "current directory" - this is separate from any
* location mapping (see @link{LocationMapping}) as it applies only to files.
- *
- * @author Andy Seaborne
- * @version $Id: LocatorFile.java,v 1.1 2009-06-29 08:55:47 castagna Exp $
*/
public class LocatorFile implements Locator
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorURL.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorURL.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorURL.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorURL.java Sat Sep 29 20:30:44 2012
@@ -29,9 +29,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** Location files named by a URL
- *
- * @author Andy Seaborne
- * @version $Id: LocatorURL.java,v 1.1 2009-06-29 08:55:47 castagna Exp $
*/
public class LocatorURL implements Locator
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorZip.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorZip.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorZip.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorZip.java Sat Sep 29 20:30:44 2012
@@ -28,11 +28,7 @@ import org.slf4j.LoggerFactory;
import com.hp.hpl.jena.shared.JenaException;
-/** Location files in a zip file
- *
- * @author Andy Seaborne
- * @version $Id: LocatorZip.java,v 1.1 2009-06-29 08:55:47 castagna Exp $
- */
+/** Location files in a zip file */
class LocatorZip implements Locator
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/MonitorGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/MonitorGraph.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/MonitorGraph.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/MonitorGraph.java Sat Sep 29 20:30:44 2012
@@ -31,7 +31,6 @@ import com.hp.hpl.jena.graph.impl.*;
* fire change notification.
*
* @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $
*/
public class MonitorGraph extends WrappedGraph {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/MonitorModel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/MonitorModel.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/MonitorModel.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/MonitorModel.java Sat Sep 29 20:30:44 2012
@@ -33,7 +33,6 @@ import com.hp.hpl.jena.rdf.model.impl.Mo
* fire change notification.
*
* @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $
*/
public class MonitorModel extends ModelCom {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/OneToManyMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/OneToManyMap.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/OneToManyMap.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/OneToManyMap.java Sat Sep 29 20:30:44 2012
@@ -32,7 +32,6 @@ import com.hp.hpl.jena.util.iterator.Nul
* may be zero, one or many values corresponding to a given key.
*
* @author Ian Dickinson, HP Labs (<a href="mailto:Ian.Dickinson@hp.com">email</a>)
- * @version CVS info: $Id: OneToManyMap.java,v 1.2 2009-08-08 11:25:18 andy_seaborne Exp $
*/
public class OneToManyMap<From, To> implements Map<From, To>
{
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/PrintUtil.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/PrintUtil.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/PrintUtil.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/PrintUtil.java Sat Sep 29 20:30:44 2012
@@ -36,7 +36,6 @@ import com.hp.hpl.jena.shared.PrefixMapp
* specialised tables.
*
* @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:47 $
*/
public class PrintUtil {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/ResourceUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/ResourceUtils.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/ResourceUtils.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/ResourceUtils.java Sat Sep 29 20:30:44 2012
@@ -43,7 +43,6 @@ import com.hp.hpl.jena.util.iterator.Ext
*
* @author Ian Dickinson, HP Labs
* (<a href="mailto:ian_dickinson@users.sourceforge.net" >email</a>)
- * @version CVS $Id: ResourceUtils.java,v 1.6 2011-03-23 14:28:24 chris-dollin Exp $
*/
public class ResourceUtils {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/SystemUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/SystemUtils.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/SystemUtils.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/SystemUtils.java Sat Sep 29 20:30:44 2012
@@ -25,8 +25,6 @@ import org.slf4j.LoggerFactory ;
/**
* Note: this has been copied here from ARQ.
- *
- * @author Andy Seaborne
*/
public class SystemUtils
{
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Tokenizer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Tokenizer.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Tokenizer.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/Tokenizer.java Sat Sep 29 20:30:44 2012
@@ -25,7 +25,6 @@ import java.util.NoSuchElementException;
* character strings which can include other separators.
*
* @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:47 $
*/
public class Tokenizer {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/URIref.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/URIref.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/URIref.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/URIref.java Sat Sep 29 20:30:44 2012
@@ -30,7 +30,6 @@ package com.hp.hpl.jena.util;
* in accordance with http://www.w3.org/TR/charmod/#sec-URIs .
* The details of how the algorithms handle '%' are captured in
* http://lists.w3.org/Archives/Public/uri/2001Sep/0009.html
- * @author jjc
*/
public class URIref extends Object {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/Cache.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/Cache.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/Cache.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/Cache.java Sat Sep 29 20:30:44 2012
@@ -32,8 +32,6 @@ package com.hp.hpl.jena.util.cache;
* <p>An object is associated with a key which is used to
* identify the object on retrieval. Only one object may be
* associated with a key.</p>
- *
- * @author bwm
*/
public interface Cache extends CacheControl {
/** Get and object from the cache, if it is there.
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/CacheControl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/CacheControl.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/CacheControl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/CacheControl.java Sat Sep 29 20:30:44 2012
@@ -35,9 +35,6 @@ package com.hp.hpl.jena.util.cache;
* variables counting the statistics, in which case, the
* fields counting gets hits and puts are reduced
* proportionately.</p>
- *
- * @author bwm
- * @version $Version$
*/
public interface CacheControl {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/CacheManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/CacheManager.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/CacheManager.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/CacheManager.java Sat Sep 29 20:30:44 2012
@@ -19,8 +19,6 @@
package com.hp.hpl.jena.util.cache;
/** A factory for creating cache objects
- *
- * @author bwm
*/
public class CacheManager {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/RandCache.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/RandCache.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/RandCache.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/cache/RandCache.java Sat Sep 29 20:30:44 2012
@@ -25,10 +25,6 @@ import java.util.Iterator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- * @author bwm
- */
public class RandCache implements Cache, CacheControl {
int size;
int threshhold;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ArrayIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ArrayIterator.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ArrayIterator.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ArrayIterator.java Sat Sep 29 20:30:44 2012
@@ -22,10 +22,7 @@ import java.util.Iterator;
import java.lang.reflect.Array;
import java.util.NoSuchElementException ;
-/** An Iterator for arrays.
- * @author Jeremy Carroll
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.1 $' Date='$Date: 2009-06-29 08:55:49 $'
- */
+/** An Iterator for arrays */
public class ArrayIterator<T> implements Iterator<T> {
private int i;
private T[] a;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ClosableIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ClosableIterator.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ClosableIterator.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ClosableIterator.java Sat Sep 29 20:30:44 2012
@@ -34,9 +34,6 @@ import java.util.Iterator;
was never the contract applied internally.]
<p>
Implementors are encouraged to dispose of resources as soon as is convenient.
-
- @author bwm
- @version $Id: ClosableIterator.java,v 1.2 2009-09-28 13:47:59 chris-dollin Exp $
*/
public interface ClosableIterator<T> extends Iterator<T>
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ConcatenatedIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ConcatenatedIterator.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ConcatenatedIterator.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/ConcatenatedIterator.java Sat Sep 29 20:30:44 2012
@@ -31,7 +31,6 @@ import java.util.*;
* followed by the elements of the second.
*
* @author Ian Dickinson, HP Labs (<a href="mailto:ian_dickinson@users.sourceforge.net">email</a>)
- * @version CVS info: $Id: ConcatenatedIterator.java,v 1.2 2009-10-06 13:04:44 ian_dickinson Exp $
*/
public class ConcatenatedIterator<T> implements Iterator<T>
{
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/EarlyBindingIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/EarlyBindingIterator.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/EarlyBindingIterator.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/EarlyBindingIterator.java Sat Sep 29 20:30:44 2012
@@ -20,10 +20,7 @@ package com.hp.hpl.jena.util.iterator;
import java.util.*;
/**
- *
* Fully execute the iterator immediately, but pretend we haven't.
- * @author jjc
- *
*/
public class EarlyBindingIterator<T> extends WrappedIterator<T> {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java Sat Sep 29 20:30:44 2012
@@ -24,8 +24,6 @@ import java.util.NoSuchElementException;
/** Given an Iterator that returns Iterator's, this creates an
* Iterator over the next level values.
* Similar to list splicing in lisp.
- * @author jjc
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.1 $' Date='$Date: 2009-06-29 08:55:49 $'
*/
public class IteratorIterator<T> implements Iterator<T>
{
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/LateBindingIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/LateBindingIterator.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/LateBindingIterator.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/LateBindingIterator.java Sat Sep 29 20:30:44 2012
@@ -26,8 +26,6 @@ import java.util.Iterator ;
* This allows an Iterator to be passed to some other
* code, while delaying the evaluation of what actually
* is going to be iterated over.
- * @author jjc
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.1 $' Date='$Date: 2009-06-29 08:55:49 $'
*/
abstract public class LateBindingIterator<T> implements Iterator<T> {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/LazyIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/LazyIterator.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/LazyIterator.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/LazyIterator.java Sat Sep 29 20:30:44 2012
@@ -26,8 +26,6 @@ package com.hp.hpl.jena.util.iterator;
* The sequence to be defined is defined by the subclass's definition
* of create(). That is called exactly once on the first attempt
* to interact with the LazyIterator.
- * @author jjc, modified to use ExtendedIterators by csayers
- * @version $Revision: 1.1 $
*/
abstract public class LazyIterator<T> implements ExtendedIterator<T> {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/Map1.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/Map1.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/Map1.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/Map1.java Sat Sep 29 20:30:44 2012
@@ -19,8 +19,6 @@
package com.hp.hpl.jena.util.iterator;
/** Converts an Object to another Object.
- * @author jjc
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.1 $' Date='$Date: 2009-06-29 08:55:49 $'
*/
public interface Map1<From, To>
{ /** Convert an object.
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/Map1Iterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/Map1Iterator.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/Map1Iterator.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/Map1Iterator.java Sat Sep 29 20:30:44 2012
@@ -24,7 +24,6 @@ import java.util.Iterator;
An iterator that consumes an underlying iterator and maps its results before
delivering them; supports remove if the underlying iterator does.
@author jjc + kers
- @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.2 $' Date='$Date: 2009-09-28 13:27:30 $'
*/
public class Map1Iterator<From, To> extends NiceIterator<To> implements ClosableIterator<To>
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/RandomOrderIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/RandomOrderIterator.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/RandomOrderIterator.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/RandomOrderIterator.java Sat Sep 29 20:30:44 2012
@@ -20,11 +20,7 @@ package com.hp.hpl.jena.util.iterator;
import java.util.*;
/**
- *
* RandomOrderIterator - Reorders the elements returned by an Iterator.
- *
- * @author jjc
- *
*/
public class RandomOrderIterator<T> extends WrappedIterator<T> {
private Random rnd = new Random();
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/SingletonIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/SingletonIterator.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/SingletonIterator.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/SingletonIterator.java Sat Sep 29 20:30:44 2012
@@ -22,7 +22,6 @@ package com.hp.hpl.jena.util.iterator;
* A ClosableIterator that contains only one element
*
* @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:49 $
*/
public class SingletonIterator<T> extends NiceIterator<T> implements ExtendedIterator<T> {
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/UniqueExtendedIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/UniqueExtendedIterator.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/UniqueExtendedIterator.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/iterator/UniqueExtendedIterator.java Sat Sep 29 20:30:44 2012
@@ -27,7 +27,6 @@ import java.util.*;
* to be returned by the iterator.
*
* @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.2 $ on $Date: 2009-08-08 11:25:31 $
*/
public class UniqueExtendedIterator<T> extends WrappedIterator<T> {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/N3ExternalTestsCom.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/N3ExternalTestsCom.java?rev=1391868&r1=1391867&r2=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/N3ExternalTestsCom.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/N3ExternalTestsCom.java Sat Sep 29 20:30:44 2012
@@ -19,12 +19,12 @@
package com.hp.hpl.jena.n3;
import java.io.* ;
-import java.util.* ;
-import junit.framework.* ;
+import java.util.List ;
-import com.hp.hpl.jena.shared.*;
-import com.hp.hpl.jena.util.tuple.* ;
-import com.hp.hpl.jena.util.FileUtils;
+import junit.framework.TestSuite ;
+
+import com.hp.hpl.jena.shared.JenaException ;
+import com.hp.hpl.jena.util.FileUtils ;
/**
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TupleItem.java (from r1388565, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/tuple/TupleItem.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TupleItem.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TupleItem.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/tuple/TupleItem.java&r1=1388565&r2=1391868&rev=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/tuple/TupleItem.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TupleItem.java Sat Sep 29 20:30:44 2012
@@ -16,15 +16,13 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.util.tuple;
+package com.hp.hpl.jena.n3;
/**
* The unit found in a line of a tuple.
* Can be a string (quoted, possibly with the datatype, or unquoted) or a URI.
- * @author Andy Seaborne
- * @version $Id: TupleItem.java,v 1.1 2009-06-29 08:55:52 castagna Exp $
*/
-public class TupleItem
+class TupleItem
{
public static final int URI = 0 ;
public static final int STRING = 1 ;
Copied: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TupleSet.java (from r1388565, jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/tuple/TupleSet.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TupleSet.java?p2=jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TupleSet.java&p1=jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/tuple/TupleSet.java&r1=1388565&r2=1391868&rev=1391868&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/tuple/TupleSet.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TupleSet.java Sat Sep 29 20:30:44 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.util.tuple ;
+package com.hp.hpl.jena.n3 ;
import java.io.* ;
import java.util.* ;
@@ -24,12 +24,7 @@ import java.util.* ;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * @author Andy Seaborne
- * @version $Id: TupleSet.java,v 1.1 2009-06-29 08:55:52 castagna Exp $
- */
-
-public class TupleSet implements Iterator<List<TupleItem>>
+class TupleSet implements Iterator<List<TupleItem>>
{
BufferedReader in ;
public String line = null ;