From 96e339bc4a987ce73b0d05b5167d6b273b726434 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sun, 21 Apr 2013 12:08:32 +0000 Subject: [PATCH] remove unused classes or imports --- .gitattributes | 1 - .../net/client/state/ConnectedClientState.java | 6 ++---- .../forge/net/protocol/ClientProtocolJson.java | 5 +---- .../protocol/toserver/UnknownPacketSrv.java | 18 ------------------ 4 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 src/main/java/forge/net/protocol/toserver/UnknownPacketSrv.java diff --git a/.gitattributes b/.gitattributes index 59f27d1e79b..3bc5abeaf91 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14337,7 +14337,6 @@ src/main/java/forge/net/protocol/toserver/ChatPacketSrv.java -text src/main/java/forge/net/protocol/toserver/EchoPacketSrv.java -text src/main/java/forge/net/protocol/toserver/IPacketSrv.java -text src/main/java/forge/net/protocol/toserver/IncorrectPacketSrv.java -text -src/main/java/forge/net/protocol/toserver/UnknownPacketSrv.java -text src/main/java/forge/net/protocol/toserver/package-info.java -text src/main/java/forge/package-info.java svneol=native#text/plain src/main/java/forge/properties/ForgePreferences.java svneol=native#text/plain diff --git a/src/main/java/forge/net/client/state/ConnectedClientState.java b/src/main/java/forge/net/client/state/ConnectedClientState.java index 7336ac4f5a3..38350cdeeb2 100644 --- a/src/main/java/forge/net/client/state/ConnectedClientState.java +++ b/src/main/java/forge/net/client/state/ConnectedClientState.java @@ -21,13 +21,11 @@ public class ConnectedClientState implements IClientState { @Override public boolean processPacket(IPacketSrv packet ) { if( packet instanceof EchoPacketSrv) { - EchoPacketSrv pe = (EchoPacketSrv)packet; - client.send(new EchoPacketClt(pe.getMessage())); + client.send(new EchoPacketClt(((EchoPacketSrv)packet).getMessage())); return true; } if( packet instanceof IncorrectPacketSrv) { - IncorrectPacketSrv pi = (IncorrectPacketSrv)packet; - client.send(new ErrorIncorrectPacketClt(pi.getMessage())); + client.send(new ErrorIncorrectPacketClt(((IncorrectPacketSrv)packet).getMessage())); return true; } diff --git a/src/main/java/forge/net/protocol/ClientProtocolJson.java b/src/main/java/forge/net/protocol/ClientProtocolJson.java index 75e436f52bb..a2befb70745 100644 --- a/src/main/java/forge/net/protocol/ClientProtocolJson.java +++ b/src/main/java/forge/net/protocol/ClientProtocolJson.java @@ -7,8 +7,6 @@ import org.apache.commons.lang3.StringUtils; import com.google.gson.Gson; import com.google.gson.JsonParseException; -import com.google.gson.JsonSyntaxException; - import forge.net.protocol.toclient.AuthResultPacketClt; import forge.net.protocol.toclient.ChatPacketClt; import forge.net.protocol.toclient.EchoPacketClt; @@ -20,7 +18,6 @@ import forge.net.protocol.toserver.ChatPacketSrv; import forge.net.protocol.toserver.EchoPacketSrv; import forge.net.protocol.toserver.IPacketSrv; import forge.net.protocol.toserver.IncorrectPacketSrv; -import forge.net.protocol.toserver.UnknownPacketSrv; import forge.util.TextUtil; /** @@ -64,7 +61,7 @@ public class ClientProtocolJson implements ClientProtocol 1 ? parts[1] : null; if ( StringUtils.isBlank(args) ) args = "{}"; // assume default empty object - + try { return gson.fromJson(parts[1].trim(), packetClass); } catch( JsonParseException ex ) { diff --git a/src/main/java/forge/net/protocol/toserver/UnknownPacketSrv.java b/src/main/java/forge/net/protocol/toserver/UnknownPacketSrv.java deleted file mode 100644 index e5942dc12a3..00000000000 --- a/src/main/java/forge/net/protocol/toserver/UnknownPacketSrv.java +++ /dev/null @@ -1,18 +0,0 @@ -package forge.net.protocol.toserver; - - -/** - * TODO: Write javadoc for this type. - * - */ -public class UnknownPacketSrv implements IPacketSrv { - - private final String message; - public UnknownPacketSrv(String data) { - message = data; - } - public String getMessage() { - return message; - } - -}