Updated maven version to 2.0.

Added a dedicatedServer module.
Removed Visualiser module.
Removed mock module.
Removed network module.
Fixed weird exception non-handling that appeared for some reason.

.gitignore

@@ -182,3 +182,4 @@ local.properties
 
 # IntelliJDEA ignore
 *.iml
+dedicatedServer/.idea/

dedicatedServer/pom.xml

@@ -4,20 +4,21 @@
     <parent>
         <groupId>seng302</groupId>
         <artifactId>team-7</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.0</version>
     </parent>
 
     <packaging>jar</packaging>
-    <name>mock</name>
+    <name>dedicatedServer</name>
-    <artifactId>mock</artifactId>
+    <artifactId>dedicatedServer</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.0</version>
+
 
     <dependencies>
 
         <dependency>
             <groupId>seng302</groupId>
             <artifactId>racevisionGame</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>2.0</version>
         </dependency>
 
     </dependencies>
@@ -44,7 +45,7 @@
                         <transformer
                                 implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                             <manifestEntries>
-                                <Main-Class>mock.app.App</Main-Class>
+                                <Main-Class>visualiser.app.App</Main-Class>
                                 <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
                                 <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
                             </manifestEntries>

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);
+        }
+    }
+
+
+
+}

mock/doc/design_decisions.md

@@ -1,2 +0,0 @@
-# Design Decisions
-

mock/doc/examples/examples.md

@@ -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.

mock/doc/user_manual.md

@@ -1 +0,0 @@
-# User Manual

network/pom.xml

@@ -1,140 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>seng302</groupId>
-        <artifactId>team-7</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <packaging>jar</packaging>
-    <name>network</name>
-    <artifactId>network</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <dependencies>
-
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-
-
-
-        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
-        </dependency>
-
-
-
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>6.11</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-
-    <repositories>
-        <repository>
-            <id>maven2-repository.dev.java.net</id>
-            <name>Java.net repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-
-    </repositories>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
-                <configuration>
-                    <transformers>
-                        <transformer
-                                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                            <manifestEntries>
-                                <Main-Class>seng302.App</Main-Class>
-                                <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
-                                <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
-                            </manifestEntries>
-                        </transformer>
-                    </transformers>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.5</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.6</version>
-                <configuration>
-                    <linkXRef>true</linkXRef>
-                    <targetJdk>${maven.compiler.target}</targetJdk>
-                    <rulesets>
-                        <ruleset>/rulesets/java/basic.xml</ruleset>
-                        <ruleset>/rulesets/java/imports.xml</ruleset>
-                        <ruleset>/rulesets/java/codesize.xml</ruleset>
-                        <ruleset>/rulesets/java/design.xml</ruleset>
-                        <ruleset>/rulesets/java/empty.xml</ruleset>
-                        <ruleset>/rulesets/java/junit.xml</ruleset>
-                        <ruleset>/rulesets/java/unusedcode.xml</ruleset>
-                    </rulesets>
-                    <includeXmlInSite>true</includeXmlInSite>
-                    <sourceEncoding>utf-8</sourceEncoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
-                <configuration>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.19.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.8.1</version>
-            </plugin>
-        </plugins>
-    </reporting>
-</project>

pom.xml

@@ -4,14 +4,12 @@
     <groupId>seng302</groupId>
     <artifactId>team-7</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.0</version>
     <name>team-7</name>
 
     <modules>
         <module>racevisionGame</module>
-        <module>mock</module>
+        <module>dedicatedServer</module>
-        <module>visualiser</module>
-        <module>network</module>
     </modules>
 
     <url>https://eng-git.canterbury.ac.nz/SENG302-2016/team-7</url>

racevisionGame/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>seng302</groupId>
         <artifactId>team-7</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.0</version>
     </parent>
 
     <packaging>jar</packaging>
     <name>racevisionGame</name>
     <artifactId>racevisionGame</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.0</version>
 
     <dependencies>
         <dependency>

racevisionGame/src/main/java/mock/app/Event.java

@@ -79,7 +79,7 @@ public class Event {
      */
     public Event(boolean singlePlayer) throws EventConstructionException {
 
-        String raceXMLFile = "mock/mockXML/raceThreePlayers.xml";//TEMP 3 player race - for demo on 18th august
+        String raceXMLFile = "mock/mockXML/raceTest.xml";
         String boatsXMLFile = "mock/mockXML/boatTest.xml";
         String regattaXMLFile = "mock/mockXML/regattaTest.xml";
 
@@ -171,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

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();
             }
 
         }

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);
-                waitForFramePeriod(lastHeartbeatTime, currentFrameTime, heartbeatPeriod);
+
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
             lastHeartbeatTime = currentFrameTime;
 
             try {

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();
-            countdown();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
 
-        try {
+        raceLoop();
-            raceLoop();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
     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");
     }
-}
+}

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);
-                waitForFramePeriod(previousFrameTime, currentFrameTime, 16);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
             previousFrameTime = currentFrameTime;
 
 

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;
 
             }
 

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);

racevisionGame/src/main/java/visualiser/model/VisualiserRaceService.java

@@ -68,13 +68,7 @@ public class VisualiserRaceService implements RunnableWithFramePeriod {
         while (!Thread.interrupted()) {
 
             long currentFrameTime = System.currentTimeMillis();
-
+            waitForFramePeriod(previousFrameTime, currentFrameTime, 16);
-            try {
-                waitForFramePeriod(previousFrameTime, currentFrameTime, 16);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
             previousFrameTime = currentFrameTime;
 
 

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);
-                waitForFramePeriod(previousFrameTime, currentFrameTime, 100);
+
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
             previousFrameTime = currentFrameTime;
 
 

visualiser/.idea/compiler.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="visualiser" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="visualiser" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>

visualiser/.idea/libraries/Maven__com_beust_jcommander_1_64.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.beust:jcommander:1.64">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.64/jcommander-1.64.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.64/jcommander-1.64-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.64/jcommander-1.64-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__com_github_bfsmith_geotimezone_1_0_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.bfsmith:geotimezone:1.0.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/bfsmith/geotimezone/1.0.3/geotimezone-1.0.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/bfsmith/geotimezone/1.0.3/geotimezone-1.0.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/bfsmith/geotimezone/1.0.3/geotimezone-1.0.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__com_spatial4j_spatial4j_0_4_1.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.spatial4j:spatial4j:0.4.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/spatial4j/spatial4j/0.4.1/spatial4j-0.4.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/spatial4j/spatial4j/0.4.1/spatial4j-0.4.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/spatial4j/spatial4j/0.4.1/spatial4j-0.4.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-pool:commons-pool:1.5.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__java3d_vecmath_1_3_2.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: java3d:vecmath:1.3.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/java3d/vecmath/1.3.2/vecmath-1.3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/java3d/vecmath/1.3.2/vecmath-1.3.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/java3d/vecmath/1.3.2/vecmath-1.3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__javax_media_jai_core_1_1_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.media:jai_core:1.1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/media/jai_core/1.1.3/jai_core-1.1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/media/jai_core/1.1.3/jai_core-1.1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/media/jai_core/1.1.3/jai_core-1.1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__jgridshift_jgridshift_1_0.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: jgridshift:jgridshift:1.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/jgridshift/jgridshift/1.0/jgridshift-1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/jgridshift/jgridshift/1.0/jgridshift-1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/jgridshift/jgridshift/1.0/jgridshift-1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__joda_time_joda_time_2_7.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: joda-time:joda-time:2.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.7/joda-time-2.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.7/joda-time-2.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.7/joda-time-2.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__junit_junit_4_12.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: junit:junit:4.12">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__net_java_dev_jsr_275_jsr_275_1_0_beta_2.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.java.dev.jsr-275:jsr-275:1.0-beta-2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/java/dev/jsr-275/jsr-275/1.0-beta-2/jsr-275-1.0-beta-2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/java/dev/jsr-275/jsr-275/1.0-beta-2/jsr-275-1.0-beta-2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/java/dev/jsr-275/jsr-275/1.0-beta-2/jsr-275-1.0-beta-2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__org_geotools_gt_metadata_9_0.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.geotools:gt-metadata:9.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/geotools/gt-metadata/9.0/gt-metadata-9.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/geotools/gt-metadata/9.0/gt-metadata-9.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/geotools/gt-metadata/9.0/gt-metadata-9.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__org_geotools_gt_opengis_9_0.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.geotools:gt-opengis:9.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/geotools/gt-opengis/9.0/gt-opengis-9.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/geotools/gt-opengis/9.0/gt-opengis-9.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/geotools/gt-opengis/9.0/gt-opengis-9.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__org_geotools_gt_referencing_9_0.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.geotools:gt-referencing:9.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/geotools/gt-referencing/9.0/gt-referencing-9.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/geotools/gt-referencing/9.0/gt-referencing-9.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/geotools/gt-referencing/9.0/gt-referencing-9.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__org_mockito_mockito_all_1_9_5.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mockito:mockito-all:1.9.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-all/1.9.5/mockito-all-1.9.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-all/1.9.5/mockito-all-1.9.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__org_testng_testng_6_11.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.testng:testng:6.11">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.11/testng-6.11.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.11/testng-6.11-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.11/testng-6.11-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.yaml:snakeyaml:1.17">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.17/snakeyaml-1.17.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.17/snakeyaml-1.17-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.17/snakeyaml-1.17-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

visualiser/.idea/misc.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/classes" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration>$USER_HOME$/.subversion</configuration>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ScopeChooserConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>

visualiser/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/visualiser.iml" filepath="$PROJECT_DIR$/visualiser.iml" />
-    </modules>
-  </component>
-</project>

visualiser/.idea/uiDesigner.xml

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>

visualiser/doc/design_decisions.md

@@ -1,2 +0,0 @@
-# Design Decisions
-

visualiser/doc/examples/examples.md

@@ -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.

visualiser/doc/user_manual.md

@@ -1 +0,0 @@
-# User Manual

visualiser/pom.xml

@@ -1,113 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>seng302</groupId>
-        <artifactId>team-7</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <packaging>jar</packaging>
-    <name>visualiser</name>
-    <artifactId>visualiser</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <url>https://eng-git.canterbury.ac.nz/SENG302-2016/team-7</url>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>seng302</groupId>
-            <artifactId>racevisionGame</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-
-    </dependencies>
-
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
-                <configuration>
-                    <transformers>
-                        <transformer
-                                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                            <manifestEntries>
-                                <Main-Class>visualiser.app.App</Main-Class>
-                                <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
-                                <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
-                            </manifestEntries>
-                        </transformer>
-                    </transformers>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.5</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.6</version>
-                <configuration>
-                    <linkXRef>true</linkXRef>
-                    <targetJdk>${maven.compiler.target}</targetJdk>
-                    <rulesets>
-                        <ruleset>/rulesets/java/basic.xml</ruleset>
-                        <ruleset>/rulesets/java/imports.xml</ruleset>
-                        <ruleset>/rulesets/java/codesize.xml</ruleset>
-                        <ruleset>/rulesets/java/design.xml</ruleset>
-                        <ruleset>/rulesets/java/empty.xml</ruleset>
-                        <ruleset>/rulesets/java/junit.xml</ruleset>
-                        <ruleset>/rulesets/java/unusedcode.xml</ruleset>
-                    </rulesets>
-                    <includeXmlInSite>true</includeXmlInSite>
-                    <sourceEncoding>utf-8</sourceEncoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
-                <configuration>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.19.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.8.1</version>
-            </plugin>
-        </plugins>
-    </reporting>
-</project>