Merge pull request nus-cs2103-AY2324S1#95 from AY2324S1-CS2103T-F08-2…

…/revert-90-convertlead Revert "Add Convertion of class"
yuxunn · Oct 26, 2023 · 3e2b2c1 · 3e2b2c1
2 parents c90c4fc + 8b93e8d
commit 3e2b2c1
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 351 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/ConvertClientToLeadCommand.java b/src/main/java/seedu/address/logic/commands/ConvertClientToLeadCommand.java
diff --git a/src/main/java/seedu/address/logic/commands/ConvertLeadToClientCommand.java b/src/main/java/seedu/address/logic/commands/ConvertLeadToClientCommand.java
diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
@@ -12,8 +12,6 @@
 import seedu.address.logic.commands.AddLeadCommand;
 import seedu.address.logic.commands.ClearCommand;
 import seedu.address.logic.commands.Command;
-import seedu.address.logic.commands.ConvertClientToLeadCommand;
-import seedu.address.logic.commands.ConvertLeadToClientCommand;
 import seedu.address.logic.commands.DeleteCommand;
 import seedu.address.logic.commands.EditCommand;
 import seedu.address.logic.commands.ExitCommand;
@@ -91,16 +89,10 @@ public Command parseCommand(String userInput) throws ParseException {
 
         case ListLeadCommand.COMMAND_WORD:
             return new ListLeadCommand();
-
-        case ConvertLeadToClientCommand.COMMAND_WORD:
-            return new ConvertLeadToClientCommandParser().parse(arguments);
-
-        case ConvertClientToLeadCommand.COMMAND_WORD:
-            return new ConvertClientToLeadCommandParser().parse(arguments);
 
         case ViewCommand.COMMAND_WORD:
             return new ViewCommandParser().parse(arguments);
-            
+
         default:
             logger.finer("This user input caused a ParseException: " + userInput);
             throw new ParseException(MESSAGE_UNKNOWN_COMMAND);

diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java
@@ -6,10 +6,16 @@
 public class CliSyntax {
 
     /* Prefix definitions */
-    public static final Prefix PREFIX_NAME = new Prefix("--name ");
-    public static final Prefix PREFIX_PHONE = new Prefix("--phone ");
-    public static final Prefix PREFIX_EMAIL = new Prefix("--email ");
-    public static final Prefix PREFIX_ADDRESS = new Prefix("--address ");
-    public static final Prefix PREFIX_TAG = new Prefix("--tag ");
+    public static final Prefix PREFIX_NAME = new Prefix("n/");
+    public static final Prefix PREFIX_PHONE = new Prefix("p/");
+    public static final Prefix PREFIX_EMAIL = new Prefix("e/");
+    public static final Prefix PREFIX_ADDRESS = new Prefix("a/");
+    public static final Prefix PREFIX_TAG = new Prefix("t/");
+
+    public static final Prefix PREFIX_NAME_TP = new Prefix("--name");
+    public static final Prefix PREFIX_PHONE_TP = new Prefix("--phone");
+    public static final Prefix PREFIX_EMAIL_TP = new Prefix("--email");
+    public static final Prefix PREFIX_ADDRESS_TP = new Prefix("--address");
+    public static final Prefix PREFIX_TAG_TP = new Prefix("--tag");
 
 }
diff --git a/src/main/java/seedu/address/logic/parser/ConvertClientToLeadCommandParser.java b/src/main/java/seedu/address/logic/parser/ConvertClientToLeadCommandParser.java
diff --git a/src/main/java/seedu/address/logic/parser/ConvertLeadToClientCommandParser.java b/src/main/java/seedu/address/logic/parser/ConvertLeadToClientCommandParser.java
diff --git a/src/test/java/seedu/address/logic/commands/ConvertClientToLeadCommandTest.java b/src/test/java/seedu/address/logic/commands/ConvertClientToLeadCommandTest.java
diff --git a/src/test/java/seedu/address/logic/commands/ConvertLeadToClientCommandTest.java b/src/test/java/seedu/address/logic/commands/ConvertLeadToClientCommandTest.java