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/02/15 20:17:54 UTC

svn commit: r1244655 - in /incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets: SPARQL_REST.java SPARQL_ServletBase.java

Author: andy
Date: Wed Feb 15 19:17:54 2012
New Revision: 1244655

URL: http://svn.apache.org/viewvc?rev=1244655&view=rev
Log:
Tidy

Modified:
    incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
    incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java

Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java?rev=1244655&r1=1244654&r2=1244655&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java Wed Feb 15 19:17:54 2012
@@ -71,6 +71,13 @@ public abstract class SPARQL_REST extend
         {
             super(id, dsg, request, response, verbose) ;
         }
+
+        protected final boolean hasTarget()
+        {
+            return 
+                request.getParameter(HttpNames.paramGraphDefault) == null &&
+                request.getParameter(HttpNames.paramGraph) == null ;
+        }
         
         protected final Target getTarget() 
         {
@@ -256,9 +263,9 @@ public abstract class SPARQL_REST extend
         return mt ;
     }
     
-    protected static MediaType contentNegotationQuads(HttpServletRequest request)
+    protected static MediaType contentNegotationQuads(HttpActionREST action)
     {
-        return ConNeg.chooseContentType(request, DEF.quadsOffer, DEF.acceptTriG) ;
+        return ConNeg.chooseContentType(action.request, DEF.quadsOffer, DEF.acceptTriG) ;
     }
 
     // Auxilliary functionality.

Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java?rev=1244655&r1=1244654&r2=1244655&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java Wed Feb 15 19:17:54 2012
@@ -116,8 +116,7 @@ public abstract class SPARQL_ServletBase
         printResponse(id, responseTracked) ;
     }
 
-    //@Override
-    @SuppressWarnings("unused")
+    @SuppressWarnings("unused") // ServletException
     protected void doPatch(HttpServletRequest request, HttpServletResponse response)
     throws ServletException, IOException
     {