From 054816c15a7587e08e65a1ef1de18682d7ddee4d Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Fri, 14 Jul 2017 17:07:10 +1200
Subject: [PATCH] fix for the pom files #story[1006]

---
 gameController/pom.xml                        | 69 -------------------
 visualiser/pom.xml                            |  6 --
 visualiser/src/main/java/seng302/App.java     |  1 +
 .../seng302/gameController}/InputChecker.java |  2 +-
 .../seng302/gameController}/InputKeys.java    |  2 +-
 5 files changed, 3 insertions(+), 77 deletions(-)
 delete mode 100644 gameController/pom.xml
 rename {gameController/src/main/java/seng302 => visualiser/src/main/java/seng302/gameController}/InputChecker.java (97%)
 rename {gameController/src/main/java/seng302 => visualiser/src/main/java/seng302/gameController}/InputKeys.java (94%)

diff --git a/gameController/pom.xml b/gameController/pom.xml
deleted file mode 100644
index 83c89921..00000000
--- a/gameController/pom.xml
+++ /dev/null
@@ -1,69 +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>
-        <artifactId>team-7</artifactId>
-        <groupId>seng302</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-
-    <packaging>jar</packaging>
-    <name>gameController</name>
-    <artifactId>gameController</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <url>https://eng-git.canterbury.ac.nz/SENG302-2016/team-7</url>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </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>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>
-
-
-</project>
\ No newline at end of file
diff --git a/visualiser/pom.xml b/visualiser/pom.xml
index 9387a9ec..156c8e60 100644
--- a/visualiser/pom.xml
+++ b/visualiser/pom.xml
@@ -54,12 +54,6 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>seng302</groupId>
-            <artifactId>gameController</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-
     </dependencies>
 
 
diff --git a/visualiser/src/main/java/seng302/App.java b/visualiser/src/main/java/seng302/App.java
index fca492eb..363349e3 100644
--- a/visualiser/src/main/java/seng302/App.java
+++ b/visualiser/src/main/java/seng302/App.java
@@ -8,6 +8,7 @@ import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
+import seng302.gameController.InputChecker;
 
 public class App extends Application {
 
diff --git a/gameController/src/main/java/seng302/InputChecker.java b/visualiser/src/main/java/seng302/gameController/InputChecker.java
similarity index 97%
rename from gameController/src/main/java/seng302/InputChecker.java
rename to visualiser/src/main/java/seng302/gameController/InputChecker.java
index 7a01be06..2ca1a5d5 100644
--- a/gameController/src/main/java/seng302/InputChecker.java
+++ b/visualiser/src/main/java/seng302/gameController/InputChecker.java
@@ -1,4 +1,4 @@
-package seng302;
+package seng302.gameController;
 
 import javafx.animation.AnimationTimer;
 import javafx.scene.Scene;
diff --git a/gameController/src/main/java/seng302/InputKeys.java b/visualiser/src/main/java/seng302/gameController/InputKeys.java
similarity index 94%
rename from gameController/src/main/java/seng302/InputKeys.java
rename to visualiser/src/main/java/seng302/gameController/InputKeys.java
index 57270017..9c921061 100644
--- a/gameController/src/main/java/seng302/InputKeys.java
+++ b/visualiser/src/main/java/seng302/gameController/InputKeys.java
@@ -1,4 +1,4 @@
-package seng302;
+package seng302.gameController;
 
 import java.util.Arrays;
 import java.util.List;