From 59a306b0d61232d055e83e226c67e626273dd5f3 Mon Sep 17 00:00:00 2001 From: Parcly Taxel Date: Thu, 17 Oct 2019 09:13:13 +0800 Subject: [PATCH 1/2] Show Kuzka's mother to the original developers --- src/main/java/seedu/address/ui/MainWindow.java | 16 ---------------- .../seedu/address/commons/util/JsonUtilTest.java | 4 ---- 2 files changed, 20 deletions(-) diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/seedu/address/ui/MainWindow.java index 7fa0d8a090d..433775c69c9 100644 --- a/src/main/java/seedu/address/ui/MainWindow.java +++ b/src/main/java/seedu/address/ui/MainWindow.java @@ -92,22 +92,6 @@ private void setAccelerators() { */ private void setAccelerator(MenuItem menuItem, KeyCombination keyCombination) { menuItem.setAccelerator(keyCombination); - - /* - * TODO: the code below can be removed once the bug reported here - * https://bugs.openjdk.java.net/browse/JDK-8131666 - * is fixed in later version of SDK. - * - * According to the bug report, TextInputControl (TextField, TextArea) will - * consume function-key events. Because CommandBox contains a TextField, and - * ResultDisplay contains a TextArea, thus some accelerators (e.g F1) will - * not work when the focus is in them because the key event is consumed by - * the TextInputControl(s). - * - * For now, we add following event filter to capture such key events and open - * help window purposely so to support accelerators even when focus is - * in CommandBox or ResultDisplay. - */ getRoot().addEventFilter(KeyEvent.KEY_PRESSED, event -> { if (event.getTarget() instanceof TextInputControl && keyCombination.match(event)) { menuItem.getOnAction().handle(new ActionEvent()); diff --git a/src/test/java/seedu/address/commons/util/JsonUtilTest.java b/src/test/java/seedu/address/commons/util/JsonUtilTest.java index d4907539dee..8d6aac1521b 100644 --- a/src/test/java/seedu/address/commons/util/JsonUtilTest.java +++ b/src/test/java/seedu/address/commons/util/JsonUtilTest.java @@ -38,8 +38,4 @@ public void deserializeObjectFromJsonFile_noExceptionThrown() throws IOException assertEquals(serializableTestClass.getListOfLocalDateTimes(), SerializableTestClass.getListTestValues()); assertEquals(serializableTestClass.getMapOfIntegerToString(), SerializableTestClass.getHashMapTestValues()); } - - //TODO: @Test jsonUtil_readJsonStringToObjectInstance_correctObject() - - //TODO: @Test jsonUtil_writeThenReadObjectToJson_correctObject() } From a0ef9f0b415b759759a6d49256018f8e46ec6c91 Mon Sep 17 00:00:00 2001 From: Parcly Taxel Date: Thu, 17 Oct 2019 09:29:16 +0800 Subject: [PATCH 2/2] List all lecture notes, clear all lecture notes --- docs/UserGuide.adoc | 15 ++++++++------- docs/team/PortfolioParclyTaxel.adoc | 9 ++++----- .../address/logic/commands/ClearNoteCommand.java | 3 ++- .../address/logic/commands/ListNoteCommand.java | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/docs/UserGuide.adoc b/docs/UserGuide.adoc index b6cb5e01311..30b66b268bc 100644 --- a/docs/UserGuide.adoc +++ b/docs/UserGuide.adoc @@ -73,17 +73,18 @@ Find lecture notes whose title contains every given word (space-separated, ignor and display them. + Format: `findnote WORD [WORD]…` +==== Listing all lecture notes: `listnote` +Simply show all lecture notes. + +Format: `listnote` + ==== Deleting lecture notes: `deletenote` Delete the lecture note with the given index, which follows the same restrictions as with `editnote`. + Format: `deletenote INDEX` -==== Exporting all entries: `export` -Export all items in NUStudy, both flash cards and lecture notes, into a file with the given name. + -Format: `export FILENAME` - -==== Importing all entries: `import` -Import all items in the given file into NUStudy. This overwrites any items already in the app. + -Format: `import FILENAME` +==== Clearing all lecture notes: `clearnote` +Clear all lecture notes. This does not affect quiz questions, but may affect revision tasks linked +to the cleared notes. + +Format: `clearnote` // end::lecnote[] === Questions diff --git a/docs/team/PortfolioParclyTaxel.adoc b/docs/team/PortfolioParclyTaxel.adoc index 38968ef6596..52be843a8cb 100644 --- a/docs/team/PortfolioParclyTaxel.adoc +++ b/docs/team/PortfolioParclyTaxel.adoc @@ -43,7 +43,7 @@ lecture notes. This helped my teammates add their own features, setting an examp such as the user guide's introduction and the developer guide's non-functional requirements. See https://github.com/AY1920S1-CS2103T-F11-4/main/pull/21[#21] and https://github.com/AY1920S1-CS2103T-F11-4/main/pull/22[#22] for examples. -* I was the **main integrator** for NUStudy: +* I was the **lead integrator** for NUStudy: ** Managed all four releases (v1.1 to v1.4) on GitHub ** Set up Travis and Netlify for the project, enabling continuous integration and previews of documentation ** Resolved merge conflicts for teammates' pull requests (see https://github.com/AY1920S1-CS2103T-F11-4/main/pull/44[#44] for an example) @@ -52,11 +52,10 @@ for examples. * I contributed to https://github.com/nus-cs2103-AY1920S1/forum[forum] discussions, both as an answerer (https://github.com/nus-cs2103-AY1920S1/forum/issues/88[#88], https://github.com/nus-cs2103-AY1920S1/forum/issues/106[#106]) and asker (https://github.com/nus-cs2103-AY1920S1/forum/issues/68[#68], https://github.com/nus-cs2103-AY1920S1/forum/issues/100[#100]). -* *Code contributed*: [https://github.com[Functional code]] [https://github.com[Test code]] _{give links to collated code files}_ +* I reviewed the following pull requests non-trivially, among others: https://github.com/AY1920S1-CS2103T-F11-4/main/pull/40[#40], +https://github.com/AY1920S1-CS2103T-F11-4/main/pull/49[#49], https://github.com/AY1920S1-CS2103T-F11-4/main/pull/53[#53] -* PRs reviewed (with non-trivial review comments): https://github.com[#A], https://github.com[#B], https://github.com[#C], https://github.com[#D] - -* Reported bugs and suggestions for other teams in the class (examples: https://github.com[1], https://github.com[2], https://github.com[3]) +*Code contributed*: [https://github.com[Functional code]] [https://github.com[Test code]] _{give links to collated code files}_ == User guide contributions diff --git a/src/main/java/seedu/address/logic/commands/ClearNoteCommand.java b/src/main/java/seedu/address/logic/commands/ClearNoteCommand.java index 06a322d7a02..5b4e2e3b0f1 100644 --- a/src/main/java/seedu/address/logic/commands/ClearNoteCommand.java +++ b/src/main/java/seedu/address/logic/commands/ClearNoteCommand.java @@ -7,9 +7,10 @@ /** * Clears lecture notes. + * TODO can Shui Yao modify this so that it clears just the lecture notes? */ public class ClearNoteCommand extends Command { - public static final String COMMAND_WORD = "clear"; + public static final String COMMAND_WORD = "clearnote"; public static final String MESSAGE_SUCCESS = "Lecture notes have been cleared!"; @Override diff --git a/src/main/java/seedu/address/logic/commands/ListNoteCommand.java b/src/main/java/seedu/address/logic/commands/ListNoteCommand.java index f5122bf95d5..a7b3ab093c4 100644 --- a/src/main/java/seedu/address/logic/commands/ListNoteCommand.java +++ b/src/main/java/seedu/address/logic/commands/ListNoteCommand.java @@ -9,7 +9,7 @@ * Lists all lecture notes. */ public class ListNoteCommand extends Command { - public static final String COMMAND_WORD = "list"; + public static final String COMMAND_WORD = "listnote"; public static final String MESSAGE_SUCCESS = "Listed all lecture notes";