diff --git a/.gitignore b/.gitignore index ede3b67f..48326a70 100644 --- a/.gitignore +++ b/.gitignore @@ -182,3 +182,4 @@ local.properties # IntelliJDEA ignore *.iml +dedicatedServer/.idea/ diff --git a/mock/pom.xml b/dedicatedServer/pom.xml similarity index 94% rename from mock/pom.xml rename to dedicatedServer/pom.xml index 3c7b899b..8702f4f9 100644 --- a/mock/pom.xml +++ b/dedicatedServer/pom.xml @@ -4,20 +4,21 @@ seng302 team-7 - 1.0-SNAPSHOT + 2.0 jar - mock - mock - 1.0-SNAPSHOT + dedicatedServer + dedicatedServer + 2.0 + seng302 racevisionGame - 1.0-SNAPSHOT + 2.0 @@ -44,7 +45,7 @@ - mock.app.App + visualiser.app.App ${maven.compiler.source} ${maven.compiler.target} diff --git a/dedicatedServer/src/main/java/app/App.java b/dedicatedServer/src/main/java/app/App.java new file mode 100644 index 00000000..34ee2c5b --- /dev/null +++ b/dedicatedServer/src/main/java/app/App.java @@ -0,0 +1,36 @@ +package app; + + +import javafx.application.Application; +import javafx.stage.Stage; +import mock.app.Event; + +import java.util.logging.Level; +import java.util.logging.Logger; + + +public class App extends Application { + + + public static void main(String[] args) { + launch(args); + } + + + @Override + public void start(Stage primaryStage) { + try { + //TODO should read a configuration file to configure server? + Event raceEvent = new Event(false); + + + } catch (Exception e) { + //Catch all exceptions, print, and exit. + Logger.getGlobal().log(Level.SEVERE, "Could not start dedicated server!", e); + System.exit(1); + } + } + + + +} diff --git a/mock/doc/design_decisions.md b/mock/doc/design_decisions.md deleted file mode 100644 index e9421fa2..00000000 --- a/mock/doc/design_decisions.md +++ /dev/null @@ -1,2 +0,0 @@ -# Design Decisions - diff --git a/mock/doc/examples/examples.md b/mock/doc/examples/examples.md deleted file mode 100644 index 994f4e89..00000000 --- a/mock/doc/examples/examples.md +++ /dev/null @@ -1,7 +0,0 @@ -# Examples - -You should also include example data files for your application that demonstrate the -features of your application. These should contain adequate amounts of data that -would be expected from actual use of your application. - -This file should provide a basic overview of the example files available. diff --git a/mock/doc/user_manual.md b/mock/doc/user_manual.md deleted file mode 100644 index 7c571c01..00000000 --- a/mock/doc/user_manual.md +++ /dev/null @@ -1 +0,0 @@ -# User Manual \ No newline at end of file diff --git a/network/pom.xml b/network/pom.xml deleted file mode 100644 index 8d9b6324..00000000 --- a/network/pom.xml +++ /dev/null @@ -1,140 +0,0 @@ - - 4.0.0 - - seng302 - team-7 - 1.0-SNAPSHOT - - - jar - network - network - 1.0-SNAPSHOT - - - - - - junit - junit - 4.12 - test - - - - - - - org.mockito - mockito-all - 1.9.5 - - - - - - org.testng - testng - 6.11 - test - - - - - - - - maven2-repository.dev.java.net - Java.net repository - http://download.java.net/maven/2 - - - - - - 1.8 - 1.8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.3 - - - - - seng302.App - ${maven.compiler.source} - ${maven.compiler.target} - - - - - - - package - - shade - - - - - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.5 - - - org.apache.maven.plugins - maven-pmd-plugin - 3.6 - - true - ${maven.compiler.target} - - /rulesets/java/basic.xml - /rulesets/java/imports.xml - /rulesets/java/codesize.xml - /rulesets/java/design.xml - /rulesets/java/empty.xml - /rulesets/java/junit.xml - /rulesets/java/unusedcode.xml - - true - utf-8 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.19.1 - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.8.1 - - - - diff --git a/pom.xml b/pom.xml index 444c0faa..4f4983fc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,12 @@ seng302 team-7 pom - 1.0-SNAPSHOT + 2.0 team-7 racevisionGame - mock - visualiser - network + dedicatedServer https://eng-git.canterbury.ac.nz/SENG302-2016/team-7 diff --git a/racevisionGame/pom.xml b/racevisionGame/pom.xml index 958bdfd7..16afe756 100644 --- a/racevisionGame/pom.xml +++ b/racevisionGame/pom.xml @@ -4,13 +4,13 @@ seng302 team-7 - 1.0-SNAPSHOT + 2.0 jar racevisionGame racevisionGame - 1.0-SNAPSHOT + 2.0 diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java index 228534c2..c054e2fb 100644 --- a/racevisionGame/src/main/java/mock/app/Event.java +++ b/racevisionGame/src/main/java/mock/app/Event.java @@ -90,22 +90,15 @@ public class Event { //Read XML files. try { - this.raceXML = RaceXMLCreator.alterRaceToWind(raceXMLFile, 90); + //this.raceXML = RaceXMLCreator.alterRaceToWind(raceXMLFile, 90); + this.raceXML = XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8); + this.raceXML = Event.setRaceXMLAtCurrentTimeToNow(XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8)); + this.boatXML = XMLReader.readXMLFileToString(boatsXMLFile, StandardCharsets.UTF_8); this.regattaXML = XMLReader.readXMLFileToString(regattaXMLFile, StandardCharsets.UTF_8); } catch (XMLReaderException e) { throw new EventConstructionException("Could not read XML files.", e); - } catch (IOException e) { - e.printStackTrace(); - } catch (ParserConfigurationException e) { - e.printStackTrace(); - } catch (SAXException e) { - e.printStackTrace(); - } catch (InvalidRaceDataException e) { - e.printStackTrace(); - } catch (JAXBException e) { - e.printStackTrace(); } this.xmlFileType = XMLFileType.Contents; @@ -178,13 +171,6 @@ public class Event { - /** - * Sends the initial race data and then begins race simulation. - */ - public void start() { - - - } /** * Sends out each xml string, via the mock output @@ -197,4 +183,29 @@ public class Event { connectionAcceptor.setBoatsXml(boatXML); } -} \ No newline at end of file + + + //TODO remove this after demo on 18th august! + /** + * Sets the xml description of the race to show the race was created now, and starts in 4 minutes + * @param raceXML The race.xml contents. + * @return String containing edited xml + */ + public static String setRaceXMLAtCurrentTimeToNow(String raceXML) { + + //The start time is current time + 4 minutes. prestart is 3 minutes, and we add another minute. + long millisecondsToAdd = Constants.RacePreStartTime + (1 * 60 * 1000); + long secondsToAdd = millisecondsToAdd / 1000; + //Scale the time using our time scalar. + secondsToAdd = secondsToAdd / Constants.RaceTimeScale; + + DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssZ"); + ZonedDateTime creationTime = ZonedDateTime.now(); + raceXML = raceXML.replace("RACE_CREATION_TIME", dateFormat.format(creationTime)); + raceXML = raceXML.replace("RACE_START_TIME", dateFormat.format(creationTime.plusSeconds(secondsToAdd))); + + + return raceXML; + } + +} diff --git a/racevisionGame/src/main/java/mock/app/MockOutput.java b/racevisionGame/src/main/java/mock/app/MockOutput.java index 63ff1dd1..68136ea0 100644 --- a/racevisionGame/src/main/java/mock/app/MockOutput.java +++ b/racevisionGame/src/main/java/mock/app/MockOutput.java @@ -101,8 +101,6 @@ public class MockOutput implements RunnableWithFramePeriod { Logger.getGlobal().log(Level.WARNING, "MockOutput.run() interrupted while putting message in queue.", e); Thread.currentThread().interrupt(); return; - } catch (Exception e) { - e.printStackTrace(); } } diff --git a/racevisionGame/src/main/java/mock/model/HeartBeatService.java b/racevisionGame/src/main/java/mock/model/HeartBeatService.java index 88544340..4e75466a 100644 --- a/racevisionGame/src/main/java/mock/model/HeartBeatService.java +++ b/racevisionGame/src/main/java/mock/model/HeartBeatService.java @@ -92,11 +92,8 @@ public class HeartBeatService implements RunnableWithFramePeriod { while (!Thread.interrupted()) { long currentFrameTime = System.currentTimeMillis(); - try { - waitForFramePeriod(lastHeartbeatTime, currentFrameTime, heartbeatPeriod); - } catch (Exception e) { - e.printStackTrace(); - } + waitForFramePeriod(lastHeartbeatTime, currentFrameTime, heartbeatPeriod); + lastHeartbeatTime = currentFrameTime; try { diff --git a/racevisionGame/src/main/java/mock/model/RaceLogic.java b/racevisionGame/src/main/java/mock/model/RaceLogic.java index 60dca0d0..5b35d449 100644 --- a/racevisionGame/src/main/java/mock/model/RaceLogic.java +++ b/racevisionGame/src/main/java/mock/model/RaceLogic.java @@ -50,17 +50,9 @@ public class RaceLogic implements RunnableWithFramePeriod, Observer { public void run() { race.initialiseBoats(); - try { - countdown(); - } catch (Exception e) { - e.printStackTrace(); - } + countdown(); - try { - raceLoop(); - } catch (Exception e) { - e.printStackTrace(); - } + raceLoop(); } public void boolFalse(){ @@ -71,7 +63,7 @@ public class RaceLogic implements RunnableWithFramePeriod, Observer { /** * Countdown timer until race starts. */ - private void countdown() throws Exception { + private void countdown() { long previousFrameTime = System.currentTimeMillis(); @@ -110,7 +102,7 @@ public class RaceLogic implements RunnableWithFramePeriod, Observer { /** * Timer that runs for the duration of the race, until all boats finish. */ - private void raceLoop() throws Exception { + private void raceLoop() { long previousFrameTime = System.currentTimeMillis(); @@ -199,4 +191,4 @@ public class RaceLogic implements RunnableWithFramePeriod, Observer { // else if(e.getBearing().degrees() > 270) System.out.println("Port"); // else System.out.println("Behind"); } -} \ No newline at end of file +} diff --git a/racevisionGame/src/main/java/network/StreamRelated/MessageSerialiser.java b/racevisionGame/src/main/java/network/StreamRelated/MessageSerialiser.java index de165402..84bddf78 100644 --- a/racevisionGame/src/main/java/network/StreamRelated/MessageSerialiser.java +++ b/racevisionGame/src/main/java/network/StreamRelated/MessageSerialiser.java @@ -93,11 +93,7 @@ public class MessageSerialiser implements RunnableWithFramePeriod { long currentFrameTime = System.currentTimeMillis(); - try { - waitForFramePeriod(previousFrameTime, currentFrameTime, 16); - } catch (Exception e) { - e.printStackTrace(); - } + waitForFramePeriod(previousFrameTime, currentFrameTime, 16); previousFrameTime = currentFrameTime; diff --git a/racevisionGame/src/main/java/shared/model/CompoundMark.java b/racevisionGame/src/main/java/shared/model/CompoundMark.java index e7c6c1af..4fa2599c 100644 --- a/racevisionGame/src/main/java/shared/model/CompoundMark.java +++ b/racevisionGame/src/main/java/shared/model/CompoundMark.java @@ -142,7 +142,7 @@ public class CompoundMark extends XMLCompoundMark{ /** * Used to find how far apart the marks that make up this gate are - * If this compound mark is only one point return base length of 250m + * If this compound mark is only one point return base length of 400m * @return the acceptable distance to round a mark */ public double getRoundingDistance(){ @@ -187,7 +187,7 @@ public class CompoundMark extends XMLCompoundMark{ } //finds the mark furthest west and east - if(this.getMark1Position().getLatitude() > this.getMark2Position().getLatitude()){ + if(this.getMark1Position().getLongitude() > this.getMark2Position().getLongitude()){ westMostMark = this.mark1; eastMostMark = this.mark2; }else{ @@ -196,7 +196,7 @@ public class CompoundMark extends XMLCompoundMark{ } //finds the mark furthest north and south - if(this.getMark1Position().getLongitude() > this.getMark2Position().getLongitude()){ + if(this.getMark1Position().getLatitude() > this.getMark2Position().getLatitude()){ northMostMark = this.mark1; southMostMark = this.mark2; }else{ diff --git a/racevisionGame/src/main/java/shared/model/RunnableWithFramePeriod.java b/racevisionGame/src/main/java/shared/model/RunnableWithFramePeriod.java index 10667eca..9a6910fa 100644 --- a/racevisionGame/src/main/java/shared/model/RunnableWithFramePeriod.java +++ b/racevisionGame/src/main/java/shared/model/RunnableWithFramePeriod.java @@ -20,8 +20,7 @@ public interface RunnableWithFramePeriod extends Runnable { * @param currentFrameTime The timestamp of the current frame. * @param minimumFramePeriod The minimum period the frame must be. */ - default void waitForFramePeriod(long previousFrameTime, long currentFrameTime, long minimumFramePeriod) throws Exception { - + default void waitForFramePeriod(long previousFrameTime, long currentFrameTime, long minimumFramePeriod) { //This is the time elapsed, in milliseconds, since the last server "frame". long framePeriod = currentFrameTime - previousFrameTime; @@ -39,10 +38,10 @@ public interface RunnableWithFramePeriod extends Runnable { } catch (InterruptedException e) { //If we get interrupted, exit the function. - /*Logger.getGlobal().log(Level.SEVERE, "RunnableWithFramePeriod.waitForFramePeriod().sleep(framePeriod) was interrupted on thread: " + Thread.currentThread(), e); + //Logger.getGlobal().log(Level.WARNING, "RunnableWithFramePeriod.waitForFramePeriod().sleep(framePeriod) was interrupted on thread: " + Thread.currentThread(), e); //Re-set the interrupt flag. Thread.currentThread().interrupt(); - return;*/ + return; } diff --git a/racevisionGame/src/main/java/visualiser/Controllers/ArrowController.java b/racevisionGame/src/main/java/visualiser/Controllers/ArrowController.java index ab9bd421..eb5d001d 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/ArrowController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/ArrowController.java @@ -136,12 +136,8 @@ public class ArrowController { * @param bearing The bearing to use to rotate arrow. */ private void updateWindBearing(Bearing bearing) { - - //We need to display wind-from, so add 180 degrees. - Bearing fromBearing = Bearing.fromDegrees(bearing.degrees() + 180d); - //Rotate the wind arrow. - arrowStackPane.setRotate(fromBearing.degrees()); + arrowStackPane.setRotate(bearing.degrees()); } diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java index c947aa2c..1609e700 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java @@ -49,7 +49,6 @@ public class HostController extends Controller { public void hostGamePressed() throws IOException{ try { this.game = new Event(false); - game.start(); connectSocket("localhost", 4942); } catch (EventConstructionException e) { Logger.getGlobal().log(Level.SEVERE, "Could not create Event.", e); diff --git a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java index 32e033c8..45ab295d 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java @@ -1,12 +1,18 @@ package visualiser.Controllers; +import javafx.animation.AnimationTimer; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; +import javafx.scene.Group; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.RadioButton; import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.Pane; +import javafx.scene.shape.Box; +import javafx.scene.shape.CullFace; +import javafx.scene.transform.Rotate; import javafx.stage.Modality; import javafx.stage.Stage; import visualiser.app.App; @@ -32,6 +38,8 @@ public class TitleController extends Controller { @FXML RadioButton nightModeRD; + Group group3d; + /** * Method called when the 'host a game' button is pressed. * Opens the next window allowing a user to host their own game. @@ -81,7 +89,31 @@ public class TitleController extends Controller { @Override public void initialize(URL location, ResourceBundle resources) { + System.out.println("Initializing..."); + + Box box = new Box(50,50,50); + box.setTranslateX(100); + box.setTranslateY(100); + box.setCullFace(CullFace.BACK); + + Rotate ry = new Rotate(0, 0,0,0, Rotate.Y_AXIS); + Rotate rx = new Rotate(20, 0, 0, 0, Rotate.X_AXIS); + box.getTransforms().add(ry); + box.getTransforms().add(rx); + + group3d = new Group(box); + + titleWrapper.getChildren().add(0, group3d); + group3d.toFront(); + + AnimationTimer rotation = new AnimationTimer() { + @Override + public void handle(long now) { + ry.setAngle(ry.getAngle() + 0.1); + } + }; + rotation.start(); } /** diff --git a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java index 11d66f7c..fc6a0858 100644 --- a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java +++ b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java @@ -3,7 +3,6 @@ package visualiser.model; import javafx.scene.image.Image; import javafx.scene.paint.Color; -import javafx.scene.paint.LinearGradient; import javafx.scene.paint.Paint; import javafx.scene.text.Font; import javafx.scene.transform.Rotate; @@ -13,7 +12,6 @@ import shared.enums.RoundingType; import shared.model.*; import java.util.ArrayList; -import java.util.Arrays; import java.util.Comparator; import java.util.List; @@ -735,6 +733,9 @@ public class ResizableRaceCanvas extends ResizableCanvas { gc.save(); + gc.setLineWidth(2); + gc.setStroke(Color.MEDIUMAQUAMARINE); + gc.beginPath(); gc.moveTo(startPath.getX(), startPath.getY()); gc.lineTo(endPath.getX(), endPath.getY()); diff --git a/racevisionGame/src/main/java/visualiser/model/VisualiserRaceService.java b/racevisionGame/src/main/java/visualiser/model/VisualiserRaceService.java index e08f1463..316ecc5a 100644 --- a/racevisionGame/src/main/java/visualiser/model/VisualiserRaceService.java +++ b/racevisionGame/src/main/java/visualiser/model/VisualiserRaceService.java @@ -68,13 +68,7 @@ public class VisualiserRaceService implements RunnableWithFramePeriod { while (!Thread.interrupted()) { long currentFrameTime = System.currentTimeMillis(); - - try { - waitForFramePeriod(previousFrameTime, currentFrameTime, 16); - } catch (Exception e) { - e.printStackTrace(); - } - + waitForFramePeriod(previousFrameTime, currentFrameTime, 16); previousFrameTime = currentFrameTime; diff --git a/racevisionGame/src/main/java/visualiser/network/ServerConnection.java b/racevisionGame/src/main/java/visualiser/network/ServerConnection.java index b0266962..5d6d8773 100644 --- a/racevisionGame/src/main/java/visualiser/network/ServerConnection.java +++ b/racevisionGame/src/main/java/visualiser/network/ServerConnection.java @@ -330,11 +330,8 @@ public class ServerConnection implements RunnableWithFramePeriod { while (!Thread.interrupted()) { long currentFrameTime = System.currentTimeMillis(); - try { - waitForFramePeriod(previousFrameTime, currentFrameTime, 100); - } catch (Exception e) { - e.printStackTrace(); - } + waitForFramePeriod(previousFrameTime, currentFrameTime, 100); + previousFrameTime = currentFrameTime; diff --git a/racevisionGame/src/main/resources/mock/mockXML/raceSinglePlayer.xml b/racevisionGame/src/main/resources/mock/mockXML/raceSinglePlayer.xml index f939b16d..e9e9378a 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/raceSinglePlayer.xml +++ b/racevisionGame/src/main/resources/mock/mockXML/raceSinglePlayer.xml @@ -2,8 +2,8 @@ 5326 FLEET - 2017-08-03T02:13:14+1200 - + RACE_CREATION_TIME + diff --git a/racevisionGame/src/main/resources/mock/mockXML/raceTest.xml b/racevisionGame/src/main/resources/mock/mockXML/raceTest.xml index 761b9b91..ad14d931 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/raceTest.xml +++ b/racevisionGame/src/main/resources/mock/mockXML/raceTest.xml @@ -2,8 +2,8 @@ 5326 FLEET - 2017-08-03T02:13:14+1200 - + RACE_CREATION_TIME + diff --git a/racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml b/racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml new file mode 100644 index 00000000..e0b81837 --- /dev/null +++ b/racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml @@ -0,0 +1,54 @@ + + + 5326 + FLEET + RACE_CREATION_TIME + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/visualiser/.idea/compiler.xml b/visualiser/.idea/compiler.xml deleted file mode 100644 index 4feb7dd4..00000000 --- a/visualiser/.idea/compiler.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__com_beust_jcommander_1_64.xml b/visualiser/.idea/libraries/Maven__com_beust_jcommander_1_64.xml deleted file mode 100644 index e72647cc..00000000 --- a/visualiser/.idea/libraries/Maven__com_beust_jcommander_1_64.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__com_github_bfsmith_geotimezone_1_0_3.xml b/visualiser/.idea/libraries/Maven__com_github_bfsmith_geotimezone_1_0_3.xml deleted file mode 100644 index 70fc370b..00000000 --- a/visualiser/.idea/libraries/Maven__com_github_bfsmith_geotimezone_1_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__com_spatial4j_spatial4j_0_4_1.xml b/visualiser/.idea/libraries/Maven__com_spatial4j_spatial4j_0_4_1.xml deleted file mode 100644 index e70d84d7..00000000 --- a/visualiser/.idea/libraries/Maven__com_spatial4j_spatial4j_0_4_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/visualiser/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml deleted file mode 100644 index ab207212..00000000 --- a/visualiser/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__java3d_vecmath_1_3_2.xml b/visualiser/.idea/libraries/Maven__java3d_vecmath_1_3_2.xml deleted file mode 100644 index 1eebe0af..00000000 --- a/visualiser/.idea/libraries/Maven__java3d_vecmath_1_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__javax_media_jai_core_1_1_3.xml b/visualiser/.idea/libraries/Maven__javax_media_jai_core_1_1_3.xml deleted file mode 100644 index d8609e87..00000000 --- a/visualiser/.idea/libraries/Maven__javax_media_jai_core_1_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__jgridshift_jgridshift_1_0.xml b/visualiser/.idea/libraries/Maven__jgridshift_jgridshift_1_0.xml deleted file mode 100644 index b7ad97c6..00000000 --- a/visualiser/.idea/libraries/Maven__jgridshift_jgridshift_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__joda_time_joda_time_2_7.xml b/visualiser/.idea/libraries/Maven__joda_time_joda_time_2_7.xml deleted file mode 100644 index 1259ecab..00000000 --- a/visualiser/.idea/libraries/Maven__joda_time_joda_time_2_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__junit_junit_4_12.xml b/visualiser/.idea/libraries/Maven__junit_junit_4_12.xml deleted file mode 100644 index d4110417..00000000 --- a/visualiser/.idea/libraries/Maven__junit_junit_4_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__net_java_dev_jsr_275_jsr_275_1_0_beta_2.xml b/visualiser/.idea/libraries/Maven__net_java_dev_jsr_275_jsr_275_1_0_beta_2.xml deleted file mode 100644 index bf5f49be..00000000 --- a/visualiser/.idea/libraries/Maven__net_java_dev_jsr_275_jsr_275_1_0_beta_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__org_geotools_gt_metadata_9_0.xml b/visualiser/.idea/libraries/Maven__org_geotools_gt_metadata_9_0.xml deleted file mode 100644 index e872950f..00000000 --- a/visualiser/.idea/libraries/Maven__org_geotools_gt_metadata_9_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__org_geotools_gt_opengis_9_0.xml b/visualiser/.idea/libraries/Maven__org_geotools_gt_opengis_9_0.xml deleted file mode 100644 index 01a5965e..00000000 --- a/visualiser/.idea/libraries/Maven__org_geotools_gt_opengis_9_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__org_geotools_gt_referencing_9_0.xml b/visualiser/.idea/libraries/Maven__org_geotools_gt_referencing_9_0.xml deleted file mode 100644 index 36874c5c..00000000 --- a/visualiser/.idea/libraries/Maven__org_geotools_gt_referencing_9_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/visualiser/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml deleted file mode 100644 index f58bbc11..00000000 --- a/visualiser/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__org_mockito_mockito_all_1_9_5.xml b/visualiser/.idea/libraries/Maven__org_mockito_mockito_all_1_9_5.xml deleted file mode 100644 index 7797878d..00000000 --- a/visualiser/.idea/libraries/Maven__org_mockito_mockito_all_1_9_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__org_testng_testng_6_11.xml b/visualiser/.idea/libraries/Maven__org_testng_testng_6_11.xml deleted file mode 100644 index 51052227..00000000 --- a/visualiser/.idea/libraries/Maven__org_testng_testng_6_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml b/visualiser/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml deleted file mode 100644 index 20e2920c..00000000 --- a/visualiser/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/misc.xml b/visualiser/.idea/misc.xml deleted file mode 100644 index a46856d3..00000000 --- a/visualiser/.idea/misc.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - $USER_HOME$/.subversion - - - - - - 1.8 - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/modules.xml b/visualiser/.idea/modules.xml deleted file mode 100644 index e9597707..00000000 --- a/visualiser/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/uiDesigner.xml b/visualiser/.idea/uiDesigner.xml deleted file mode 100644 index e96534fb..00000000 --- a/visualiser/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/.idea/workspace.xml b/visualiser/.idea/workspace.xml deleted file mode 100644 index 8e698fa3..00000000 --- a/visualiser/.idea/workspace.xml +++ /dev/null @@ -1,1275 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - legs - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1492733921956 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualiser/doc/design_decisions.md b/visualiser/doc/design_decisions.md deleted file mode 100644 index e9421fa2..00000000 --- a/visualiser/doc/design_decisions.md +++ /dev/null @@ -1,2 +0,0 @@ -# Design Decisions - diff --git a/visualiser/doc/examples/examples.md b/visualiser/doc/examples/examples.md deleted file mode 100644 index 994f4e89..00000000 --- a/visualiser/doc/examples/examples.md +++ /dev/null @@ -1,7 +0,0 @@ -# Examples - -You should also include example data files for your application that demonstrate the -features of your application. These should contain adequate amounts of data that -would be expected from actual use of your application. - -This file should provide a basic overview of the example files available. diff --git a/visualiser/doc/user_manual.md b/visualiser/doc/user_manual.md deleted file mode 100644 index 7c571c01..00000000 --- a/visualiser/doc/user_manual.md +++ /dev/null @@ -1 +0,0 @@ -# User Manual \ No newline at end of file diff --git a/visualiser/pom.xml b/visualiser/pom.xml deleted file mode 100644 index df395f2f..00000000 --- a/visualiser/pom.xml +++ /dev/null @@ -1,113 +0,0 @@ - - 4.0.0 - - seng302 - team-7 - 1.0-SNAPSHOT - - - jar - visualiser - visualiser - 1.0-SNAPSHOT - - https://eng-git.canterbury.ac.nz/SENG302-2016/team-7 - - - - - seng302 - racevisionGame - 1.0-SNAPSHOT - - - - - - - 1.8 - 1.8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.3 - - - - - visualiser.app.App - ${maven.compiler.source} - ${maven.compiler.target} - - - - - - - package - - shade - - - - - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.5 - - - org.apache.maven.plugins - maven-pmd-plugin - 3.6 - - true - ${maven.compiler.target} - - /rulesets/java/basic.xml - /rulesets/java/imports.xml - /rulesets/java/codesize.xml - /rulesets/java/design.xml - /rulesets/java/empty.xml - /rulesets/java/junit.xml - /rulesets/java/unusedcode.xml - - true - utf-8 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.19.1 - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.8.1 - - - -