Revert "Modify and use parse index func for edit"

This reverts commit b125c9a.
CS2103AUG2016-F10-C3 · Nov 6, 2016 · ca5118a · ca5118a
1 parent b125c9a
commit ca5118a
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/main/java/seedu/gtd/logic/parser/Parser.java b/src/main/java/seedu/gtd/logic/parser/Parser.java
@@ -214,12 +214,12 @@ private Command prepareEdit(String args) {
             return new IncorrectCommand(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE));
         }
 
-        Optional<Integer> index = parseIndex(args, EDIT_DATA_ARGS_FORMAT);
-
+        Optional<Integer> index = Optional.of(Integer.parseInt(matcher.group("targetIndex")));
         final String[] splitNewDetails = matcher.group("newDetails").split("\\s+");
         ArrayList<String> combinedDetails = combineSameDetails(splitNewDetails);
 
         Hashtable<String, String> newDetailsSet = new Hashtable<String, String>();
+
         for (String detail : combinedDetails) {
         	String detailType = extractDetailType(detail);
         	String preparedNewDetail = prepareNewDetail(detailType, detail);
@@ -228,7 +228,7 @@ private Command prepareEdit(String args) {
 		}
 
         return new EditCommand(
-           index.get() - 1,
+           index.get()-1,
            newDetailsSet
         );
     }
@@ -333,7 +333,7 @@ else if(priorityMatcher.matches()) {
      */
     private Command prepareDelete(String args) {
 
-        Optional<Integer> index = parseIndex(args, TASK_INDEX_ARGS_FORMAT);
+        Optional<Integer> index = parseIndex(args);
         if(!index.isPresent()){
             return new IncorrectCommand(
                     String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE));
@@ -344,7 +344,7 @@ private Command prepareDelete(String args) {
 
     private Command prepareDone(String args) {
 
-        Optional<Integer> index = parseIndex(args, TASK_INDEX_ARGS_FORMAT);
+        Optional<Integer> index = parseIndex(args);
         System.out.println("index at preparedone:" + index.get());
         if(!index.isPresent()){
             return new IncorrectCommand(
@@ -361,7 +361,7 @@ private Command prepareDone(String args) {
      * @return the prepared command
      */
     private Command prepareSelect(String args) {
-        Optional<Integer> index = parseIndex(args, TASK_INDEX_ARGS_FORMAT);
+        Optional<Integer> index = parseIndex(args);
         if(!index.isPresent()){
             return new IncorrectCommand(
                     String.format(MESSAGE_INVALID_COMMAND_FORMAT, SelectCommand.MESSAGE_USAGE));
@@ -374,8 +374,8 @@ private Command prepareSelect(String args) {
      * Returns the specified index in the {@code command} IF a positive unsigned integer is given as the index.
      *   Returns an {@code Optional.empty()} otherwise.
      */
-    private Optional<Integer> parseIndex(String command, final Pattern matcherFormat) {
-        final Matcher matcher = matcherFormat.matcher(command.trim());
+    private Optional<Integer> parseIndex(String command) {
+        final Matcher matcher = TASK_INDEX_ARGS_FORMAT.matcher(command.trim());
         if (!matcher.matches()) {
             return Optional.empty();
         }