X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjavascript%2Fweb%2FWebResource.java;h=1896b652239a05e429460a79ea1a471c3085d64f;hb=fcb944cdd9de849c89f0a8744ae6e56e22de9c1e;hp=299c727c9cdf41fb54d95b572301a39f5b735800;hpb=5a256ef0ca648a8f4722da20475cbd01655d9de4;p=jalview.git

diff --git a/src/jalview/javascript/web/WebResource.java b/src/jalview/javascript/web/WebResource.java
index 299c727..1896b65 100644
--- a/src/jalview/javascript/web/WebResource.java
+++ b/src/jalview/javascript/web/WebResource.java
@@ -1,26 +1,30 @@
 package jalview.javascript.web;
 
+import jalview.util.Platform;
+
+import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 
+/*
+ *  A JavaScript-only proxy for com.sun.jersey.api.client.WebResource
+ * 
+ */
 public class WebResource
 {
 
   private String endpoint, params = "";
-  
-  public WebResource(String endpoint) {
+
+  public WebResource(String endpoint)
+  {
     this.endpoint = endpoint;
   }
-  
 
   public WebResource queryParam(String key, String value)
   {
-    params += (params == "" ? "?" : "&") + key + "=";
-    /**
-     * @j2sNative
-     * value = encodeURIComonent(value);
-     */
-    params += value;
+    params += (params == "" ? "?" : "&") + key + "="
+            + Platform.encodeURI(value);
     return this;
   }
 
@@ -36,33 +40,40 @@ public class WebResource
     }
   }
 
-  public Builder accept(String encoding)
+  public Builder accept(String... encoding)
   {
-    return  new Builder(getURI(), encoding);
+    return new Builder(getURI(), encoding);
   }
-  
-  
-  public static class Builder {
-      private URI uri;
-      private String encoding;
 
-      public Builder(URI uri, String encoding)
+  public static class Builder
+  {
+    private URI uri;
+
+    private String[] encoding;
+
+    public Builder(URI uri, String... encoding)
     {
-        this.uri = uri;
-        this.encoding = encoding; // application/json
-        
-      // TODO Auto-generated constructor stub
+      this.uri = uri;
+      this.encoding = encoding; // application/json
     }
 
-      public ClientResponse get(Class<?> c) {
-        String data = uri.toString();
-        // c will be ClientResponse 
-        data = /** @j2sNative swingjs.JSUtil.getFileAsString$S(data) || */ null;
-        return new ClientResponse(data, encoding);
+    /**
+     * Get the response
+     * 
+     * @param c
+     *          must be ClientResponse
+     * @return
+     */
+    public ClientResponse get(Class<?> c)
+    {
+      try
+      {
+        return new ClientResponse(new URL(uri.toString()), encoding);
+      } catch (MalformedURLException e)
+      {
+        return null;
       }
+    }
   }
- 
-  
-  
 
 }