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

Merge remote-tracking branch 'origin/Story29' into Story29

Browse Source
This commit is contained in:
Michael Rausch
2017-04-30 17:47:05 +12:00
parent 6491efec4c 85f461c88c
commit d07c660eb9
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/server/ServerThread.java
+12 -6
View File
@@ -3,8 +3,11 @@ package seng302.server;
import seng302.server.messages.*;
import seng302.server.simulator.Boat;
import seng302.server.simulator.Simulator;
import sun.misc.IOUtils;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.*;
@@ -56,11 +59,11 @@ public class ServerThread implements Runnable, Observer {
String fileContents = null;
try {
fileContents = new String(Files.readAllBytes(Paths.get(this.getClass().getResource(fileName).getPath().substring(1))));
InputStream thisStream = this.getClass().getResourceAsStream(fileName);
fileContents = new String(org.apache.commons.io.IOUtils.toByteArray(thisStream));
} catch (IOException e) {
e.printStackTrace();
}
catch (NullPointerException e){
} catch (NullPointerException e){
return null;
}
@@ -205,20 +208,23 @@ public class ServerThread implements Runnable, Observer {
*/
private void sendXml(){
try{
Message raceData = getXmlMessage("server_config/race.xml", XMLMessageSubType.RACE);
Message boatData = getXmlMessage("server_config/boats.xml", XMLMessageSubType.BOAT);
Message regatta = getXmlMessage("server_config/regatta.xml", XMLMessageSubType.REGATTA);
Message raceData = getXmlMessage("/server_config/race.xml", XMLMessageSubType.RACE);
Message boatData = getXmlMessage("/server_config/boats.xml", XMLMessageSubType.BOAT);
Message regatta = getXmlMessage("/server_config/regatta.xml", XMLMessageSubType.REGATTA);
if (raceData != null){
server.send(raceData);
serverLog("Sending race data", 0);
}
if (boatData != null){
server.send(boatData);
serverLog("Sending boat data", 0);
}
if (regatta != null){
server.send(regatta);
serverLog("Sending regatta data", 0);
}
} catch (IOException e) {
serverLog("Couldn't send an XML Message: " + e.getMessage(), 0);