diff --git a/.gitignore b/.gitignore index 040f8d85..3895252d 100644 --- a/.gitignore +++ b/.gitignore @@ -174,4 +174,7 @@ local.properties .springBeans # Code Recommenders -.recommenders/ \ No newline at end of file +.recommenders/ + +# IntelliJDEA ignore +*.iml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 00000000..7a0b7f00 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +app \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..386f1598 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..a8e8a4df --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,32 @@ + + + + + + + + + + $USER_HOME$/.subversion + + + + + + 1.8 (1) + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..6361584b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 09ce924d..69af7436 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ jar 0.0 app - https://eng-git.canterbury.ac.nz/SENG302-2016/team-0 + https://eng-git.canterbury.ac.nz/SENG302-2016/team-7 1.8 diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java index 7abe9e09..ec5748ec 100644 --- a/src/main/java/seng302/App.java +++ b/src/main/java/seng302/App.java @@ -1,9 +1,14 @@ package seng302; + public class App { public static void main( String[] args ) { - System.out.println( "Welcome to SENG302" ); + Boat boat1 = new Boat("New Zealand"); + Boat boat2 = new Boat("America"); + Boat[] boats = {boat1, boat2}; + Event event = new Event(boats); + System.out.println(event.getParticipants()); } } diff --git a/src/main/java/seng302/Boat.java b/src/main/java/seng302/Boat.java new file mode 100644 index 00000000..939787f8 --- /dev/null +++ b/src/main/java/seng302/Boat.java @@ -0,0 +1,20 @@ +package seng302; + +/** + * Created by fwy13 on 3/03/17. + */ +public class Boat { + private String name; + + public Boat(String name){ + this.name = name; + } + + public String getName() { + return name; + } + + public String toString(){ + return getName(); + } +} diff --git a/src/main/java/seng302/Event.java b/src/main/java/seng302/Event.java new file mode 100644 index 00000000..147959fb --- /dev/null +++ b/src/main/java/seng302/Event.java @@ -0,0 +1,24 @@ +package seng302; + +import java.util.ArrayList; +import java.util.Arrays; + +/** + * Created by fwy13 on 3/03/17. + */ +public class Event { + private ArrayList boats; + + public Event(Boat boats[]){ + this.boats = new ArrayList<>(Arrays.asList(boats)); + } + + public String getParticipants(){ + String participants = ""; + for (int i = 0; i < boats.size(); i++){ + participants += boats.get(i).getName()+"\n"; + } + return participants; + } + +}