From 2063429f536c9f51e51955b51b162adfd43225c8 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 11 Jun 2017 22:52:30 +0300 Subject: [PATCH] MCSM: Manager -> Linker --- .../asys/mcsmanager/{Manager.java => Linker.java} | 8 ++++---- .../main/java/asys/mcsmanager/MCSM_WebModule.java | 4 ++-- .../asys/mcsmanager/server/ServerPacketHandler.java | 12 ++++++------ .../java/asys/mcsmanager/websocket/FrameHandler.java | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) rename mcserver-manager/src/main/java/asys/mcsmanager/{Manager.java => Linker.java} (94%) diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/Manager.java b/mcserver-manager/src/main/java/asys/mcsmanager/Linker.java similarity index 94% rename from mcserver-manager/src/main/java/asys/mcsmanager/Manager.java rename to mcserver-manager/src/main/java/asys/mcsmanager/Linker.java index d8cd3ae..94be514 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/Manager.java +++ b/mcserver-manager/src/main/java/asys/mcsmanager/Linker.java @@ -11,16 +11,16 @@ import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import java.util.*; -public class Manager { - private static Manager instance = new Manager(); +public class Linker { + private static Linker instance = new Linker(); private Map serverMap = new HashMap<>(); private Map> webconsoleListeners = new HashMap<>(); - public static Manager getInstance() { + public static Linker getInstance() { return instance; } - private Manager(){ + private Linker(){ } public void addServer(String serverName, Channel channel) { 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 6ace2db..287240a 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/MCSM_WebModule.java +++ b/mcserver-manager/src/main/java/asys/mcsmanager/MCSM_WebModule.java @@ -84,7 +84,7 @@ public class MCSM_WebModule extends WebModule { if (httpExchange.getRequestURI().getQuery() != null && !httpExchange.getRequestURI().getQuery().isEmpty()) { Map query = this.queryToMap(httpExchange.getRequestURI().getQuery()); - ServerInfo serverInfo = Manager.getInstance().getServer(query.get("clientid")); + ServerInfo serverInfo = Linker.getInstance().getServer(query.get("clientid")); if (serverInfo == null) { this.sendJson(httpExchange, "{}"); } else { @@ -97,6 +97,6 @@ public class MCSM_WebModule extends WebModule { } private JsonElement serverList() { - return GSON.toJsonTree(Manager.getInstance().getServerList()); + return GSON.toJsonTree(Linker.getInstance().getServerList()); } } diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java b/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java index 3997d3a..eee34e8 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java +++ b/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java @@ -4,7 +4,7 @@ */ package asys.mcsmanager.server; -import asys.mcsmanager.Manager; +import asys.mcsmanager.Linker; import asys.mcsmanager.packets.*; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; @@ -58,7 +58,7 @@ class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacke @Override public void channelInactive(ChannelHandlerContext context) throws Exception { - Manager.getInstance().removeServer(context.channel().attr(CLIENTID).get()); + Linker.getInstance().removeServer(context.channel().attr(CLIENTID).get()); super.channelInactive(context); } @@ -82,14 +82,14 @@ class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacke return; } - if (Manager.getInstance().existsServer(packet.getClientId())) { + if (Linker.getInstance().existsServer(packet.getClientId())) { try { context.channel().writeAndFlush(HandshakeResult.CLIENTID_EXISTS).sync().channel().close(); } catch (InterruptedException ignore) { } return; } else { - Manager.getInstance().addServer(packet.getClientId(), context.channel()); + Linker.getInstance().addServer(packet.getClientId(), context.channel()); } context.channel().write(HandshakeResult.OK); @@ -100,10 +100,10 @@ class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacke } private void handleCSPing(CS_Ping packet, ChannelHandlerContext context) { - Manager.getInstance().getServer(context.channel().attr(CLIENTID).get()).putPing(packet); + Linker.getInstance().getServer(context.channel().attr(CLIENTID).get()).putPing(packet); } private void handleCSConsoleMessage(String serverName, CS_ConsoleMessage packet) { - Manager.getInstance().broadcastConsoleMessage(serverName, packet); + Linker.getInstance().broadcastConsoleMessage(serverName, packet); } } diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/websocket/FrameHandler.java b/mcserver-manager/src/main/java/asys/mcsmanager/websocket/FrameHandler.java index 2b96750..9c8dde8 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/websocket/FrameHandler.java +++ b/mcserver-manager/src/main/java/asys/mcsmanager/websocket/FrameHandler.java @@ -4,7 +4,7 @@ */ package asys.mcsmanager.websocket; -import asys.mcsmanager.Manager; +import asys.mcsmanager.Linker; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; @@ -19,7 +19,7 @@ public class FrameHandler extends SimpleChannelInboundHandler { @Override public void channelInactive(ChannelHandlerContext ctx) throws Exception { - Manager.getInstance().removeWebconsoleListener(ctx.channel().attr(WC_SERVERNAME).get(), ctx.channel()); + Linker.getInstance().removeWebconsoleListener(ctx.channel().attr(WC_SERVERNAME).get(), ctx.channel()); } @Override @@ -29,10 +29,10 @@ public class FrameHandler extends SimpleChannelInboundHandler { if (requestText.startsWith("]")) { String serverName = requestText.substring(1); ctx.channel().attr(WC_SERVERNAME).set(serverName); - Manager.getInstance().addWebconsoleListener(serverName, ctx.channel()); + Linker.getInstance().addWebconsoleListener(serverName, ctx.channel()); } else if (requestText.startsWith(":")) { String command = requestText.substring(1); - Manager.getInstance().sendCommand(ctx.channel().attr(WC_SERVERNAME).get(), command); + Linker.getInstance().sendCommand(ctx.channel().attr(WC_SERVERNAME).get(), command); } } else { logger.warn("unsupport frame type: {}", frame.getClass().getName());