From 31fbf4274fa12af98884f7dac94f4184f1c157d3 Mon Sep 17 00:00:00 2001 From: Zhi-You Date: Wed, 7 Oct 2020 13:53:49 +0800 Subject: [PATCH 1/3] Change package name to personalise the project --- .../seedu/{duke => eduke8}/CommandInterface.java | 4 ++-- .../seedu/{duke/Duke.java => eduke8/Eduke8.java} | 4 ++-- .../seedu/{duke => eduke8}/OptionInterface.java | 2 +- .../{duke => eduke8}/OptionListInterface.java | 2 +- .../seedu/{duke => eduke8}/ParserInterface.java | 2 +- .../java/seedu/{duke => eduke8}/QuizInterface.java | 2 +- .../seedu/{duke => eduke8}/TopicInterface.java | 4 ++-- .../seedu/{duke => eduke8}/TopicListInterface.java | 2 +- .../java/seedu/{duke => eduke8}/UiInterface.java | 6 +++--- .../java/seedu/{duke => eduke8}/hint/Hint.java | 2 +- .../seedu/{duke => eduke8}/hint/HintInterface.java | 2 +- .../seedu/{duke => eduke8}/question/Question.java | 8 ++++---- .../question/QuestionInterface.java | 4 ++-- .../{duke => eduke8}/question/QuestionList.java | 2 +- .../question/QuestionListInterface.java | 2 +- .../seedu/{duke => eduke8}/storage/Storage.java | 14 +++++++------- .../{duke => eduke8}/storage/StorageInterface.java | 4 ++-- .../{duke/DukeTest.java => eduke8/Eduke8Test.java} | 4 ++-- .../java/seedu/{duke => eduke8}/StorageTest.java | 4 ++-- .../java/seedu/{duke => eduke8}/hint/HintTest.java | 2 +- 20 files changed, 38 insertions(+), 38 deletions(-) rename src/main/java/seedu/{duke => eduke8}/CommandInterface.java (66%) rename src/main/java/seedu/{duke/Duke.java => eduke8/Eduke8.java} (93%) rename src/main/java/seedu/{duke => eduke8}/OptionInterface.java (82%) rename src/main/java/seedu/{duke => eduke8}/OptionListInterface.java (91%) rename src/main/java/seedu/{duke => eduke8}/ParserInterface.java (80%) rename src/main/java/seedu/{duke => eduke8}/QuizInterface.java (72%) rename src/main/java/seedu/{duke => eduke8}/TopicInterface.java (59%) rename src/main/java/seedu/{duke => eduke8}/TopicListInterface.java (91%) rename src/main/java/seedu/{duke => eduke8}/UiInterface.java (82%) rename src/main/java/seedu/{duke => eduke8}/hint/Hint.java (90%) rename src/main/java/seedu/{duke => eduke8}/hint/HintInterface.java (71%) rename src/main/java/seedu/{duke => eduke8}/question/Question.java (94%) rename src/main/java/seedu/{duke => eduke8}/question/QuestionInterface.java (84%) rename src/main/java/seedu/{duke => eduke8}/question/QuestionList.java (98%) rename src/main/java/seedu/{duke => eduke8}/question/QuestionListInterface.java (93%) rename src/main/java/seedu/{duke => eduke8}/storage/Storage.java (93%) rename src/main/java/seedu/{duke => eduke8}/storage/StorageInterface.java (70%) rename src/test/java/seedu/{duke/DukeTest.java => eduke8/Eduke8Test.java} (80%) rename src/test/java/seedu/{duke => eduke8}/StorageTest.java (91%) rename src/test/java/seedu/{duke => eduke8}/hint/HintTest.java (93%) diff --git a/src/main/java/seedu/duke/CommandInterface.java b/src/main/java/seedu/eduke8/CommandInterface.java similarity index 66% rename from src/main/java/seedu/duke/CommandInterface.java rename to src/main/java/seedu/eduke8/CommandInterface.java index e0209d31f7..af88c5aae4 100644 --- a/src/main/java/seedu/duke/CommandInterface.java +++ b/src/main/java/seedu/eduke8/CommandInterface.java @@ -1,6 +1,6 @@ -package seedu.duke; +package seedu.eduke8; -import seedu.duke.storage.StorageInterface; +import seedu.eduke8.storage.StorageInterface; public interface CommandInterface { void execute(TopicListInterface topics, StorageInterface storage); diff --git a/src/main/java/seedu/duke/Duke.java b/src/main/java/seedu/eduke8/Eduke8.java similarity index 93% rename from src/main/java/seedu/duke/Duke.java rename to src/main/java/seedu/eduke8/Eduke8.java index 5c74e68d59..3a8651600d 100644 --- a/src/main/java/seedu/duke/Duke.java +++ b/src/main/java/seedu/eduke8/Eduke8.java @@ -1,8 +1,8 @@ -package seedu.duke; +package seedu.eduke8; import java.util.Scanner; -public class Duke { +public class Eduke8 { /** * Main entry-point for the java.duke.Duke application. */ diff --git a/src/main/java/seedu/duke/OptionInterface.java b/src/main/java/seedu/eduke8/OptionInterface.java similarity index 82% rename from src/main/java/seedu/duke/OptionInterface.java rename to src/main/java/seedu/eduke8/OptionInterface.java index 68a912f974..8f2b01265b 100644 --- a/src/main/java/seedu/duke/OptionInterface.java +++ b/src/main/java/seedu/eduke8/OptionInterface.java @@ -1,4 +1,4 @@ -package seedu.duke; +package seedu.eduke8; public interface OptionInterface { String getOptionDescription(); diff --git a/src/main/java/seedu/duke/OptionListInterface.java b/src/main/java/seedu/eduke8/OptionListInterface.java similarity index 91% rename from src/main/java/seedu/duke/OptionListInterface.java rename to src/main/java/seedu/eduke8/OptionListInterface.java index 12cab3c8d8..281e4a08e2 100644 --- a/src/main/java/seedu/duke/OptionListInterface.java +++ b/src/main/java/seedu/eduke8/OptionListInterface.java @@ -1,4 +1,4 @@ -package seedu.duke; +package seedu.eduke8; import java.util.ArrayList; diff --git a/src/main/java/seedu/duke/ParserInterface.java b/src/main/java/seedu/eduke8/ParserInterface.java similarity index 80% rename from src/main/java/seedu/duke/ParserInterface.java rename to src/main/java/seedu/eduke8/ParserInterface.java index 7245ed9bbe..be559be955 100644 --- a/src/main/java/seedu/duke/ParserInterface.java +++ b/src/main/java/seedu/eduke8/ParserInterface.java @@ -1,4 +1,4 @@ -package seedu.duke; +package seedu.eduke8; public interface ParserInterface { CommandInterface parseCommand(String userInput); diff --git a/src/main/java/seedu/duke/QuizInterface.java b/src/main/java/seedu/eduke8/QuizInterface.java similarity index 72% rename from src/main/java/seedu/duke/QuizInterface.java rename to src/main/java/seedu/eduke8/QuizInterface.java index 04f19d0cdb..21f9cb8287 100644 --- a/src/main/java/seedu/duke/QuizInterface.java +++ b/src/main/java/seedu/eduke8/QuizInterface.java @@ -1,4 +1,4 @@ -package seedu.duke; +package seedu.eduke8; public interface QuizInterface { void startQuiz(); diff --git a/src/main/java/seedu/duke/TopicInterface.java b/src/main/java/seedu/eduke8/TopicInterface.java similarity index 59% rename from src/main/java/seedu/duke/TopicInterface.java rename to src/main/java/seedu/eduke8/TopicInterface.java index baeb1691c0..1d3fbd8a2e 100644 --- a/src/main/java/seedu/duke/TopicInterface.java +++ b/src/main/java/seedu/eduke8/TopicInterface.java @@ -1,6 +1,6 @@ -package seedu.duke; +package seedu.eduke8; -import seedu.duke.question.QuestionListInterface; +import seedu.eduke8.question.QuestionListInterface; public interface TopicInterface { String getTopic(); diff --git a/src/main/java/seedu/duke/TopicListInterface.java b/src/main/java/seedu/eduke8/TopicListInterface.java similarity index 91% rename from src/main/java/seedu/duke/TopicListInterface.java rename to src/main/java/seedu/eduke8/TopicListInterface.java index dd794272f7..4930dab34a 100644 --- a/src/main/java/seedu/duke/TopicListInterface.java +++ b/src/main/java/seedu/eduke8/TopicListInterface.java @@ -1,4 +1,4 @@ -package seedu.duke; +package seedu.eduke8; import java.util.ArrayList; diff --git a/src/main/java/seedu/duke/UiInterface.java b/src/main/java/seedu/eduke8/UiInterface.java similarity index 82% rename from src/main/java/seedu/duke/UiInterface.java rename to src/main/java/seedu/eduke8/UiInterface.java index 8138fc375b..915784e056 100644 --- a/src/main/java/seedu/duke/UiInterface.java +++ b/src/main/java/seedu/eduke8/UiInterface.java @@ -1,7 +1,7 @@ -package seedu.duke; +package seedu.eduke8; -import seedu.duke.hint.HintInterface; -import seedu.duke.question.QuestionInterface; +import seedu.eduke8.hint.HintInterface; +import seedu.eduke8.question.QuestionInterface; public interface UiInterface { String getInputFromUser(); diff --git a/src/main/java/seedu/duke/hint/Hint.java b/src/main/java/seedu/eduke8/hint/Hint.java similarity index 90% rename from src/main/java/seedu/duke/hint/Hint.java rename to src/main/java/seedu/eduke8/hint/Hint.java index 32818000a5..a3801724b3 100644 --- a/src/main/java/seedu/duke/hint/Hint.java +++ b/src/main/java/seedu/eduke8/hint/Hint.java @@ -1,4 +1,4 @@ -package seedu.duke.hint; +package seedu.eduke8.hint; public class Hint implements HintInterface { private String description; diff --git a/src/main/java/seedu/duke/hint/HintInterface.java b/src/main/java/seedu/eduke8/hint/HintInterface.java similarity index 71% rename from src/main/java/seedu/duke/hint/HintInterface.java rename to src/main/java/seedu/eduke8/hint/HintInterface.java index 463baa780f..88f102226b 100644 --- a/src/main/java/seedu/duke/hint/HintInterface.java +++ b/src/main/java/seedu/eduke8/hint/HintInterface.java @@ -1,4 +1,4 @@ -package seedu.duke.hint; +package seedu.eduke8.hint; public interface HintInterface { String getHintDescription(); diff --git a/src/main/java/seedu/duke/question/Question.java b/src/main/java/seedu/eduke8/question/Question.java similarity index 94% rename from src/main/java/seedu/duke/question/Question.java rename to src/main/java/seedu/eduke8/question/Question.java index 9502e3b4c9..c31917b9c7 100644 --- a/src/main/java/seedu/duke/question/Question.java +++ b/src/main/java/seedu/eduke8/question/Question.java @@ -1,8 +1,8 @@ -package seedu.duke.question; +package seedu.eduke8.question; -import seedu.duke.hint.HintInterface; -import seedu.duke.OptionInterface; -import seedu.duke.OptionListInterface; +import seedu.eduke8.hint.HintInterface; +import seedu.eduke8.OptionInterface; +import seedu.eduke8.OptionListInterface; import java.util.ArrayList; diff --git a/src/main/java/seedu/duke/question/QuestionInterface.java b/src/main/java/seedu/eduke8/question/QuestionInterface.java similarity index 84% rename from src/main/java/seedu/duke/question/QuestionInterface.java rename to src/main/java/seedu/eduke8/question/QuestionInterface.java index f9b370e33c..64d38edecb 100644 --- a/src/main/java/seedu/duke/question/QuestionInterface.java +++ b/src/main/java/seedu/eduke8/question/QuestionInterface.java @@ -1,6 +1,6 @@ -package seedu.duke.question; +package seedu.eduke8.question; -import seedu.duke.OptionInterface; +import seedu.eduke8.OptionInterface; import java.util.ArrayList; diff --git a/src/main/java/seedu/duke/question/QuestionList.java b/src/main/java/seedu/eduke8/question/QuestionList.java similarity index 98% rename from src/main/java/seedu/duke/question/QuestionList.java rename to src/main/java/seedu/eduke8/question/QuestionList.java index eb1ff04c27..bbb0aa0099 100644 --- a/src/main/java/seedu/duke/question/QuestionList.java +++ b/src/main/java/seedu/eduke8/question/QuestionList.java @@ -1,4 +1,4 @@ -package seedu.duke.question; +package seedu.eduke8.question; import java.util.ArrayList; import java.util.Random; diff --git a/src/main/java/seedu/duke/question/QuestionListInterface.java b/src/main/java/seedu/eduke8/question/QuestionListInterface.java similarity index 93% rename from src/main/java/seedu/duke/question/QuestionListInterface.java rename to src/main/java/seedu/eduke8/question/QuestionListInterface.java index 9d9033a4f2..bd1f9878c4 100644 --- a/src/main/java/seedu/duke/question/QuestionListInterface.java +++ b/src/main/java/seedu/eduke8/question/QuestionListInterface.java @@ -1,4 +1,4 @@ -package seedu.duke.question; +package seedu.eduke8.question; import java.util.ArrayList; diff --git a/src/main/java/seedu/duke/storage/Storage.java b/src/main/java/seedu/eduke8/storage/Storage.java similarity index 93% rename from src/main/java/seedu/duke/storage/Storage.java rename to src/main/java/seedu/eduke8/storage/Storage.java index 4f0a9831a0..c8ca6ee057 100644 --- a/src/main/java/seedu/duke/storage/Storage.java +++ b/src/main/java/seedu/eduke8/storage/Storage.java @@ -1,16 +1,16 @@ -package seedu.duke.storage; +package seedu.eduke8.storage; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import seedu.duke.OptionInterface; -import seedu.duke.OptionListInterface; -import seedu.duke.question.QuestionInterface; -import seedu.duke.question.QuestionListInterface; -import seedu.duke.TopicInterface; -import seedu.duke.UiInterface; +import seedu.eduke8.OptionInterface; +import seedu.eduke8.OptionListInterface; +import seedu.eduke8.question.QuestionInterface; +import seedu.eduke8.question.QuestionListInterface; +import seedu.eduke8.TopicInterface; +import seedu.eduke8.UiInterface; import java.io.File; import java.io.FileReader; diff --git a/src/main/java/seedu/duke/storage/StorageInterface.java b/src/main/java/seedu/eduke8/storage/StorageInterface.java similarity index 70% rename from src/main/java/seedu/duke/storage/StorageInterface.java rename to src/main/java/seedu/eduke8/storage/StorageInterface.java index c405d399eb..0eaab22e51 100644 --- a/src/main/java/seedu/duke/storage/StorageInterface.java +++ b/src/main/java/seedu/eduke8/storage/StorageInterface.java @@ -1,6 +1,6 @@ -package seedu.duke.storage; +package seedu.eduke8.storage; -import seedu.duke.TopicInterface; +import seedu.eduke8.TopicInterface; import java.util.ArrayList; diff --git a/src/test/java/seedu/duke/DukeTest.java b/src/test/java/seedu/eduke8/Eduke8Test.java similarity index 80% rename from src/test/java/seedu/duke/DukeTest.java rename to src/test/java/seedu/eduke8/Eduke8Test.java index 2dda5fd651..fc9842864d 100644 --- a/src/test/java/seedu/duke/DukeTest.java +++ b/src/test/java/seedu/eduke8/Eduke8Test.java @@ -1,10 +1,10 @@ -package seedu.duke; +package seedu.eduke8; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -class DukeTest { +class Eduke8Test { @Test public void sampleTest() { assertTrue(true); diff --git a/src/test/java/seedu/duke/StorageTest.java b/src/test/java/seedu/eduke8/StorageTest.java similarity index 91% rename from src/test/java/seedu/duke/StorageTest.java rename to src/test/java/seedu/eduke8/StorageTest.java index b67c0d2434..9675985c40 100644 --- a/src/test/java/seedu/duke/StorageTest.java +++ b/src/test/java/seedu/eduke8/StorageTest.java @@ -1,7 +1,7 @@ -package seedu.duke; +package seedu.eduke8; import org.junit.jupiter.api.Test; -import seedu.duke.storage.Storage; +import seedu.eduke8.storage.Storage; import java.util.ArrayList; diff --git a/src/test/java/seedu/duke/hint/HintTest.java b/src/test/java/seedu/eduke8/hint/HintTest.java similarity index 93% rename from src/test/java/seedu/duke/hint/HintTest.java rename to src/test/java/seedu/eduke8/hint/HintTest.java index 089788bf37..815baa8533 100644 --- a/src/test/java/seedu/duke/hint/HintTest.java +++ b/src/test/java/seedu/eduke8/hint/HintTest.java @@ -1,4 +1,4 @@ -package seedu.duke.hint; +package seedu.eduke8.hint; import org.junit.jupiter.api.Test; From 24fb98734e9e0c2e877603e91789520a6083596f Mon Sep 17 00:00:00 2001 From: Zhi-You Date: Wed, 7 Oct 2020 14:04:16 +0800 Subject: [PATCH 2/3] Tweak I/O test to comply with package name --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e88c19d480..e34af566a6 100644 --- a/build.gradle +++ b/build.gradle @@ -31,11 +31,11 @@ test { } application { - mainClassName = "seedu.duke.Duke" + mainClassName = "seedu.eduke8.Eduke8" } shadowJar { - archiveBaseName = "duke" + archiveBaseName = "eduke8" archiveClassifier = null } From 07fcd7fbb4815595be66028404bfa2eb1d9d572d Mon Sep 17 00:00:00 2001 From: Zhi-You Date: Wed, 7 Oct 2020 14:59:58 +0800 Subject: [PATCH 3/3] Change all package name to comply with eduke8 --- src/main/java/seedu/eduke8/UiInterface.java | 39 ------------------- .../java/seedu/eduke8/storage/Storage.java | 5 +-- src/main/java/seedu/eduke8/ui/Ui.java | 8 ++-- .../java/seedu/eduke8/ui/UiInterface.java | 10 +---- 4 files changed, 8 insertions(+), 54 deletions(-) delete mode 100644 src/main/java/seedu/eduke8/UiInterface.java diff --git a/src/main/java/seedu/eduke8/UiInterface.java b/src/main/java/seedu/eduke8/UiInterface.java deleted file mode 100644 index ff7f7158fa..0000000000 --- a/src/main/java/seedu/eduke8/UiInterface.java +++ /dev/null @@ -1,39 +0,0 @@ -package seedu.eduke8; - - -import seedu.eduke8.hint.HintInterface; -import seedu.eduke8.question.QuestionInterface; -import seedu.eduke8.option.OptionInterface; - - - -public interface UiInterface { - String getInputFromUser(); - - void printGreetMessage(); - - void printExitMessage(); - - void printOption(OptionInterface option, int optionNumber); - - void printQuestion(QuestionInterface question, int questionNumber); - - void printHint(HintInterface hint); - - void printStartQuizPage(int numberOfQuestionsChosen, String topicsChosen); - - void printEndQuizPage(); - - void printAnswerIsWrong(); - - void printAnswerIsCorrect(); - - void printHelp(); - - void printAbout(); - - void printTextbook(); - - void printError(); - -} diff --git a/src/main/java/seedu/eduke8/storage/Storage.java b/src/main/java/seedu/eduke8/storage/Storage.java index 4bdb3e0ede..615ee21cee 100644 --- a/src/main/java/seedu/eduke8/storage/Storage.java +++ b/src/main/java/seedu/eduke8/storage/Storage.java @@ -7,11 +7,10 @@ import seedu.eduke8.question.QuestionInterface; import seedu.eduke8.question.QuestionListInterface; import seedu.eduke8.TopicInterface; -import seedu.eduke8.UiInterface; +import seedu.eduke8.ui.UiInterface; import seedu.eduke8.option.OptionInterface; import seedu.eduke8.option.OptionListInterface; -import seedu.eduke8.TopicInterface; -import seedu.eduke8.UiInterface; + import java.io.File; diff --git a/src/main/java/seedu/eduke8/ui/Ui.java b/src/main/java/seedu/eduke8/ui/Ui.java index bb7a214a4a..a034e09410 100644 --- a/src/main/java/seedu/eduke8/ui/Ui.java +++ b/src/main/java/seedu/eduke8/ui/Ui.java @@ -1,8 +1,8 @@ -package seedu.duke.ui; +package seedu.eduke8.ui; -import seedu.duke.hint.HintInterface; -import seedu.duke.question.QuestionInterface; -import seedu.duke.option.OptionInterface; +import seedu.eduke8.hint.HintInterface; +import seedu.eduke8.question.QuestionInterface; +import seedu.eduke8.option.OptionInterface; import java.util.Scanner; diff --git a/src/main/java/seedu/eduke8/ui/UiInterface.java b/src/main/java/seedu/eduke8/ui/UiInterface.java index 92a7c9b92f..db0ff6287b 100644 --- a/src/main/java/seedu/eduke8/ui/UiInterface.java +++ b/src/main/java/seedu/eduke8/ui/UiInterface.java @@ -1,18 +1,12 @@ -<<<<<<< HEAD:src/main/java/seedu/eduke8/UiInterface.java -package seedu.eduke8; +package seedu.eduke8.ui; import seedu.eduke8.hint.HintInterface; import seedu.eduke8.question.QuestionInterface; import seedu.eduke8.option.OptionInterface; -======= -package seedu.duke.ui; -import seedu.duke.hint.HintInterface; -import seedu.duke.question.QuestionInterface; -import seedu.duke.option.OptionInterface; ->>>>>>> master:src/main/java/seedu/eduke8/ui/UiInterface.java + public interface UiInterface { String getInputFromUser();