JAL-4046 JAL-3993 patch for 2.11.2.4 release

[jalview.git] / src / jalview / javascript / web / WebResource.java

diff --git a/src/jalview/javascript/web/WebResource.java b/src/jalview/javascript/web/WebResource.java
index c55e9ba..c6cd0de 100644 (file)
--- a/src/jalview/javascript/web/WebResource.java
+++ b/src/jalview/javascript/web/WebResource.java
@@ -1,9 +1,31 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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
@@ -64,8 +86,13 @@ public class WebResource
      */
     public ClientResponse get(Class<?> c)
     {
-      return new ClientResponse(Platform.getFileAsString(uri.toString()),
-              encoding);
+      try
+      {
+        return new ClientResponse(new URL(uri.toString()), encoding);
+      } catch (MalformedURLException e)
+      {
+        return null;
+      }
     }
   }