svn commit: r1336996 - in /jena/Experimental/jena-client/src/main/java/org/apache/jena/client: QueryParameterizerBase.java QueryStatement.java http/SparqlHttpConnection.java

[sa...@apache.org]

Author: sallen
Date: Fri May 11 01:12:06 2012
New Revision: 1336996

URL: http://svn.apache.org/viewvc?rev=1336996&view=rev
Log: (empty)

Modified:
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryParameterizerBase.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatement.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/SparqlHttpConnection.java

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryParameterizerBase.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryParameterizerBase.java?rev=1336996&r1=1336995&r2=1336996&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryParameterizerBase.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryParameterizerBase.java Fri May 11 01:12:06 2012
@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.regex.Pattern;
 
 import org.apache.jena.iri.IRI;
+import org.openjena.atlas.lib.NotImplemented;
 
 import com.hp.hpl.jena.datatypes.RDFDatatype;
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
@@ -57,9 +58,7 @@ abstract class QueryParameterizerBase im
     
     protected Query buildFromQuery(Query query)
     {
-        
-        
-        return null;
+        throw new NotImplemented("Building from a Query object is not implemented yet!");
     }
 
     @Override

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatement.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatement.java?rev=1336996&r1=1336995&r2=1336996&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatement.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatement.java Fri May 11 01:12:06 2012
@@ -117,15 +117,15 @@ public interface QueryStatement extends 
     
     /**
      * Cancels this <code>QueryStatement</code> object mid-execution if the implementation supports it.
-     * This method can be called by a different thread that is currently executing the query.  There
+     * This method can be called by a different thread than is currently executing the query.  There
      * is no guarantee that the concrete implementation actually will stop or that it will do so immediately.
      * No operations on the query execution or any associated result set are permitted after this call
      * and may cause exceptions to be thrown.
      */
     void cancel();
-        
+    
     // TODO Need to update the implementations to follow the timeout behavior specified here, specifically the zero and negative timeout
-    // TODO We need to that these are client-side options only.  The server may enforce different timeouts.
+    // TODO We need to emphasize that these are client-side options only.  The server may enforce different timeouts.
     /**
      * Set the number of milliseconds to wait for a <code>QueryStatement</code> to return the first result.
      * @param timeout the new query timeout limit in milliseconds; zero or a negative number means there is no limit

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/SparqlHttpConnection.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/SparqlHttpConnection.java?rev=1336996&r1=1336995&r2=1336996&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/SparqlHttpConnection.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/SparqlHttpConnection.java Fri May 11 01:12:06 2012
@@ -99,8 +99,7 @@ public class SparqlHttpConnection extend
     @Override
     public QueryStatement createQueryStatement(String queryString)
     {
-        // TODO Auto-generated method stub
-        return null;
+        return new SparqlHttpQueryStatement(queryString, this);
     }
 
     @Override