[W5.11][F09-1]Jonathan Ng

src/seedu/addressbook/Main.java

@@ -22,6 +22,8 @@
  */
 public class Main {
 
+    public static boolean isUserInputHelp;
+
     /** Version info of the program. */
     public static final String VERSION = "AddressBook Level 2 - Version 1.0";
 
@@ -84,6 +86,9 @@ private void runCommandLoopUntilExitCommand() {
         do {
             String userCommandText = ui.getUserCommand();
             command = new Parser().parseCommand(userCommandText);
+            if(userCommandText.equals("help")) {
+                isUserInputHelp = true;
+            }
             CommandResult result = executeCommand(command);
             recordResult(result);
             ui.showResultToUser(result);

src/seedu/addressbook/commands/HelpCommand.java

@@ -1,6 +1,8 @@
 package seedu.addressbook.commands;
 
 
+import seedu.addressbook.Main;
+
 /**
  * Shows help instructions.
  */
@@ -15,16 +17,21 @@ public HelpCommand() {}
 
     @Override
     public CommandResult execute() {
-        return new CommandResult(
-                AddCommand.MESSAGE_USAGE
-                + "\n" + DeleteCommand.MESSAGE_USAGE
-                + "\n" + ClearCommand.MESSAGE_USAGE
-                + "\n" + FindCommand.MESSAGE_USAGE
-                + "\n" + ListCommand.MESSAGE_USAGE
-                + "\n" + ViewCommand.MESSAGE_USAGE
-                + "\n" + ViewAllCommand.MESSAGE_USAGE
-                + "\n" + HelpCommand.MESSAGE_USAGE
-                + "\n" + ExitCommand.MESSAGE_USAGE
-        );
+        if(!Main.isUserInputHelp) {
+            System.out.println("Command not found, for more help, please enter 'help' to the CLI");
+        } else {
+            return new CommandResult(
+                    "\n" + AddCommand.MESSAGE_USAGE
+                            + "\n\n" + DeleteCommand.MESSAGE_USAGE
+                            + "\n\n" + ClearCommand.MESSAGE_USAGE
+                            + "\n\n" + FindCommand.MESSAGE_USAGE
+                            + "\n\n" + ListCommand.MESSAGE_USAGE
+                            + "\n\n" + ViewCommand.MESSAGE_USAGE
+                            + "\n\n" + ViewAllCommand.MESSAGE_USAGE
+                            + "\n\n" + HelpCommand.MESSAGE_USAGE
+                            + "\n\n" + ExitCommand.MESSAGE_USAGE
+            );
+        }
+        return new CommandResult(HelpCommand.MESSAGE_USAGE);
     }
 }

src/seedu/addressbook/commands/IncorrectCommand.java

@@ -1,6 +1,5 @@
 package seedu.addressbook.commands;
 
-
 /**
  * Represents an incorrect command. Upon execution, produces some feedback to the user.
  */
@@ -16,5 +15,4 @@ public IncorrectCommand(String feedbackToUser) {
     public CommandResult execute() {
         return new CommandResult(feedbackToUser);
     }
-
 }