From fbd878d0ad686c65f9c9e42db37494535e63aa29 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Sun, 12 Sep 2021 15:53:39 +0100 Subject: [PATCH] JAL-3829 JalviewJS workarounds/patches --- src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java | 5 +++-- src/jalview/util/Platform.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java index cb0bc2d..8263b22 100644 --- a/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java +++ b/src/jalview/fts/service/threedbeacons/TDBeaconsFTSRestClient.java @@ -75,9 +75,10 @@ public class TDBeaconsFTSRestClient extends FTSRestClient client = Client.create(new DefaultClientConfig()); clientResponseClass = ClientResponse.class; } + WebResource webResource; - webResource = client.resource(DEFAULT_THREEDBEACONS_DOMAIN) - .path(query); + webResource = client.resource(DEFAULT_THREEDBEACONS_DOMAIN+query); + URI uri = webResource.getURI(); System.out.println(uri.toString()); diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java index 71d798d..a65ee95 100644 --- a/src/jalview/util/Platform.java +++ b/src/jalview/util/Platform.java @@ -349,7 +349,7 @@ public class Platform public static byte[] getFileBytes(File f) { - return /** @j2sNative f && swingjs.JSUtil.getFileBytes$java_io_File(f) || */ + return /** @j2sNative f && swingjs.JSUtil.getFileAsBytes$O(f) || */ null; } -- 1.7.10.2