From ad2baf2d9bb163b2b4b9c11ff96acd6abb110716 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sat, 18 Mar 2017 17:35:10 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=87=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=B1=D0=B0=D0=BB=D0=B2=D0=B0=D0=BD=D0=BA=D0=B0=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=BC=D0=B5=D0=BD=D0=B5=D0=B4=D0=B6=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mcserver-manager/build.gradle | 2 +- .../java/asys/mcsmanager/MCSM_WebModule.java | 29 ++++++++++--------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/mcserver-manager/build.gradle b/mcserver-manager/build.gradle index 913dc91..c896d26 100644 --- a/mcserver-manager/build.gradle +++ b/mcserver-manager/build.gradle @@ -1,5 +1,5 @@ group = 'asys' -version = '0.2-SNAPSHOT' +version = '0.3-SNAPSHOT' apply plugin: 'osgi' diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/MCSM_WebModule.java b/mcserver-manager/src/main/java/asys/mcsmanager/MCSM_WebModule.java index 639d20a..7e14b66 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/MCSM_WebModule.java +++ b/mcserver-manager/src/main/java/asys/mcsmanager/MCSM_WebModule.java @@ -4,15 +4,15 @@ */ package asys.mcsmanager; -import asys.webinterface.api.HttpReqResp; import asys.webinterface.api.WebModule; +import com.sun.net.httpserver.HttpExchange; -import java.util.Collections; +import java.io.IOException; +import java.io.InputStream; import java.util.HashMap; -import java.util.List; import java.util.Map; -public class MCSM_WebModule implements WebModule { +public class MCSM_WebModule extends WebModule { private final String MODULE_NAME = "mcsmanager"; @Override @@ -21,24 +21,27 @@ public class MCSM_WebModule implements WebModule { } @Override - public List getStylesheetsLinks() { - return Collections.emptyList(); - } - - @Override - public List getJavaScriptLinks() { - return Collections.singletonList("/module/"+MODULE_NAME+"/module.js"); + public String getReactJSModuleLink() { + return "/"+MODULE_NAME+"/module.js"; } @Override public Map getMainMenuItems() { return new HashMap(){{ - this.put("Серверы", "/module/"+MODULE_NAME); + this.put("Серверы", "/"+MODULE_NAME); }}; } @Override - public void handle(HttpReqResp httpReqResp) { + public boolean handle(HttpExchange httpExchange) throws IOException { + String urlPath = httpExchange.getRequestURI().getPath(); + if (urlPath.equals("/"+MODULE_NAME+"/module.js")) { + InputStream stream = getClass().getResourceAsStream("/module.js"); + httpExchange.getResponseHeaders().add("Content-Type", "text/javascript;charset=utf-8"); + this.sendContent(httpExchange, 0, stream); + return true; + } + return false; } }