From a2f7587b8d90a5d2f2bcc6802ebb4e9493f832a8 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 29 Jul 2017 12:16:19 +0300 Subject: [PATCH] Renamed WebSocketServer to WebServer --- Plan/src/main/java/com/djrapitops/plan/Plan.java | 8 ++++---- Plan/src/main/java/com/djrapitops/plan/api/API.java | 6 +++--- .../ui/webserver/{WebSocketServer.java => WebServer.java} | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) rename Plan/src/main/java/com/djrapitops/plan/ui/webserver/{WebSocketServer.java => WebServer.java} (99%) diff --git a/Plan/src/main/java/com/djrapitops/plan/Plan.java b/Plan/src/main/java/com/djrapitops/plan/Plan.java index 31b566431..7921b7346 100644 --- a/Plan/src/main/java/com/djrapitops/plan/Plan.java +++ b/Plan/src/main/java/com/djrapitops/plan/Plan.java @@ -37,7 +37,7 @@ import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.database.databases.MySQLDB; import main.java.com.djrapitops.plan.database.databases.SQLiteDB; import main.java.com.djrapitops.plan.ui.html.Html; -import main.java.com.djrapitops.plan.ui.webserver.WebSocketServer; +import main.java.com.djrapitops.plan.ui.webserver.WebServer; import main.java.com.djrapitops.plan.utilities.Benchmark; import main.java.com.djrapitops.plan.utilities.Check; import main.java.com.djrapitops.plan.utilities.MiscUtils; @@ -73,7 +73,7 @@ public class Plan extends BukkitPlugin { private Database db; private HashSet databases; - private WebSocketServer uiServer; + private WebServer uiServer; private ServerVariableHolder serverVariableHolder; private int bootAnalysisTaskID = -1; @@ -180,7 +180,7 @@ public class Plan extends BukkitPlugin { boolean hasDataViewCapability = usingAlternativeIP || usingAlternativeUI || webserverIsEnabled; if (webserverIsEnabled) { - uiServer = new WebSocketServer(this); + uiServer = new WebServer(this); uiServer.initServer(); if (!uiServer.isEnabled()) { Log.error("WebServer was not Initialized."); @@ -471,7 +471,7 @@ public class Plan extends BukkitPlugin { * * @return the Webserver */ - public WebSocketServer getUiServer() { + public WebServer getUiServer() { return uiServer; } diff --git a/Plan/src/main/java/com/djrapitops/plan/api/API.java b/Plan/src/main/java/com/djrapitops/plan/api/API.java index 3ede27bb2..f3405c5a1 100644 --- a/Plan/src/main/java/com/djrapitops/plan/api/API.java +++ b/Plan/src/main/java/com/djrapitops/plan/api/API.java @@ -12,7 +12,7 @@ import main.java.com.djrapitops.plan.data.additional.PluginData; import main.java.com.djrapitops.plan.data.cache.DBCallableProcessor; import main.java.com.djrapitops.plan.data.handling.info.HandlingInfo; import main.java.com.djrapitops.plan.ui.html.DataRequestHandler; -import main.java.com.djrapitops.plan.ui.webserver.WebSocketServer; +import main.java.com.djrapitops.plan.ui.webserver.WebServer; import main.java.com.djrapitops.plan.utilities.HtmlUtils; import java.sql.SQLException; @@ -173,7 +173,7 @@ public class API { * @return player.html with all placeholders replaced. */ public String getPlayerHtmlAsString(UUID uuid) { - WebSocketServer server = plugin.getUiServer(); + WebServer server = plugin.getUiServer(); if (Verify.notNull(server)) { return server.getDataReqHandler().getInspectHtml(uuid); } @@ -208,7 +208,7 @@ public class API { * @return analysis.html with all placeholders replaced. */ public String getAnalysisHtmlAsString() { - WebSocketServer server = plugin.getUiServer(); + WebServer server = plugin.getUiServer(); if (Verify.notNull(server)) { return server.getDataReqHandler().getAnalysisHtml(); } diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebSocketServer.java b/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java similarity index 99% rename from Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebSocketServer.java rename to Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java index d3168981f..db02cbfe5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebSocketServer.java +++ b/Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java @@ -31,7 +31,7 @@ import java.util.concurrent.Executors; /** * @author Rsl1122 */ -public class WebSocketServer { +public class WebServer { private final Plan plugin; private final DataRequestHandler dataReqHandler; @@ -47,7 +47,7 @@ public class WebSocketServer { * * @param plugin Current instance of Plan */ - public WebSocketServer(Plan plugin) { + public WebServer(Plan plugin) { this.plugin = plugin; this.port = Settings.WEBSERVER_PORT.getNumber(); shutdown = false;