Merge pull request se-edu#57 from warheade/master

update to be completely league tracker

league_tracker.txt

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<AddressBook>
+    <players>
+        <name>Lionel Messi</name>
+        <position>RW</position>
+        <age>30</age>
+        <salary>200</salary>
+        <goalsScored>30</goalsScored>
+        <goalsAssisted>20</goalsAssisted>
+        <team>FC Barcelona</team>
+        <country>Argentina</country>
+        <jerseyNumber>10</jerseyNumber>
+        <appearance>54</appearance>
+        <healthStatus>Healthy</healthStatus>
+    </players>
+    <players>
+        <name>Luis Suarez</name>
+        <position>Striker</position>
+        <age>32</age>
+        <salary>200</salary>
+        <goalsScored>30</goalsScored>
+        <goalsAssisted>20</goalsAssisted>
+        <team>FC Barcelona</team>
+        <country>Uruguay</country>
+        <jerseyNumber>9</jerseyNumber>
+        <appearance>54</appearance>
+        <healthStatus>Healthy</healthStatus>
+    </players>
+</AddressBook>

src/seedu/addressbook/Main.java

@@ -14,7 +14,7 @@
 public class Main extends Application implements Stoppable {
 
     /** Version info of the program. */
-    public static final String VERSION = "League Tracker - Version 1.2";
+    public static final String VERSION = "League Tracker - Version 1.3 (first official release)";
 
     private Gui gui;
 

src/seedu/addressbook/commands/Command.java

@@ -8,15 +8,16 @@
 import seedu.addressbook.data.AddressBook;
 import seedu.addressbook.data.finance.ReadOnlyFinance;
 import seedu.addressbook.data.match.ReadOnlyMatch;
-import seedu.addressbook.data.player.ReadOnlyPerson;
+import seedu.addressbook.data.player.ReadOnlyPlayer;
 import seedu.addressbook.data.team.ReadOnlyTeam;
 
+
 /**
  * Represents an executable command.
  */
 public abstract class Command {
     protected AddressBook addressBook;
-    protected List<? extends ReadOnlyPerson> relevantPersons;
+    protected List<? extends ReadOnlyPlayer> relevantPlayers;
     protected List<? extends ReadOnlyMatch> relevantMatches;
     protected List<? extends ReadOnlyTeam> relevantTeams;
     protected List<? extends ReadOnlyFinance> relevantFinances;
@@ -34,13 +35,13 @@ protected Command() {
     }
 
     /**
-     * Constructs a feedback message to summarise an operation that displayed a listing of persons.
+     * Constructs a feedback message to summarise an operation that displayed a listing of players.
      *
-     * @param personsDisplayed used to generate summary
+     * @param playersDisplayed used to generate summary
      * @return summary message for persons displayed
      */
-    public static String getMessageForPersonListShownSummary(List<? extends ReadOnlyPerson> personsDisplayed) {
-        return String.format(Messages.MESSAGE_PERSONS_LISTED_OVERVIEW, personsDisplayed.size());
+    public static String getMessageForPlayerListShownSummary(List<? extends ReadOnlyPlayer> playersDisplayed) {
+        return String.format(Messages.MESSAGE_PLAYERS_LISTED_OVERVIEW, playersDisplayed.size());
     }
 
     /**
@@ -76,12 +77,12 @@ public CommandResult execute() {
      */
 
     public void setData(AddressBook addressBook,
-                        List<? extends ReadOnlyPerson> relevantPersons,
+                        List<? extends ReadOnlyPlayer> relevantPlayers,
                         List<? extends ReadOnlyTeam> relevantTeams,
                         List<? extends ReadOnlyMatch> relevantMatches,
                         List<? extends ReadOnlyFinance> relevantFinances) {
         this.addressBook = addressBook;
-        this.relevantPersons = relevantPersons;
+        this.relevantPlayers = relevantPlayers;
         this.relevantTeams = relevantTeams;
         this.relevantMatches = relevantMatches;
         this.relevantFinances = relevantFinances;
@@ -92,8 +93,9 @@ public void setData(AddressBook addressBook,
      *
      * @throws IndexOutOfBoundsException if the target index is out of bounds of the last viewed listing
      */
-    protected ReadOnlyPerson getTargetPerson() throws IndexOutOfBoundsException {
-        return relevantPersons.get(getTargetIndex() - DISPLAYED_INDEX_OFFSET);
+
+    protected ReadOnlyPlayer getTargetPlayer() throws IndexOutOfBoundsException {
+        return relevantPlayers.get(getTargetIndex() - DISPLAYED_INDEX_OFFSET);
     }
 
     protected ReadOnlyMatch getTargetMatch() throws IndexOutOfBoundsException {

src/seedu/addressbook/commands/CommandResult.java

@@ -5,7 +5,7 @@
 
 import seedu.addressbook.data.finance.ReadOnlyFinance;
 import seedu.addressbook.data.match.ReadOnlyMatch;
-import seedu.addressbook.data.player.ReadOnlyPerson;
+import seedu.addressbook.data.player.ReadOnlyPlayer;
 import seedu.addressbook.data.team.ReadOnlyTeam;
 
 /**
@@ -16,8 +16,8 @@ public class CommandResult {
     /** The feedback message to be shown to the user. Contains a description of the execution result */
     public final String feedbackToUser;
 
-    /** The list of persons that was produced by the command */
-    private final List<? extends ReadOnlyPerson> relevantPersons;
+    /** The list of players that was produced by the command */
+    private final List<? extends ReadOnlyPlayer> relevantPlayers;
 
     /** The list of teams that was produced by the command */
     private final List<? extends ReadOnlyTeam> relevantTeams;
@@ -31,19 +31,19 @@ public class CommandResult {
     /** Constructor for result which do not return any list*/
     public CommandResult(String feedbackToUser) {
         this.feedbackToUser = feedbackToUser;
-        relevantPersons = null;
+        relevantPlayers = null;
         relevantTeams = null;
         relevantMatches = null;
         relevantFinances = null;
     }
 
     public CommandResult(String feedbackToUser,
-                         List<? extends ReadOnlyPerson> relevantPersons,
+                         List<? extends ReadOnlyPlayer> relevantPlayers,
                          List<? extends ReadOnlyTeam> relevantTeams,
                          List<? extends ReadOnlyMatch> relevantMatches,
                          List<? extends ReadOnlyFinance> relevantFinances) {
         this.feedbackToUser = feedbackToUser;
-        this.relevantPersons = relevantPersons;
+        this.relevantPlayers = relevantPlayers;
         this.relevantTeams = relevantTeams;
         this.relevantMatches = relevantMatches;
         this.relevantFinances = relevantFinances;
@@ -53,8 +53,8 @@ public CommandResult(String feedbackToUser,
     /**
      * Returns list of persons relevant to the command command result, if any.
      */
-    public Optional<List<? extends ReadOnlyPerson>> getRelevantPersons() {
-        return Optional.ofNullable(relevantPersons);
+    public Optional<List<? extends ReadOnlyPlayer>> getRelevantPlayers() {
+        return Optional.ofNullable(relevantPlayers);
     }
 
     /**

src/seedu/addressbook/commands/HelpCommand.java

@@ -7,6 +7,13 @@
 import seedu.addressbook.commands.match.DeleteMatchCommand;
 import seedu.addressbook.commands.match.FindMatchCommand;
 import seedu.addressbook.commands.match.ListMatchCommand;
+import seedu.addressbook.commands.player.AddCommand;
+import seedu.addressbook.commands.player.ClearCommand;
+import seedu.addressbook.commands.player.DeleteCommand;
+import seedu.addressbook.commands.player.FindCommand;
+import seedu.addressbook.commands.player.ListCommand;
+import seedu.addressbook.commands.player.SortCommand;
+import seedu.addressbook.commands.player.ViewAllCommand;
 import seedu.addressbook.commands.team.AddTeam;
 import seedu.addressbook.commands.team.ClearTeam;
 import seedu.addressbook.commands.team.DeleteTeam;
@@ -36,7 +43,6 @@ public class HelpCommand extends Command {
             + "\n" + ClearTeam.MESSAGE_USAGE
             + "\n" + FindTeam.MESSAGE_USAGE
             + "\n" + ListTeam.MESSAGE_USAGE
-            + "\n" + ViewCommand.MESSAGE_USAGE
             + "\n" + ViewAllCommand.MESSAGE_USAGE
             + "\n" + FinanceCommand.MESSAGE_USAGE
             + "\n" + ListFinanceCommand.MESSAGE_USAGE

src/seedu/addressbook/commands/match/DeleteMatchCommand.java

@@ -37,7 +37,7 @@ public CommandResult execute() {
         } catch (IndexOutOfBoundsException ie) {
             return new CommandResult(Messages.MESSAGE_INVALID_MATCH_DISPLAYED_INDEX);
         } catch (MatchNotFoundException mnfe) {
-            return new CommandResult(Messages.MESSAGE_MATCH_NOT_IN_ADDRESSBOOK);
+            return new CommandResult(Messages.MESSAGE_MATCH_NOT_IN_LEAGUE_TRACKER);
         }
     }