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 2014/06/27 15:20:03 UTC

svn commit: r1606090 [4/4] - in /jena/trunk/jena-core/src: main/java/com/hp/hpl/jena/graph/ main/java/com/hp/hpl/jena/mem/ main/java/com/hp/hpl/jena/n3/ main/java/com/hp/hpl/jena/ontology/ main/java/com/hp/hpl/jena/ontology/impl/ main/java/com/hp/hpl/j...

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVectorMultiSet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVectorMultiSet.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVectorMultiSet.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVectorMultiSet.java Fri Jun 27 13:20:01 2014
@@ -138,7 +138,6 @@ public class BindingVectorMultiSet {
 	 * with env
 	 * 
 	 * @param env
-	 * @return
 	 */
 	public Iterator<BindingVector> getSubSet(BindingVector env) {
 		Map<BindingVector, Count> rawSubSet = getRawSubSet(env);

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/FRuleEngine.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/FRuleEngine.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/FRuleEngine.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/FRuleEngine.java Fri Jun 27 13:20:01 2014
@@ -256,7 +256,7 @@ public class FRuleEngine implements FRul
      * Compile a list of rules into the internal rule store representation.
      * @param rules the list of Rule objects
      * @param ignoreBrules set to true if rules written in backward notation should be ignored
-     * @return an object that can be installed into the engine using setRuleStore.
+     * @returns an object that can be installed into the engine using setRuleStore.
      */
     public void compile(List<Rule> rules, boolean ignoreBrules) {
         clauseIndex = new OneToManyMap<>();

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/GenericTripleMatchFrame.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/GenericTripleMatchFrame.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/GenericTripleMatchFrame.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/GenericTripleMatchFrame.java Fri Jun 27 13:20:01 2014
@@ -98,7 +98,7 @@ public class GenericTripleMatchFrame ext
     /**
      * Initialize the triple match to preserve the current context of the given
      * LPInterpreter and search for the match defined by the current argument registers
-     * @param intepreter the interpreter instance whose env, trail and arg values are to be preserved
+     * @param interpreter the interpreter instance whose env, trail and arg values are to be preserved
      */
     @Override
     public void init(LPInterpreter interpreter) {

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBindingEnvironment.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBindingEnvironment.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBindingEnvironment.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBindingEnvironment.java Fri Jun 27 13:20:01 2014
@@ -73,8 +73,7 @@ public class LPBindingEnvironment implem
     /**
      * Instantiate a triple pattern against the current environment.
      * This version handles unbound varibles by turning them into bNodes.
-     * @param clause the triple pattern to match
-     * @param env the current binding environment
+     * @param pattern the triple pattern to match
      * @return a new, instantiated triple
      */
     @Override

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPInterpreter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPInterpreter.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPInterpreter.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPInterpreter.java Fri Jun 27 13:20:01 2014
@@ -181,9 +181,6 @@ public class LPInterpreter {
     /**
      * Return the next result from this engine, no further initialization.
      * Should be called from within an appropriately synchronized block.
-     * @param context the generator choice point or top level iterator which 
-     * is requesting this result and might have preserved state to restore
-     * @return either a StateFlag or  a result Triple
      */
     public Object next() {
         boolean traceOn = engine.isTraceOn();

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEQueue.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEQueue.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEQueue.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEQueue.java Fri Jun 27 13:20:01 2014
@@ -47,7 +47,7 @@ public class RETEQueue implements RETESi
 	 * Constructor. The queue is not usable until it has been bound to a sibling
 	 * and a continuation node.
 	 * 
-	 * @param A
+	 * @param matchIndices
 	 *            set of variable indices which should match between the two
 	 *            inputs
 	 */
@@ -60,7 +60,7 @@ public class RETEQueue implements RETESi
 	 * Constructor. The queue is not usable until it has been bound to a sibling
 	 * and a continuation node.
 	 * 
-	 * @param A
+	 * @param matchIndexList
 	 *            List of variable indices which should match between the two
 	 *            inputs
 	 */

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETETerminal.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETETerminal.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETETerminal.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETETerminal.java Fri Jun 27 13:20:01 2014
@@ -83,7 +83,7 @@ public class RETETerminal implements RET
     /**
      * Clone this node in the network.
      * @param netCopy a map from RETENode to cloned instance
-     * @param context the new context to which the network is being ported
+     * @param contextIn the new context to which the network is being ported
      */
     
     @Override

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/TopLevelTripleMatchFrame.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/TopLevelTripleMatchFrame.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/TopLevelTripleMatchFrame.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/TopLevelTripleMatchFrame.java Fri Jun 27 13:20:01 2014
@@ -38,7 +38,7 @@ public class TopLevelTripleMatchFrame ex
      * Constructor.
      * Initialize the triple match to preserve the current context of the given
      * LPInterpreter and search for the match defined by the current argument registers
-     * @param intepreter the interpreter instance whose env, trail and arg values are to be preserved
+     * @param interpreter the interpreter instance whose env, trail and arg values are to be preserved
      */
     public TopLevelTripleMatchFrame(LPInterpreter interpreter, TriplePattern goal) {
         init(interpreter);

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/TripleMatchFrame.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/TripleMatchFrame.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/TripleMatchFrame.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/TripleMatchFrame.java Fri Jun 27 13:20:01 2014
@@ -38,7 +38,7 @@ public class TripleMatchFrame extends Ge
      * Constructor.
      * Initialize the triple match to preserve the current context of the given
      * LPInterpreter and search for the match defined by the current argument registers
-     * @param intepreter the interpreter instance whose env, trail and arg values are to be preserved
+     * @param interpreter the interpreter instance whose env, trail and arg values are to be preserved
      */
     public TripleMatchFrame(LPInterpreter interpreter) {
         init(interpreter);
@@ -61,7 +61,7 @@ public class TripleMatchFrame extends Ge
     /**
      * Initialize the triple match to preserve the current context of the given
      * LPInterpreter and search for the match defined by the current argument registers
-     * @param intepreter the interpreter instance whose env, trail and arg values are to be preserved
+     * @param interpreter the interpreter instance whose env, trail and arg values are to be preserved
      */
     @Override public void init(LPInterpreter interpreter) {
         super.init(interpreter);

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/GraphNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/GraphNode.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/GraphNode.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/GraphNode.java Fri Jun 27 13:20:01 2014
@@ -405,7 +405,7 @@ class GraphNode {
      * from this node.  
      * @param closed if set to true it returns triples in the transitive closure,
      * if set to false it returns triples in the transitive reduction
-     * @param cache the enclosing TransitiveGraphCache
+     * @param tgc the enclosing TransitiveGraphCache
      */
     public ExtendedIterator<Triple> listTriples(boolean closed, TransitiveGraphCache tgc) {
         if (tgc.cacheTriples) {

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/shared/wg/TestInputStreamFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/shared/wg/TestInputStreamFactory.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/shared/wg/TestInputStreamFactory.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/shared/wg/TestInputStreamFactory.java Fri Jun 27 13:20:01 2014
@@ -64,12 +64,8 @@ public class TestInputStreamFactory {
 		property = null;
 	}
 
-	/** @param baseDir A prefix of all URLs accessed through this factory.
-	 *  @param zip To open a URL remove the baseDir from the URL and get the named file from the zip.
-	 */
 	public TestInputStreamFactory(IRI baseDir, String propDir) {
-        createMe = "new TestInputStreamFactory(URI.create(\""
-        +baseDir.toString()
+        createMe = "new TestInputStreamFactory(URI.create(\""+baseDir.toString()
         +"\"),\""+propDir+"\")";
 		base = baseDir;
 		mapBase = null;

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=1606090&r1=1606089&r2=1606090&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 Fri Jun 27 13:20:01 2014
@@ -24,7 +24,7 @@ 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.
- * @deprecated use {@see com.hp.hpl.jena.util.iterator.WrappedIterator.createIterator( it )}
+ * @deprecated use {@linkplain com.hp.hpl.jena.util.iterator.WrappedIterator#create}
  */
 @Deprecated
 public class IteratorIterator<T> implements Iterator<T>

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java Fri Jun 27 13:20:01 2014
@@ -462,10 +462,9 @@ abstract public class BaseXMLWriter impl
 		 { write( model, FileUtils.asUTF8(out), base ); }
 
 	/** Serialize Model <code>model</code> to Writer <code>out</out>.
+     * @param model The model to be written.
 	 * @param out The Writer to which the serialization should be sent.
-	 * @param baseModel The model to be written.
-	 * @param base the base URI for relative URI calculations.  <code>
-	 * null</code> means use only absolute URI's.
+	 * @param base the base URI for relative URI calculations.  <code>null</code> means use only absolute URI's.
 	 */
 	@Override
     synchronized public void write(Model model, Writer out, String base)

Modified: jena/trunk/jena-core/src/main/java/jena/RuleMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/RuleMap.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/RuleMap.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/RuleMap.java Fri Jun 27 13:20:01 2014
@@ -57,7 +57,7 @@ public class RuleMap {
      * comment lines and any initial prefix definition lines.
      * Also notes the prefix definitions for adding to a later inf model.
      */
-    public static List<Rule> loadRules(String filename, Map<String, String> prefixes) throws IOException {
+    public static List<Rule> loadRules(String filename, Map<String, String> prefixes) {
         String fname = filename;
         if (fname.startsWith("file:///")) {
             fname = File.separator + fname.substring(8);
@@ -76,7 +76,7 @@ public class RuleMap {
      * comment lines and any initial prefix definition lines.
      * Also notes the prefix definitions for adding to a later inf model.
      */
-    public static List<Rule> loadRules(BufferedReader src, Map<String, String> prefixes) throws IOException {
+    public static List<Rule> loadRules(BufferedReader src, Map<String, String> prefixes) {
         Rule.Parser parser = Rule.rulesParserFromReader(src);
         List<Rule> rules = Rule.parseRules(parser);
         prefixes.putAll(parser.getPrefixMap());

Modified: jena/trunk/jena-core/src/main/java/jena/cmdline/CommandLine.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/cmdline/CommandLine.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/cmdline/CommandLine.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/cmdline/CommandLine.java Fri Jun 27 13:20:01 2014
@@ -243,14 +243,12 @@ public class CommandLine
     /** Test whether the command line had a particular argument
      *
      * @param argName
-     * @return
      */
     public boolean hasArg(String argName) { return getArg(argName) != null ; }
 
     /** Test whether the command line had a particular argument
      *
      * @param argDecl
-     * @return
      */
 
     public boolean hasArg(ArgDecl argDecl) { return getArg(argDecl) != null ; }
@@ -277,14 +275,14 @@ public class CommandLine
 
     /** Get the argument associated with the arguement name.
      *  Actually returns the LAST one seen
-     *  @param argDecl Argument declaration to find
-     *  @return Last argument that matched.
+     *  @param arg Argument declaration to find
+     *  @return Arg - Last argument that matched.
      */
 
-    public Arg getArg(String s)
+    public Arg getArg(String arg)
     {
-        s = ArgDecl.canonicalForm(s) ;
-        return args.get(s) ;
+        arg = ArgDecl.canonicalForm(arg) ;
+        return args.get(arg) ;
     }
 
     /**
@@ -306,7 +304,7 @@ public class CommandLine
     /**
      * Returns the value (a string) for an argument with a value -
      * returns null for no argument and no value.
-     * @param argDecl
+     * @param argName
      * @return String
      */
     public String getValue(String argName)
@@ -332,7 +330,7 @@ public class CommandLine
 
     /**
      * Returns all the values (0 or more strings) for an argument.
-     * @param argDecl
+     * @param argName
      * @return List
      */
     public List<String> getValues(String argName)

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestGraph.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestGraph.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestGraph.java Fri Jun 27 13:20:01 2014
@@ -19,8 +19,6 @@
 package com.hp.hpl.jena.graph.test;
 
 import java.io.InputStream ;
-import java.net.MalformedURLException ;
-import java.net.URISyntaxException ;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -906,9 +904,8 @@ public abstract class AbstractTestGraph 
         }
     }
 
-    /** testIsomorphism from file data 
-     * @throws FileNotFoundException */
-    public void testIsomorphismFile() throws URISyntaxException, MalformedURLException {
+    /** testIsomorphism from file data */
+    public void testIsomorphismFile() {
         testIsomorphismXMLFile(1,true);
         testIsomorphismXMLFile(2,true);
         testIsomorphismXMLFile(3,true);
@@ -919,22 +916,22 @@ public abstract class AbstractTestGraph 
         testIsomorphismNTripleFile(8,false);
 
     }
-    private void testIsomorphismNTripleFile(int i, boolean result) throws URISyntaxException, MalformedURLException {
+    private void testIsomorphismNTripleFile(int i, boolean result) {
         testIsomorphismFile(i,"N-TRIPLE","nt",result);
     }
 
-    private void testIsomorphismXMLFile(int i, boolean result) throws URISyntaxException, MalformedURLException {
+    private void testIsomorphismXMLFile(int i, boolean result) {
         testIsomorphismFile(i,"RDF/XML","rdf",result);
 
     }
 
-    private InputStream getInputStream( int n, int n2, String suffix) throws URISyntaxException, MalformedURLException
+    private InputStream getInputStream( int n, int n2, String suffix)
     {
     	String urlStr = String.format( "regression/testModelEquals/%s-%s.%s", n, n2, suffix);
     	return AbstractTestGraph.class.getClassLoader().getResourceAsStream(  urlStr );
     }
     
-    private void testIsomorphismFile(int n, String lang, String suffix, boolean result) throws URISyntaxException, MalformedURLException {
+    private void testIsomorphismFile(int n, String lang, String suffix, boolean result) {
 
         Graph g1 = getGraph();
         Graph g2 = getGraph();

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/ontology/impl/TestOntModel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/ontology/impl/TestOntModel.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/ontology/impl/TestOntModel.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/ontology/impl/TestOntModel.java Fri Jun 27 13:20:01 2014
@@ -1155,8 +1155,6 @@ public class TestOntModel
 
     /**
      * OntModel read should do content negotiation if no base URI is given
-     * @param ontModel
-     * @return
      */
     public void testReadConneg0() {
         final boolean[] acceptHeaderSet = new boolean[] {false};

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java Fri Jun 27 13:20:01 2014
@@ -42,7 +42,7 @@ public class MemoryLeakTest extends Test
         super(arg0);
     }
     
-    public void testWineMemoryLeak() throws IOException {
+    public void testWineMemoryLeak() {
         // warmup
         Runtime rt = Runtime.getRuntime();
         loadFile("testing/wg/miscellaneous/consistent001.rdf");
@@ -60,8 +60,7 @@ public class MemoryLeakTest extends Test
         
     }
 
-    static void loadFile(String fileName)
-        throws IOException {
+    static void loadFile(String fileName) {
         PrintStream oldOut = System.out;
         try ( PrintStream out = new PrintStream(new OutputStream() {
                 @Override

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java Fri Jun 27 13:20:01 2014
@@ -248,7 +248,6 @@ class NTripleTestSuite extends WGTestSui
 		return loadRDFx(in, eh, base, true, 0);
 	}
 	
-	@SuppressWarnings("resource")
     static Model loadRDFx(
 		InFactoryX in,
 		RDFErrorHandler eh,

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java Fri Jun 27 13:20:01 2014
@@ -622,15 +622,12 @@ class Performance  {
 			for (int k = 0; k < 50; k++)
 				s += sum(data[i]);
 		long startTest = System.currentTimeMillis();
-		for (int i = 0; i < files.length; i++)
-			try {
-				if (data[i] == null)
-					continue;
-				realData = true;
-				parseRDF(new ByteArrayInputStream(data[i]), files[i][1]);
-			} catch (IOException e) {
-				System.err.println("byteArray " + e.getMessage());
-			}
+		for (int i = 0; i < files.length; i++) {
+		    if (data[i] == null)
+		        continue;
+		    realData = true;
+		    parseRDF(new ByteArrayInputStream(data[i]), files[i][1]);
+		}
 		long endTime = System.currentTimeMillis();
         totalTime += (int)(endTime-startTest);
 		if (!realData)
@@ -638,7 +635,7 @@ class Performance  {
 		return (double) (endTime - startTest)
 			/ (double) (startTest - startRead);
 	}
-	static void parseRDF(InputStream in, String base) throws IOException {
+	static void parseRDF(InputStream in, String base) {
 		ErrorHandler eh = new ErrorHandler() {
 			@Override
             public void warning(SAXParseException e) {

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractModelTestBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractModelTestBase.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractModelTestBase.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/AbstractModelTestBase.java Fri Jun 27 13:20:01 2014
@@ -19,7 +19,6 @@
 package com.hp.hpl.jena.rdf.model.test;
 
 import java.io.FileNotFoundException ;
-import java.io.IOException ;
 import java.io.InputStream ;
 import java.net.URISyntaxException ;
 import java.net.URL ;
@@ -53,7 +52,7 @@ public abstract class AbstractModelTestB
    		}
    	}
 	
-	protected InputStream getInputStream( final String fn ) throws IOException
+	protected InputStream getInputStream( final String fn )
 	{
 		ClassLoader loader = AbstractModelTestBase.class.getClassLoader();
 		if (loader == null)

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/ModelTestBase.java Fri Jun 27 13:20:01 2014
@@ -69,8 +69,7 @@ public class ModelTestBase extends Graph
 	 *            the model value that is expected
 	 * @param got
 	 *            the model value to check
-	 * @exception if
-	 *                the models are not isomorphic
+	 * @exception junit.framework.AssertionFailedError if the models are not isomorphic
 	 */
 	public static void assertIsoModels( final String title, final Model wanted,
 			final Model got )
@@ -232,7 +231,7 @@ public class ModelTestBase extends Graph
 	 * 
 	 * @param m
 	 *            the model the statement is attached to
-	 * @param an
+	 * @param fact
 	 *            "S P O" string.
 	 * @return m.createStatement(S, P, O)
 	 */

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestCopyInOutOfModel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestCopyInOutOfModel.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestCopyInOutOfModel.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestCopyInOutOfModel.java Fri Jun 27 13:20:01 2014
@@ -51,9 +51,6 @@ public class TestCopyInOutOfModel extend
 
 	/**
 	 * test moving things between models
-	 * 
-	 * @param lockModel
-	 *            the model implementation under test
 	 */
 	public void testCopyStatement()
 	{

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java Fri Jun 27 13:20:01 2014
@@ -18,8 +18,6 @@
 
 package com.hp.hpl.jena.rdf.model.test ;
 
-import java.io.FileNotFoundException ;
-
 import org.apache.jena.iri.IRIException ;
 import org.junit.Assert ;
 import org.slf4j.Logger ;
@@ -47,7 +45,7 @@ public class TestModelRead extends Abstr
         this(new TestPackage.PlainModelFactory(), "TestModelRead") ;
     }
 
-    public void testDefaultLangXML() throws FileNotFoundException {
+    public void testDefaultLangXML() {
         final Model model = ModelFactory.createDefaultModel() ;
         model.read(getFileName("modelReading/plain.rdf"), null, null) ;
     }
@@ -61,27 +59,27 @@ public class TestModelRead extends Abstr
         }
     }
 
-    public void testLoadsSimpleModel() throws FileNotFoundException {
+    public void testLoadsSimpleModel() {
         final Model expected = createModel() ;
         expected.read(getFileName("modelReading/simple.n3"), "N3") ;
         Assert.assertSame(model, model.read(getFileName("modelReading/simple.n3"), "base", "N3")) ;
         ModelHelper.assertIsoModels(expected, model) ;
     }
 
-    public void testReturnsSelf() throws FileNotFoundException {
+    public void testReturnsSelf() {
 
         Assert.assertSame(model, model.read(getFileName("modelReading/empty.n3"), "base", "N3")) ;
         Assert.assertTrue(model.isEmpty()) ;
     }
 
-    public void testSimpleLoadExplicitBase() throws FileNotFoundException {
+    public void testSimpleLoadExplicitBase() {
         final Model mBasedExplicit = createModel() ;
         mBasedExplicit.read(getFileName("modelReading/based.n3"), "http://example/", "N3") ;
         ModelHelper.assertIsoModels(ModelHelper.modelWithStatements(this, "http://example/ ja:predicate ja:object"),
                                     mBasedExplicit) ;
     }
 
-    public void testSimpleLoadImplictBase() throws IRIException, FileNotFoundException {
+    public void testSimpleLoadImplictBase() throws IRIException {
         final Model mBasedImplicit = createModel() ;
         final String fn = IRIResolver.resolveFileURL(getFileName("modelReading/based.n3")) ;
         final Model wanted = createModel().add(ModelHelper.resource(fn), ModelHelper.property("ja:predicate"),

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestReaders.java Fri Jun 27 13:20:01 2014
@@ -82,7 +82,7 @@ public class TestReaders extends Abstrac
 
 	}
 
-	public void testReadLocalNTriple() throws IOException
+	public void testReadLocalNTriple()
 	{
 		model.read(getInputStream("TestReaders.nt"), "", "N-TRIPLE");
 		Assert.assertEquals("Wrong size model", 5, model.size());
@@ -92,7 +92,7 @@ public class TestReaders extends Abstrac
 
 	}
 
-	public void testReadLocalRDF() throws IOException
+	public void testReadLocalRDF()
 	{
 		model.read(getInputStream("TestReaders.rdf"), "http://example.org/");
 	}

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/ModelHelper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/ModelHelper.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/ModelHelper.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/helpers/ModelHelper.java Fri Jun 27 13:20:01 2014
@@ -79,8 +79,8 @@ public class ModelHelper extends GraphTe
 	/**
         create a Statement in a given Model with (S, P, O) extracted by parsing a string.
 
-        @param lockModel the model the statement is attached to
-        @param an "S P O" string.
+        @param m the model the statement is attached to
+        @param fact an "S P O" string.
         @return model.createStatement(S, P, O)
 	 */
 	public static Statement statement( Model m, String fact )
@@ -122,7 +122,7 @@ public class ModelHelper extends GraphTe
 	/**
         Create an array of Statements parsed from a semi-separated string.
 
-        @param lockModel a model to serve as a statement factory
+        @param m a model to serve as a statement factory
         @param facts a sequence of semicolon-separated "S P O" facts
         @return a Statement[] of the (S P O) statements from the string
 	 */
@@ -137,7 +137,7 @@ public class ModelHelper extends GraphTe
 	/**
         Create an array of Resources from a whitespace-separated string
 
-        @param lockModel a model to serve as a resource factory
+        @param m a model to serve as a resource factory
         @param items a whitespace-separated sequence to feed to resource
         @return a RDFNode[] of the parsed resources
 	 */
@@ -165,7 +165,7 @@ public class ModelHelper extends GraphTe
 	/**
         add to a model all the statements expressed by a string.
 
-        @param lockModel the model to be updated
+        @param m the model to be updated
         @param facts a sequence of semicolon-separated "S P O" facts
         @return the updated model
 	 */
@@ -211,7 +211,7 @@ public class ModelHelper extends GraphTe
         @param title a String appearing at the beginning of the failure message
         @param wanted the model value that is expected
         @param got the model value to check
-        @exception if the models are not isomorphic
+        @exception junit.framework.AssertionFailedError the models are not isomorphic
 	 */
 	public static void assertIsoModels( String title, Model wanted, Model got )
 	{

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/DebugRules.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/DebugRules.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/DebugRules.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/DebugRules.java Fri Jun 27 13:20:01 2014
@@ -18,13 +18,16 @@
 
 package com.hp.hpl.jena.reasoner.rulesys.test;
 
-import com.hp.hpl.jena.reasoner.rulesys.*;
-import com.hp.hpl.jena.reasoner.*;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.util.PrintUtil;
+import java.util.Iterator ;
+import java.util.List ;
 
-import java.util.*;
-import java.io.*;
+import com.hp.hpl.jena.graph.Factory ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.reasoner.InfGraph ;
+import com.hp.hpl.jena.reasoner.rulesys.BasicForwardRuleReasoner ;
+import com.hp.hpl.jena.reasoner.rulesys.Rule ;
+import com.hp.hpl.jena.reasoner.rulesys.Util ;
+import com.hp.hpl.jena.util.PrintUtil ;
 
 /** * Using during debuging of the rule systems.
  * Runs a named set of rules (can contain axioms and rules) and
@@ -39,7 +42,7 @@ public class DebugRules {
     public List<Rule> ruleset;
     
     /** Constructor - loads the rules */
-    public DebugRules(String rulefileName) throws IOException {
+    public DebugRules(String rulefileName) {
         ruleset = Rule.parseRules(Util.loadRuleParserFromResourceFile(rulefileName));
     }
     

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLConsistencyTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLConsistencyTest.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLConsistencyTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/OWLConsistencyTest.java Fri Jun 27 13:20:01 2014
@@ -111,9 +111,6 @@ public class OWLConsistencyTest extends 
 
     /**
      * Run the consistency check, returning a ValidityReport.
-     * 
-     * @param rf
-     *            The factory for the reasoner to test
      */
     public ValidityReport testResults() {
         Model t = FileManager.get().loadModel(BASE_DIR + tbox);
@@ -126,12 +123,6 @@ public class OWLConsistencyTest extends 
         return im.validate();
     }
 
-    /**
-     * Run the consistency check and validate the result against expectations.
-     * 
-     * @param rf
-     *            The factory for the reasoner to test
-     */
     @Override
     public void runTest() {
         ValidityReport report = testResults();

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBackchainer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBackchainer.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBackchainer.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBackchainer.java Fri Jun 27 13:20:01 2014
@@ -18,21 +18,23 @@
 
 package com.hp.hpl.jena.reasoner.rulesys.test;
 
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.reasoner.*;
-import com.hp.hpl.jena.reasoner.rulesys.*;
-import com.hp.hpl.jena.reasoner.rulesys.impl.*;
-import com.hp.hpl.jena.reasoner.test.TestUtil;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.vocabulary.OWL;
-import com.hp.hpl.jena.vocabulary.RDFS;
-import com.hp.hpl.jena.vocabulary.RDF;
+import java.util.ArrayList ;
+import java.util.List ;
 
-import java.io.IOException;
-import java.util.*;
+import junit.framework.TestCase ;
+import junit.framework.TestSuite ;
 
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import com.hp.hpl.jena.graph.* ;
+import com.hp.hpl.jena.reasoner.InfGraph ;
+import com.hp.hpl.jena.reasoner.Reasoner ;
+import com.hp.hpl.jena.reasoner.TriplePattern ;
+import com.hp.hpl.jena.reasoner.rulesys.* ;
+import com.hp.hpl.jena.reasoner.rulesys.impl.BindingVector ;
+import com.hp.hpl.jena.reasoner.test.TestUtil ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.vocabulary.OWL ;
+import com.hp.hpl.jena.vocabulary.RDF ;
+import com.hp.hpl.jena.vocabulary.RDFS ;
 
 /**
  * Test harness for the backward chainer. 
@@ -894,7 +896,7 @@ public class TestBackchainer extends Tes
     /**
      * Test problematic rdfs case
      */
-    public void testBug1() throws IOException {
+    public void testBug1() {
         Graph data = Factory.createGraphMem();
         Node p = NodeFactory.createURI("http://www.hpl.hp.com/semweb/2003/eg#p");
         Node r = NodeFactory.createURI("http://www.hpl.hp.com/semweb/2003/eg#r");

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java Fri Jun 27 13:20:01 2014
@@ -18,27 +18,33 @@
 
 package com.hp.hpl.jena.reasoner.rulesys.test;
 
-import com.hp.hpl.jena.reasoner.*;
-import com.hp.hpl.jena.reasoner.rulesys.*;
-import com.hp.hpl.jena.reasoner.test.TestUtil;
-import com.hp.hpl.jena.datatypes.xsd.*;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.shared.ClosedException;
-import com.hp.hpl.jena.shared.impl.JenaParameters;
-import com.hp.hpl.jena.util.FileManager;
-import com.hp.hpl.jena.util.PrintUtil;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.vocabulary.*;
+import java.util.Iterator ;
+import java.util.List ;
 
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import java.io.IOException;
-import java.util.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import junit.framework.TestCase ;
+import junit.framework.TestSuite ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
+import com.hp.hpl.jena.datatypes.xsd.XSDDateTime ;
+import com.hp.hpl.jena.graph.* ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.reasoner.Derivation ;
+import com.hp.hpl.jena.reasoner.InfGraph ;
+import com.hp.hpl.jena.reasoner.Reasoner ;
+import com.hp.hpl.jena.reasoner.ReasonerRegistry ;
+import com.hp.hpl.jena.reasoner.rulesys.* ;
+import com.hp.hpl.jena.reasoner.test.TestUtil ;
+import com.hp.hpl.jena.shared.ClosedException ;
+import com.hp.hpl.jena.shared.impl.JenaParameters ;
+import com.hp.hpl.jena.util.FileManager ;
+import com.hp.hpl.jena.util.PrintUtil ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.vocabulary.OWL ;
+import com.hp.hpl.jena.vocabulary.RDF ;
+import com.hp.hpl.jena.vocabulary.RDFS ;
+import com.hp.hpl.jena.vocabulary.ReasonerVocabulary ;
 
 /**
  * Test suite for the hybrid forward/backward rule system.
@@ -980,7 +986,7 @@ public class TestFBRules extends TestCas
      * Investigate a suspicious case in the OWL ruleset, is the backchainer 
      * returning duplicate values?
      */
-    public void testDuplicatesEC4() throws IOException {
+    public void testDuplicatesEC4() {
         boolean prior = JenaParameters.enableFilteringOfHiddenInfNodes;
         try {
             JenaParameters.enableFilteringOfHiddenInfNodes = false;

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/ReasonerTester.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/ReasonerTester.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/ReasonerTester.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/ReasonerTester.java Fri Jun 27 13:20:01 2014
@@ -192,7 +192,7 @@ public class ReasonerTester {
      * @param configuration optional configuration information
      * @return true if all the tests pass
      * @throws IOException if one of the test files can't be found
-     * @throws RDFException if the test can't be found or fails internally
+     * @throws JenaException if the test can't be found or fails internally
      */
     public boolean runTests(ReasonerFactory reasonerF, TestCase testcase, Resource configuration) throws IOException {
         for ( String test : listTests() )
@@ -211,7 +211,7 @@ public class ReasonerTester {
      * @param testcase the JUnit test case which is requesting this test
      * @return true if all the tests pass
      * @throws IOException if one of the test files can't be found
-     * @throws RDFException if the test can't be found or fails internally
+     * @throws JenaException if the test can't be found or fails internally
      */
     public boolean runTests(Reasoner reasoner, TestCase testcase) throws IOException {
         for ( String test : listTests() )
@@ -245,7 +245,7 @@ public class ReasonerTester {
      * @param configuration optional configuration information
      * @return true if the test passes
      * @throws IOException if one of the test files can't be found
-     * @throws RDFException if the test can't be found or fails internally
+     * @throws JenaException if the test can't be found or fails internally
      */
     public boolean runTest(String uri, ReasonerFactory reasonerF, TestCase testcase, Resource configuration) throws IOException {
         Reasoner reasoner = reasonerF.create(configuration);
@@ -259,7 +259,7 @@ public class ReasonerTester {
      * @param testcase the JUnit test case which is requesting this test
      * @return true if the test passes
      * @throws IOException if one of the test files can't be found
-     * @throws RDFException if the test can't be found or fails internally
+     * @throws JenaException if the test can't be found or fails internally
      */
     public boolean runTest(String uri, Reasoner reasoner, TestCase testcase) throws IOException {
         // Find the specification for the named test

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestUtil.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestUtil.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestUtil.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestUtil.java Fri Jun 27 13:20:01 2014
@@ -50,7 +50,7 @@ public class TestUtil {
      * @param testCase The JUnit test case that is invoking this helper
      * @param it The iterator to test
      * @param vals The expected values of the iterator
-     * @param anonCount If non zero, count the number of anonymous resources returned by <code>it</code>,
+     * @param countAnon If non zero, count the number of anonymous resources returned by <code>it</code>,
      * and don't check these resources against the expected <code>vals</code>.
      */
     public static void assertIteratorValues(TestCase testCase, Iterator<?> it, Object[] vals, int countAnon ) {

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/WGReasonerTester.java Fri Jun 27 13:20:01 2014
@@ -207,7 +207,7 @@ public class WGReasonerTester {
      * @param configuration optional configuration information
      * @return true if all the tests pass
      * @throws IOException if one of the test files can't be found
-     * @throws RDFException if the test can't be found or fails internally
+     * @throws JenaException if the test can't be found or fails internally
      */
     public boolean runTests(ReasonerFactory reasonerF, TestCase testcase, Resource configuration) throws IOException {
         for ( String test : listTests() )
@@ -252,7 +252,7 @@ public class WGReasonerTester {
      * @param configuration optional configuration information
      * @return true if the test passes
      * @throws IOException if one of the test files can't be found
-     * @throws RDFException if the test can't be found or fails internally
+     * @throws JenaException if the test can't be found or fails internally
      */
     public boolean runTest(String uri, ReasonerFactory reasonerF, TestCase testcase, Resource configuration) throws IOException {
         return runTestDetailedResponse(uri,reasonerF,testcase,configuration) != FAIL;
@@ -270,7 +270,7 @@ public class WGReasonerTester {
 		 * @param configuration optional configuration information
 		 * @return true if the test passes
 		 * @throws IOException if one of the test files can't be found
-		 * @throws RDFException if the test can't be found or fails internally
+		 * @throws JenaException if the test can't be found or fails internally
 		 */
     
 	

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/PrettyWriterTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/PrettyWriterTest.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/PrettyWriterTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/PrettyWriterTest.java Fri Jun 27 13:20:01 2014
@@ -106,7 +106,7 @@ public class PrettyWriterTest extends Mo
 			"rdf:parseType=[\"']Collection[\"']");
 	}
 
-	public void testOWLPrefix() throws IOException{
+	public void testOWLPrefix() {
 		//		check(
 		//			"file:testing/abbreviated/collection.rdf",
 		//			"xmlns:owl=[\"']http://www.w3.org/2002/07/owl#[\"']");

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestEntityOutput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestEntityOutput.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestEntityOutput.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestEntityOutput.java Fri Jun 27 13:20:01 2014
@@ -130,7 +130,7 @@ public class TestEntityOutput extends Mo
         }
     }
     
-    public void testCRinLiterals() throws IOException 
+    public void testCRinLiterals() 
     {
         Model m = createMemModel();
         Resource r = m.createResource("http://example/r") ;

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java Fri Jun 27 13:20:01 2014
@@ -228,7 +228,7 @@ public class TestXMLFeatures extends XML
 				.setPrefix("", RDF.getURI()));
 	}
 
-	public void testBadPrefixNamespace() throws IOException {
+	public void testBadPrefixNamespace() {
 		// Trying to set the prefix should generate a warning.
 		// check(file1, null, null, "xmlns:3", true, new Change() {
 		// public void code( RDFWriter w ) {

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/XMLOutputTestBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/XMLOutputTestBase.java?rev=1606090&r1=1606089&r2=1606090&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/XMLOutputTestBase.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/XMLOutputTestBase.java Fri Jun 27 13:20:01 2014
@@ -172,7 +172,6 @@ public class XMLOutputTestBase extends M
         check(filename, encoding, regexPresent, regexAbsent, errs, code, "file:"+filename);
     }
     
-    @SuppressWarnings("resource")
     protected void check(
         String filename,
         String encoding,