From e5c634983a0bf57a2c28ff92a7eda0c8abb1ca86 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 19 Jan 2021 11:10:35 +0100 Subject: [PATCH] bug4811: added elemental2 to SSE feature; added JSNI code to interpret Uint8Array as byte[] --- .../SailingServer (No Proxy OSX).launch | 1 + .../com.sap.sailing.server/SailingServer (No Proxy).launch | 1 + .../SailingServer (No Proxy, Axel).launch | 1 + .../SailingServer (No Proxy, Cached MTB).launch | 1 + .../SailingServer (No Proxy, Igtimi Local Test).launch | 1 + .../SailingServer (No Proxy, Java11 GENERATED).launch | 1 + .../SailingServer (No Proxy, Java11).launch | 1 + .../SailingServer (No Proxy, Java11, JFR Recording).launch | 1 + .../SailingServer (No Proxy, Jetty on 8889).launch | 1 + ...lingServer (No Proxy, Jetty on 8889, Cached MTB).launch | 1 + ...Proxy, Jetty on 8889, auto-replicate SS and SSD).launch | 1 + ...er (No Proxy, Jetty on 8889, auto-replicate dev).launch | 1 + ...Server (No Proxy, Jetty on 8889, auto-replicate).launch | 1 + .../SailingServer (No Proxy, Jetty on 8890).launch | 1 + ...ty on 8890, auto-replicate from replica at 8889).launch | 1 + .../SailingServer (No Proxy, Remote Debug SAP VM).launch | 1 + .../SailingServer (No Proxy, bundesliga2-2017 DB).launch | 1 + .../SailingServer (No Proxy, debranding active).launch | 1 + .../SailingServer (No Proxy, winddbTest Axel).launch | 1 + .../SailingServer (No Proxy, winddbTest).launch | 1 + ... 8889, Polar & Wind estimation Import from 8888).launch | 1 + java/com.sap.sse.feature/feature.xml | 7 +++++++ .../client/fileupload/FileUploadWithLocalFileContent.java | 6 +++++- 23 files changed, 33 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch b/java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch index d4d64e4e07f..1bedbe5bad3 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch @@ -223,6 +223,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy).launch b/java/com.sap.sailing.server/SailingServer (No Proxy).launch index 15e8044cb47..e08520e061d 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy).launch @@ -225,6 +225,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Axel).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Axel).launch index a5ecc07d58a..7705499bcce 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Axel).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Axel).launch @@ -225,6 +225,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch index 94300cf2fb5..e213c662567 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch @@ -222,6 +222,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Igtimi Local Test).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Igtimi Local Test).launch index 493af60b046..ab60d2fdb1b 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Igtimi Local Test).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Igtimi Local Test).launch @@ -225,6 +225,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Java11 GENERATED).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Java11 GENERATED).launch index 4561a892077..f13c4fba212 100644 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Java11 GENERATED).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Java11 GENERATED).launch @@ -225,6 +225,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Java11).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Java11).launch index 444e6ec9015..3b9c6c26fad 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Java11).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Java11).launch @@ -225,6 +225,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Java11, JFR Recording).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Java11, JFR Recording).launch index beee708c335..d867f5e5c48 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Java11, JFR Recording).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Java11, JFR Recording).launch @@ -225,6 +225,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch index 93123b92784..d2f9b1203bc 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch @@ -216,6 +216,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch index bf9a345c400..c7a29542a0b 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch @@ -216,6 +216,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate SS and SSD).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate SS and SSD).launch index 99b181ba4da..753470a99cf 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate SS and SSD).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate SS and SSD).launch @@ -218,6 +218,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate dev).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate dev).launch index c24f29ed50a..58e0d3d912f 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate dev).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate dev).launch @@ -216,6 +216,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch index 931a34098a4..d73470e57c8 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch @@ -218,6 +218,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch index 9ea481acc1f..ea26c7647ac 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch @@ -216,6 +216,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890, auto-replicate from replica at 8889).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890, auto-replicate from replica at 8889).launch index 2676ab6b919..1b8d1e66925 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890, auto-replicate from replica at 8889).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890, auto-replicate from replica at 8889).launch @@ -216,6 +216,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch index ce251c58018..aa3b7cde7fb 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch @@ -216,6 +216,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, bundesliga2-2017 DB).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, bundesliga2-2017 DB).launch index 807c0e79224..bb93f35fac9 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, bundesliga2-2017 DB).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, bundesliga2-2017 DB).launch @@ -225,6 +225,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, debranding active).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, debranding active).launch index a46b663971f..ee9a65dde2b 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, debranding active).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, debranding active).launch @@ -225,6 +225,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest Axel).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest Axel).launch index 8c054dd1771..e7972085b68 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest Axel).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest Axel).launch @@ -221,6 +221,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch index 36ea32e9a02..9c3990d425f 100755 --- a/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch @@ -223,6 +223,7 @@ + diff --git a/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889, Polar & Wind estimation Import from 8888).launch b/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889, Polar & Wind estimation Import from 8888).launch index 23b79d82287..a265698477c 100755 --- a/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889, Polar & Wind estimation Import from 8888).launch +++ b/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889, Polar & Wind estimation Import from 8888).launch @@ -216,6 +216,7 @@ + diff --git a/java/com.sap.sse.feature/feature.xml b/java/com.sap.sse.feature/feature.xml index 25a5292ed41..2035d023c5c 100755 --- a/java/com.sap.sse.feature/feature.xml +++ b/java/com.sap.sse.feature/feature.xml @@ -262,4 +262,11 @@ Computes leaderboard information for sailing races and offers RESTful APIs to al version="0.0.0" unpack="false"/> + + diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/fileupload/FileUploadWithLocalFileContent.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/fileupload/FileUploadWithLocalFileContent.java index 23214128174..19daa84fcfd 100755 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/fileupload/FileUploadWithLocalFileContent.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/fileupload/FileUploadWithLocalFileContent.java @@ -47,11 +47,15 @@ public class FileUploadWithLocalFileContent { final File file = fileList.item((double) i); final Promise arrayBufferPromise = file.arrayBuffer(); arrayBufferPromise.then(arrayBuffer->{ - callback.fileContentsRead((byte[]) (Object) new Uint8Array(arrayBuffer)); + callback.fileContentsRead(uint8ArrayBufferToByteArray(new Uint8Array(arrayBuffer))); return null; }); } + public static native byte[] uint8ArrayBufferToByteArray(Uint8Array buffer) /*-{ + return buffer; + }-*/; + private HTMLInputElement getFileUploadAsHtmlInputElement() { return (HTMLInputElement) (Object) fileUpload.getElement(); }