From 781c2b265e1389f69f280d9a8c039a59678a78ec Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Thu, 19 Feb 2015 18:55:43 +0100
Subject: directory structure

---
 GameController/.gitignore | 73 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 GameController/.gitignore

(limited to 'GameController/.gitignore')

diff --git a/GameController/.gitignore b/GameController/.gitignore
new file mode 100644
index 0000000..b630aee
--- /dev/null
+++ b/GameController/.gitignore
@@ -0,0 +1,73 @@
+# Source: http://www.bmchild.com/2012/06/git-ignore-for-java-eclipse-project.html
+
+# Directories #
+/build/
+/bin/
+target/
+ 
+# OS Files #
+.DS_Store
+ 
+*.class
+ 
+# Package Files #
+*.jar
+*.war
+*.ear
+*.db
+ 
+######################
+# Windows
+######################
+ 
+# Windows image file caches
+Thumbs.db 
+ 
+# Folder config file
+Desktop.ini
+ 
+######################
+# OSX
+######################
+ 
+.DS_Store
+.svn
+ 
+# Thumbnails
+._*
+ 
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+ 
+ 
+######################
+# Eclipse
+######################
+ 
+*.pydevproject
+.project
+.metadata
+bin/**
+tmp/**
+tmp/**/*
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+/src/main/resources/rebel.xml
+# External tool builders
+.externalToolBuilders/
+ 
+# Locally stored "Eclipse launch configurations"
+*.launch
+ 
+# CDT-specific
+.cproject
+ 
+# PDT-specific
+.buildpath
-- 
cgit v1.2.3


From 58b2085deb328c82b77421e1d9e3a1b57d532a00 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Thu, 19 Feb 2015 18:58:40 +0100
Subject: directory structure

---
 GameController/.gitignore                          |  1 +
 GameController/build.xml                           | 38 ++++++++++++++++++++++
 .../nl/camilstaps/botleagues/GameController.java   |  2 +-
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 GameController/build.xml

(limited to 'GameController/.gitignore')

diff --git a/GameController/.gitignore b/GameController/.gitignore
index b630aee..5bda502 100644
--- a/GameController/.gitignore
+++ b/GameController/.gitignore
@@ -3,6 +3,7 @@
 # Directories #
 /build/
 /bin/
+/dist/
 target/
  
 # OS Files #
diff --git a/GameController/build.xml b/GameController/build.xml
new file mode 100644
index 0000000..31b3d59
--- /dev/null
+++ b/GameController/build.xml
@@ -0,0 +1,38 @@
+<project name="GameController" default="dist" basedir=".">
+    <description>
+        Controls a Botleagues game
+    </description>
+  <!-- set global properties for this build -->
+  <property name="src" location="src"/>
+  <property name="build" location="bin"/>
+  <property name="dist"  location="dist"/>
+
+  <target name="init">
+    <!-- Create the time stamp -->
+    <tstamp/>
+    <!-- Create the build directory structure used by compile -->
+    <mkdir dir="${build}"/>
+  </target>
+
+  <target name="compile" depends="init"
+        description="compile the source " >
+    <!-- Compile the java code from ${src} into ${build} -->
+    <javac srcdir="${src}" destdir="${build}"/>
+  </target>
+
+  <target name="dist" depends="compile"
+        description="generate the distribution" >
+    <!-- Create the distribution directory -->
+    <mkdir dir="${dist}/lib"/>
+
+    <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
+    <jar jarfile="${dist}/lib/MyProject-${DSTAMP}.jar" basedir="${build}"/>
+  </target>
+
+  <target name="clean"
+        description="clean up" >
+    <!-- Delete the ${build} and ${dist} directory trees -->
+    <delete dir="${build}"/>
+    <delete dir="${dist}"/>
+  </target>
+</project>
diff --git a/GameController/src/nl/camilstaps/botleagues/GameController.java b/GameController/src/nl/camilstaps/botleagues/GameController.java
index 77eea76..1054215 100644
--- a/GameController/src/nl/camilstaps/botleagues/GameController.java
+++ b/GameController/src/nl/camilstaps/botleagues/GameController.java
@@ -19,7 +19,7 @@ import java.util.List;
 public abstract class GameController {
 	
 	/** The contestants in this game */
-	List<Contestant> contestants = new ArrayList<>();
+	List<Contestant> contestants = new ArrayList<Contestant>();
 	
 	/**
 	 * Add a new contestant
-- 
cgit v1.2.3