From 79976d6b0aaf692f20c4663999788205299afe02 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sat, 11 Mar 2017 23:19:09 +0300 Subject: [PATCH] =?UTF-8?q?Web=20interface:=20=D1=87=D1=83=D1=82=D0=BE?= =?UTF-8?q?=D0=BA=20=D1=83=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20index.html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webinterface/build.gradle | 2 ++ .../src/main/java/asys/webinterface/IndexHandler.java | 10 ++-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/webinterface/build.gradle b/webinterface/build.gradle index c905167..3767fe2 100644 --- a/webinterface/build.gradle +++ b/webinterface/build.gradle @@ -29,9 +29,11 @@ bundle { 'Import-Package': '*' ] exclude group: 'com.google.code.gson' + exclude group: 'commons-io' } dependencies { compile project(':core') included group: 'com.google.code.gson', name: 'gson', version: '2.7' + included group: 'commons-io', name: 'commons-io', version: '2.5' } \ No newline at end of file diff --git a/webinterface/src/main/java/asys/webinterface/IndexHandler.java b/webinterface/src/main/java/asys/webinterface/IndexHandler.java index 3bc8191..a003c5c 100644 --- a/webinterface/src/main/java/asys/webinterface/IndexHandler.java +++ b/webinterface/src/main/java/asys/webinterface/IndexHandler.java @@ -6,6 +6,7 @@ package asys.webinterface; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; +import org.apache.commons.io.IOUtils; import org.osgi.framework.BundleContext; import java.io.*; @@ -21,14 +22,7 @@ public class IndexHandler implements HttpHandler { try { InputStream inputStream = getClass().getResourceAsStream("/index.html"); - BufferedReader br = new BufferedReader(new InputStreamReader(inputStream)); - - StringBuilder sb = new StringBuilder(); - String line; - while ((line = br.readLine()) != null) { - sb.append(line).append("\n"); - } - htmlTemplate = sb.toString(); + htmlTemplate = IOUtils.toString(inputStream, "UTF-8"); } catch (Exception e) { throw new RuntimeException("Error load htmlTemplate", e); }