michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed redundant input & output streams

Browse Source
This commit is contained in:
Michael Rausch
2017-08-10 20:15:08 +12:00
parent 3ad37faedc
commit a7b8b0dbc3
1 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/ServerToClientThread.java
+30 -39
View File
@@ -1,12 +1,16 @@
package seng302.gameServer; package seng302.gameServer;
import java.io.BufferedReader; import seng302.gameServer.server.messages.*;
import java.io.ByteArrayOutputStream; import seng302.model.Player;
import java.io.IOException; import seng302.model.Yacht;
import java.io.InputStream; import seng302.model.stream.packets.PacketType;
import java.io.InputStreamReader; import seng302.model.stream.packets.StreamPacket;
import java.io.OutputStream; import seng302.model.stream.xml.generator.Race;
import seng302.model.stream.xml.generator.Regatta;
import seng302.utilities.XMLGenerator;
import java.io.*;
import java.net.Socket; import java.net.Socket;
import java.net.SocketException; import java.net.SocketException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -19,15 +23,6 @@ import java.util.stream.Collectors;
import java.util.zip.CRC32; import java.util.zip.CRC32;
import java.util.zip.Checksum; import java.util.zip.Checksum;
import seng302.gameServer.server.messages.*;
import seng302.model.Player;
import seng302.model.Yacht;
import seng302.model.stream.packets.PacketType;
import seng302.model.stream.packets.StreamPacket;
import seng302.model.stream.xml.generator.Race;
import seng302.model.stream.xml.generator.Regatta;
import seng302.utilities.XMLGenerator;
/** /**
* A class describing a single connection to a Client for the purposes of sending and receiving on * A class describing a single connection to a Client for the purposes of sending and receiving on
* its own thread. All server threads created and owned by the server thread handler which can * its own thread. All server threads created and owned by the server thread handler which can
@@ -79,30 +74,26 @@ public class ServerToClientThread implements Runnable, Observer {
String fName = ""; String fName = "";
BufferedReader ln; BufferedReader ln;
String lName = ""; String lName = "";
try {
is = socket.getInputStream(); fn = new BufferedReader(
os = socket.getOutputStream(); new InputStreamReader(
fn = new BufferedReader( ServerToClientThread.class.getResourceAsStream(
new InputStreamReader( "/server_config/CSV_Database_of_First_Names.csv"
ServerToClientThread.class.getResourceAsStream( )
"/server_config/CSV_Database_of_First_Names.csv" )
) );
) List<String> all = fn.lines().collect(Collectors.toList());
); fName = all.get(ThreadLocalRandom.current().nextInt(0, all.size()));
List<String> all = fn.lines().collect(Collectors.toList()); ln = new BufferedReader(
fName = all.get(ThreadLocalRandom.current().nextInt(0, all.size())); new InputStreamReader(
ln = new BufferedReader( ServerToClientThread.class.getResourceAsStream(
new InputStreamReader( "/server_config/CSV_Database_of_Last_Names.csv"
ServerToClientThread.class.getResourceAsStream( )
"/server_config/CSV_Database_of_Last_Names.csv" )
) );
) all = ln.lines().collect(Collectors.toList());
); lName = all.get(ThreadLocalRandom.current().nextInt(0, all.size()));
all = ln.lines().collect(Collectors.toList());
lName = all.get(ThreadLocalRandom.current().nextInt(0, all.size()));
} catch (IOException e) {
serverLog("IO error in server thread upon grabbing streams", 1);
}
Yacht yacht = new Yacht( Yacht yacht = new Yacht(
"Yacht", sourceId, sourceId.toString(), fName, fName + " " + lName, "NZ" "Yacht", sourceId, sourceId.toString(), fName, fName + " " + lName, "NZ"