From cae96a6263a33382758797f8bf0f31e83858bf50 Mon Sep 17 00:00:00 2001 From: H4mes <123077808+H4mes@users.noreply.github.com> Date: Fri, 5 Apr 2024 01:14:09 +0800 Subject: [PATCH] Fix link not reflected in add and edit commands --- .../commands/articlecommands/AddArticleCommand.java | 11 +++++++---- .../commands/articlecommands/EditArticleCommand.java | 11 +++++++---- .../logic/parser/EditArticleCommandParser.java | 6 +++++- src/main/java/seedu/address/ui/ArticleCard.java | 1 + 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/seedu/address/logic/commands/articlecommands/AddArticleCommand.java b/src/main/java/seedu/address/logic/commands/articlecommands/AddArticleCommand.java index 30f98845475..94859c24094 100644 --- a/src/main/java/seedu/address/logic/commands/articlecommands/AddArticleCommand.java +++ b/src/main/java/seedu/address/logic/commands/articlecommands/AddArticleCommand.java @@ -5,6 +5,7 @@ import static seedu.address.logic.parser.CliSyntax.PREFIX_DATE; import static seedu.address.logic.parser.CliSyntax.PREFIX_HEADLINE; import static seedu.address.logic.parser.CliSyntax.PREFIX_INTERVIEWEE; +import static seedu.address.logic.parser.CliSyntax.PREFIX_LINK; import static seedu.address.logic.parser.CliSyntax.PREFIX_OUTLET; import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS; import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; @@ -31,19 +32,21 @@ public class AddArticleCommand extends ArticleCommand { + "Parameters: " + PREFIX_HEADLINE + "HEADLINE " + "[" + PREFIX_CONTRIBUTOR + "CONTRIBUTOR]... " - + PREFIX_DATE + "DATE] " + "[" + PREFIX_INTERVIEWEE + "INTERVIEWEE]... " + "[" + PREFIX_TAG + "TAG]... " + "[" + PREFIX_OUTLET + "OUTLET]... " - + PREFIX_STATUS + "STATUS\n" + + "[" + PREFIX_DATE + "DATE] " + + PREFIX_STATUS + "STATUS " + + "[" + PREFIX_LINK + "LINK]\n" + "Example: " + COMMAND_WORD + " " + COMMAND_PREFIX + " " + PREFIX_HEADLINE + "The Great Article " + PREFIX_CONTRIBUTOR + "John Doe " - + PREFIX_DATE + "2021-10-10 " + PREFIX_INTERVIEWEE + "Jane Doe " + PREFIX_TAG + "friends " + PREFIX_OUTLET + "The Great Outlet " - + PREFIX_STATUS + "DRAFT"; + + PREFIX_DATE + "10-10-2024 " + + PREFIX_STATUS + "DRAFT " + + PREFIX_LINK + "https://www.example.com"; public static final String MESSAGE_SUCCESS = "New article added: %1$s"; public static final String MESSAGE_DUPLICATE_ARTICLE = "This article already exists in the article book"; diff --git a/src/main/java/seedu/address/logic/commands/articlecommands/EditArticleCommand.java b/src/main/java/seedu/address/logic/commands/articlecommands/EditArticleCommand.java index 1bab9c102a4..d8876535f37 100644 --- a/src/main/java/seedu/address/logic/commands/articlecommands/EditArticleCommand.java +++ b/src/main/java/seedu/address/logic/commands/articlecommands/EditArticleCommand.java @@ -5,6 +5,7 @@ import static seedu.address.logic.parser.CliSyntax.PREFIX_DATE; import static seedu.address.logic.parser.CliSyntax.PREFIX_HEADLINE; import static seedu.address.logic.parser.CliSyntax.PREFIX_INTERVIEWEE; +import static seedu.address.logic.parser.CliSyntax.PREFIX_LINK; import static seedu.address.logic.parser.CliSyntax.PREFIX_OUTLET; import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS; import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; @@ -51,19 +52,21 @@ public class EditArticleCommand extends ArticleCommand { + "Parameters: INDEX (must be a positive integer) " + "[" + PREFIX_HEADLINE + "HEADLINE] " + "[" + PREFIX_CONTRIBUTOR + "CONTRIBUTOR]... " - + "[" + PREFIX_DATE + "DATE] " + "[" + PREFIX_INTERVIEWEE + "INTERVIEWEE]... " + "[" + PREFIX_TAG + "TAG]... " + "[" + PREFIX_OUTLET + "OUTLET]... " - + "[" + PREFIX_STATUS + "STATUS]\n" + + "[" + PREFIX_DATE + "DATE] " + + "[" + PREFIX_STATUS + "STATUS] " + + "[" + PREFIX_LINK + "LINK]\n" + "Example: " + COMMAND_WORD + " " + COMMAND_PREFIX + " 1 " + PREFIX_HEADLINE + "Headline " + PREFIX_CONTRIBUTOR + "Contributor(s) " - + PREFIX_DATE + "2021-10-10 " + PREFIX_INTERVIEWEE + "Interviewee(s) " + PREFIX_TAG + "New Tag(s) " + PREFIX_OUTLET + "New Outlet(s) " - + PREFIX_STATUS + "PUBLISHED"; + + PREFIX_DATE + "10-10-2024 " + + PREFIX_STATUS + "PUBLISHED " + + PREFIX_LINK + "https://www.example.com"; public static final String MESSAGE_EDIT_ARTICLE_SUCCESS = "Edited Article: %1$s"; public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided."; diff --git a/src/main/java/seedu/address/logic/parser/EditArticleCommandParser.java b/src/main/java/seedu/address/logic/parser/EditArticleCommandParser.java index 055eae274fd..9b2e8a4db46 100644 --- a/src/main/java/seedu/address/logic/parser/EditArticleCommandParser.java +++ b/src/main/java/seedu/address/logic/parser/EditArticleCommandParser.java @@ -6,6 +6,7 @@ import static seedu.address.logic.parser.CliSyntax.PREFIX_DATE; import static seedu.address.logic.parser.CliSyntax.PREFIX_HEADLINE; import static seedu.address.logic.parser.CliSyntax.PREFIX_INTERVIEWEE; +import static seedu.address.logic.parser.CliSyntax.PREFIX_LINK; import static seedu.address.logic.parser.CliSyntax.PREFIX_OUTLET; import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS; import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; @@ -38,7 +39,7 @@ public EditArticleCommand parse(String args) throws ParseException { requireNonNull(args); ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_HEADLINE, PREFIX_CONTRIBUTOR, PREFIX_INTERVIEWEE, - PREFIX_TAG, PREFIX_OUTLET, PREFIX_DATE, PREFIX_STATUS); + PREFIX_TAG, PREFIX_OUTLET, PREFIX_DATE, PREFIX_STATUS, PREFIX_LINK); Index index; @@ -64,6 +65,9 @@ public EditArticleCommand parse(String args) throws ParseException { editArticleDescriptor.setStatus(ParserUtil.parseStatus(argMultimap.getValue(PREFIX_STATUS) .get())); } + if (argMultimap.getValue(PREFIX_LINK).isPresent()) { + editArticleDescriptor.setLink(ParserUtil.parseLink(argMultimap.getValue(PREFIX_LINK).get())); + } parseAuthorsForEdit(argMultimap.getAllValues(PREFIX_CONTRIBUTOR)).ifPresent(editArticleDescriptor::setAuthors); parseSourcesForEdit(argMultimap.getAllValues(PREFIX_INTERVIEWEE)).ifPresent(editArticleDescriptor::setSources); diff --git a/src/main/java/seedu/address/ui/ArticleCard.java b/src/main/java/seedu/address/ui/ArticleCard.java index 78f1b9cb79d..6b939a33aeb 100644 --- a/src/main/java/seedu/address/ui/ArticleCard.java +++ b/src/main/java/seedu/address/ui/ArticleCard.java @@ -91,6 +91,7 @@ public ArticleCard(Article article, int displayedIndex) { }); } else { hyperlink.setVisible(false); + hyperlink.setManaged(false); } }