From 63ee51d938931fad1d7a1ea19462f4b7baa810fd Mon Sep 17 00:00:00 2001 From: Erika Savell Date: Mon, 1 May 2017 20:19:07 +1200 Subject: [PATCH] Fixed compoundMarkID typo that was causing a parse int exception - All that was needed was capitalizing the D in ID in the parser #story[782] --- mock/src/main/java/seng302/Data/RaceData.java | 3 ++- mock/src/main/java/seng302/MockOutput.java | 2 +- .../src/main/java/seng302/Mock/StreamedCourseXMLReader.java | 3 +-- visualiser/src/main/java/seng302/VisualiserInput.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mock/src/main/java/seng302/Data/RaceData.java b/mock/src/main/java/seng302/Data/RaceData.java index f286fad0..4aa34d36 100644 --- a/mock/src/main/java/seng302/Data/RaceData.java +++ b/mock/src/main/java/seng302/Data/RaceData.java @@ -179,7 +179,8 @@ public class RaceData { */ private Element createCompoundMarker(Marker marker, int i) { Element compoundMarkElement = doc.createElement("CompoundMark"); - compoundMarkElement.setAttribute("CompoundMarkId", i + ""); + System.out.println("CompoundMark, " + i); + compoundMarkElement.setAttribute("CompoundMarkID", i + ""); compoundMarkElement.setAttribute("Name", marker.getName()); compoundMarkElement.appendChild(createMark(marker.getMark1())); diff --git a/mock/src/main/java/seng302/MockOutput.java b/mock/src/main/java/seng302/MockOutput.java index ead68b09..f13080f6 100644 --- a/mock/src/main/java/seng302/MockOutput.java +++ b/mock/src/main/java/seng302/MockOutput.java @@ -44,7 +44,7 @@ public class MockOutput implements Runnable public MockOutput() throws IOException { lastHeartbeatTime = System.currentTimeMillis(); - serverSocket = new ServerSocket(4945); + serverSocket = new ServerSocket(4942); } /** * calculates the time since last heartbeat diff --git a/visualiser/src/main/java/seng302/Mock/StreamedCourseXMLReader.java b/visualiser/src/main/java/seng302/Mock/StreamedCourseXMLReader.java index 7effcbda..b11c987b 100644 --- a/visualiser/src/main/java/seng302/Mock/StreamedCourseXMLReader.java +++ b/visualiser/src/main/java/seng302/Mock/StreamedCourseXMLReader.java @@ -161,8 +161,7 @@ public class StreamedCourseXMLReader extends XMLReader { * @return value of "compoundMarkID" attribute */ private int getCompoundMarkID(Element element) { - //return Integer.parseInt(element.getAttribute("CompoundMarkID")); - return 3; + return Integer.parseInt(element.getAttribute("CompoundMarkID")); } /** diff --git a/visualiser/src/main/java/seng302/VisualiserInput.java b/visualiser/src/main/java/seng302/VisualiserInput.java index 1fe0ab0b..08b69b2f 100644 --- a/visualiser/src/main/java/seng302/VisualiserInput.java +++ b/visualiser/src/main/java/seng302/VisualiserInput.java @@ -43,7 +43,7 @@ public class VisualiserInput implements Runnable public VisualiserInput(StreamedCourse course) throws IOException{ - this.connectionSocket = new Socket(InetAddress.getLocalHost(), 4945); + this.connectionSocket = new Socket(InetAddress.getLocalHost(), 4942); // this.connectionSocket = new Socket("livedata.americascup.com",4941); this.course = course;