From 5c87e8a0f818ac82490a7fd85b032b2c01fffb67 Mon Sep 17 00:00:00 2001 From: Josh Larson Date: Thu, 7 Jan 2016 15:39:09 -0600 Subject: [PATCH] Fixed warnings and removed unused code --- src/com/projectswg/ClientConnection.java | 1 - src/com/projectswg/ClientSender.java | 29 ------------------------ 2 files changed, 30 deletions(-) diff --git a/src/com/projectswg/ClientConnection.java b/src/com/projectswg/ClientConnection.java index 71577e6..84329a4 100644 --- a/src/com/projectswg/ClientConnection.java +++ b/src/com/projectswg/ClientConnection.java @@ -23,7 +23,6 @@ public class ClientConnection { interceptor = new NetInterceptor(); sender = new ClientSender(interceptor, loginPort); receiver = new ClientReceiver(interceptor); - sender.setClientReceiver(receiver); receiver.setClientSender(sender); } diff --git a/src/com/projectswg/ClientSender.java b/src/com/projectswg/ClientSender.java index defe304..a7065e0 100644 --- a/src/com/projectswg/ClientSender.java +++ b/src/com/projectswg/ClientSender.java @@ -34,7 +34,6 @@ public class ClientSender { private Queue inboundQueue; private ExecutorService executor; private ClientSenderCallback callback; - private ClientReceiver receiver; private short txSequence; private int connectionId; private int port; @@ -77,10 +76,6 @@ public class ClientSender { safeCloseServers(); } - public void setClientReceiver(ClientReceiver receiver) { - this.receiver = receiver; - } - public void setLoginCallback(UDPCallback callback) { loginServer.setCallback(callback); } @@ -149,12 +144,6 @@ public class ClientSender { } else break; } -// while (!sentPackets.isEmpty()) { -// if (sentPackets.peek().getSequence() <= sequence) -// sentPackets.poll(); -// else -// break; -// } } } @@ -213,25 +202,7 @@ public class ClientSender { } private void outboundRunnable() { -// double time = 0; -// long lastBurst = 0; -// double timeSinceBurst = 0; while (true) { -// time = receiver.getTimeSinceLastPacket(); -// timeSinceBurst = (System.nanoTime() - lastBurst) / 1E6; - // Slow: 12 Med: 8 Fast: 4 -// if (time <= timeSinceBurst || (time >= 100 && timeSinceBurst >= 1000)) { // Slow: XXX Med: 1000 Fast: 500 -// synchronized (sentPackets) { -// int sent = 0; -// for (SequencedOutbound packet : sentPackets) { -// sendRaw(port, addr, packet.getData()); -// Thread.yield(); -// if (++sent >= 500) // Slow: XXX Med: 500 Fast: infinity -// break; -// } -// } -// lastBurst = System.nanoTime(); -// } synchronized (sentPackets) { for (SequencedOutbound packet : sentPackets) { if (packet.getTimeSinceSent() >= 2000) {