Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change assertions to exceptions #71

Merged
merged 1 commit into from
Oct 26, 2020
Merged

change assertions to exceptions #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
62 changes: 32 additions & 30 deletions src/main/java/seedu/address/logic/parser/FindCommandParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,43 +29,45 @@ public class FindCommandParser implements ExerciseParser<FindCommand> {
* @throws ParseException if the user input does not conform the expected format
*/
public FindCommand parse(String args) throws ParseException {
try {
String trimmedArgs = args.trim();
assert !trimmedArgs.isEmpty();
String trimmedArgs = args.trim();

Name name = null;
Description description = null;
Date date = null;
Calories calories = null;
String[] keywords = null;

ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_NAME,
PREFIX_DESCRIPTION, PREFIX_DATE, PREFIX_CALORIES, PREFIX_KEYWORD);
if (trimmedArgs.isEmpty()) {
throw new ParseException(
String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
}

assert argMultimap.getPreamble().isEmpty();
Name name = null;
Description description = null;
Date date = null;
Calories calories = null;
String[] keywords = null;

if (argMultimap.getValue(PREFIX_NAME).isPresent()) {
name = new Name(argMultimap.getValue(PREFIX_NAME).get());
}
if (argMultimap.getValue(PREFIX_DESCRIPTION).isPresent()) {
description = new Description(argMultimap.getValue(PREFIX_DESCRIPTION).get());
}
if (argMultimap.getValue(PREFIX_DATE).isPresent()) {
date = new Date(argMultimap.getValue(PREFIX_DATE).get());
}
if (argMultimap.getValue(PREFIX_CALORIES).isPresent()) {
calories = new Calories(argMultimap.getValue(PREFIX_CALORIES).get());
}
if (argMultimap.getValue(PREFIX_KEYWORD).isPresent()) {
keywords = argMultimap.getValue(PREFIX_KEYWORD).get().split("\\s+");
}
ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_NAME,
PREFIX_DESCRIPTION, PREFIX_DATE, PREFIX_CALORIES, PREFIX_KEYWORD);

return new FindCommand(new PropertiesMatchPredicateForExercise(name, description, date, calories,
keywords == null ? null : Arrays.asList(keywords)));
} catch (AssertionError e) {
if (!argMultimap.getPreamble().isEmpty()) {
throw new ParseException(
String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
}

if (argMultimap.getValue(PREFIX_NAME).isPresent()) {
name = ParserUtil.parseExerciseName(argMultimap.getValue(PREFIX_NAME).get());
}
if (argMultimap.getValue(PREFIX_DESCRIPTION).isPresent()) {
description = ParserUtil.parseDescription(argMultimap.getValue(PREFIX_DESCRIPTION).get());
}
if (argMultimap.getValue(PREFIX_DATE).isPresent()) {
date = ParserUtil.parseDate(argMultimap.getValue(PREFIX_DATE).get());
}
if (argMultimap.getValue(PREFIX_CALORIES).isPresent()) {
calories = ParserUtil.parseCalories(argMultimap.getValue(PREFIX_CALORIES).get());
}
if (argMultimap.getValue(PREFIX_KEYWORD).isPresent()) {
keywords = argMultimap.getValue(PREFIX_KEYWORD).get().split("\\s+");
}

return new FindCommand(new PropertiesMatchPredicateForExercise(name, description, date, calories,
keywords == null ? null : Arrays.asList(keywords)));
}

}