diff --git a/build.gradle b/build.gradle index 9ef31a3e0e2..359649c38dc 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id 'jacoco' } -mainClassName = 'seedu.address.Main' +mainClassName = 'housekeeping.hub.Main' sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index f5ff35c9506..1a7434e952a 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -153,7 +153,7 @@ The `Storage` component, ### Common classes -Classes used by multiple components are in the `seedu.addressbook.commons` package. +Classes used by multiple components are in the `housekeeping.addressbook.commons` package. -------------------------------------------------------------------------------------------------------------------- @@ -161,96 +161,14 @@ Classes used by multiple components are in the `seedu.addressbook.commons` packa This section describes some noteworthy details on how certain features are implemented. -### \[Completed\] Sorting cleints by predicted next cleaning date +### \[Completed\] Generating leads for housekeeping services In an admin operator's job there is a use case where they need to sort the clients by the predicted next cleaning date. This is useful for the operator to remind the clients to book their next service soon. We have stored this housekeeping information in `HousekeepingDetails` which also supports some other use cases such as the client does not want to be called or would prefer to be called on a later date. -#### How the feature is implemented - -* `VersionedAddressBook#commit()` — Saves the current address book state in its history. -* `VersionedAddressBook#undo()` — Restores the previous address book state from its history. -* `VersionedAddressBook#redo()` — Restores a previously undone address book state from its history. - -These operations are exposed in the `Model` interface as `Model#commitAddressBook()`, `Model#undoAddressBook()` and `Model#redoAddressBook()` respectively. - -Given below is an example usage scenario and how the undo/redo mechanism behaves at each step. - -Step 1. The user launches the application for the first time. The `VersionedAddressBook` will be initialized with the initial address book state, and the `currentStatePointer` pointing to that single address book state. - -![UndoRedoState0](images/UndoRedoState0.png) - -Step 2. The user executes `delete 5` command to delete the 5th person in the address book. The `delete` command calls `Model#commitAddressBook()`, causing the modified state of the address book after the `delete 5` command executes to be saved in the `addressBookStateList`, and the `currentStatePointer` is shifted to the newly inserted address book state. - -![UndoRedoState1](images/UndoRedoState1.png) - -Step 3. The user executes `add n/David …​` to add a new person. The `add` command also calls `Model#commitAddressBook()`, causing another modified address book state to be saved into the `addressBookStateList`. - -![UndoRedoState2](images/UndoRedoState2.png) - -
:information_source: **Note:** If a command fails its execution, it will not call `Model#commitAddressBook()`, so the address book state will not be saved into the `addressBookStateList`. - -
- -Step 4. The user now decides that adding the person was a mistake, and decides to undo that action by executing the `undo` command. The `undo` command will call `Model#undoAddressBook()`, which will shift the `currentStatePointer` once to the left, pointing it to the previous address book state, and restores the address book to that state. - -![UndoRedoState3](images/UndoRedoState3.png) - -
:information_source: **Note:** If the `currentStatePointer` is at index 0, pointing to the initial AddressBook state, then there are no previous AddressBook states to restore. The `undo` command uses `Model#canUndoAddressBook()` to check if this is the case. If so, it will return an error to the user rather -than attempting to perform the undo. - -
- -The following sequence diagram shows how an undo operation goes through the `Logic` component: - -![UndoSequenceDiagram](images/UndoSequenceDiagram-Logic.png) - -
:information_source: **Note:** The lifeline for `UndoCommand` should end at the destroy marker (X) but due to a limitation of PlantUML, the lifeline reaches the end of diagram. - -
- -Similarly, how an undo operation goes through the `Model` component is shown below: - -![UndoSequenceDiagram](images/UndoSequenceDiagram-Model.png) - -The `redo` command does the opposite — it calls `Model#redoAddressBook()`, which shifts the `currentStatePointer` once to the right, pointing to the previously undone state, and restores the address book to that state. - -
:information_source: **Note:** If the `currentStatePointer` is at index `addressBookStateList.size() - 1`, pointing to the latest address book state, then there are no undone AddressBook states to restore. The `redo` command uses `Model#canRedoAddressBook()` to check if this is the case. If so, it will return an error to the user rather than attempting to perform the redo. - -
- -Step 5. The user then decides to execute the command `list`. Commands that do not modify the address book, such as `list`, will usually not call `Model#commitAddressBook()`, `Model#undoAddressBook()` or `Model#redoAddressBook()`. Thus, the `addressBookStateList` remains unchanged. - -![UndoRedoState4](images/UndoRedoState4.png) - -Step 6. The user executes `clear`, which calls `Model#commitAddressBook()`. Since the `currentStatePointer` is not pointing at the end of the `addressBookStateList`, all address book states after the `currentStatePointer` will be purged. Reason: It no longer makes sense to redo the `add n/David …​` command. This is the behavior that most modern desktop applications follow. - -![UndoRedoState5](images/UndoRedoState5.png) - -The following activity diagram summarizes what happens when a user executes a new command: - - - -#### Design considerations: - -**Aspect: How undo & redo executes:** - -* **Alternative 1 (current choice):** Saves the entire address book. - * Pros: Easy to implement. - * Cons: May have performance issues in terms of memory usage. - -* **Alternative 2:** Individual command knows how to undo/redo by - itself. - * Pros: Will use less memory (e.g. for `delete`, just save the person being deleted). - * Cons: We must ensure that the implementation of each individual command are correct. - -_{more aspects and alternatives to be added}_ - -### \[Proposed\] Generating leads for housekeeping services - -#### Proposed Implementation +#### How it is implemented We assume clients who do not have `HousekeepingDetails` do not want to be disturbed by the housekeeping company. Therefore, the client list should be first filtered by `Client.hasHousekeepingDetais()` then sorted by `HousekeepingDetails`. We will also not show clients who have their predicted next housekeeping date that is after the current date. @@ -261,6 +179,9 @@ The `compareTo()` method calls the `HousekeepingDetails`'s `compareTo()` method The `compareTo()` method in `HousekeepingDetails` uses the `getNextHousekeepingDate()` method which is calculated by `lastHousekeepingDate.plus(preferredInterval)`. +`ClientComprator` is then used by `FXCollections.sort()` to sort the list of clients. `ClientComparator` compares `Client`s +using their `compareTo()` method. + We will also store `bookingDate` if the `Client` already made a booking. This is convenient for the admin to know and prevent calling the client when it is not needed. Furthermore, `deferment` is also stored to know if the client wants to defer the reminder to a later date. diff --git a/docs/SettingUp.md b/docs/SettingUp.md index 275445bd551..82ce1170a82 100644 --- a/docs/SettingUp.md +++ b/docs/SettingUp.md @@ -23,7 +23,7 @@ If you plan to use Intellij IDEA (highly recommended): 1. **Import the project as a Gradle project**: Follow the guide [_[se-edu/guides] IDEA: Importing a Gradle project_](https://se-education.org/guides/tutorials/intellijImportGradleProject.html) to import the project into IDEA.
:exclamation: Note: Importing a Gradle project is slightly different from importing a normal Java project. 1. **Verify the setup**: - 1. Run the `seedu.address.Main` and try a few commands. + 1. Run the `housekeeping.hub.Main` and try a few commands. 1. [Run the tests](Testing.md) to ensure they all pass. -------------------------------------------------------------------------------------------------------------------- diff --git a/docs/Testing.md b/docs/Testing.md index 8a99e82438a..15ef9a3df16 100644 --- a/docs/Testing.md +++ b/docs/Testing.md @@ -29,8 +29,8 @@ There are two ways to run tests. This project has three types of tests: 1. *Unit tests* targeting the lowest level methods/classes.
- e.g. `seedu.address.commons.StringUtilTest` + e.g. `housekeeping.hub.commons.StringUtilTest` 1. *Integration tests* that are checking the integration of multiple code units (those code units are assumed to be working).
- e.g. `seedu.address.storage.StorageManagerTest` + e.g. `housekeeping.hub.storage.StorageManagerTest` 1. Hybrids of unit and integration tests. These test are checking multiple code units as well as how the are connected together.
- e.g. `seedu.address.logic.LogicManagerTest` + e.g. `housekeeping.hub.logic.LogicManagerTest` diff --git a/docs/tutorials/AddRemark.md b/docs/tutorials/AddRemark.md index d98f38982e7..8738ba3e715 100644 --- a/docs/tutorials/AddRemark.md +++ b/docs/tutorials/AddRemark.md @@ -16,16 +16,16 @@ We’ll assume that you have already set up the development environment as outli Looking in the `logic.command` package, you will notice that each existing command have their own class. All the commands inherit from the abstract class `Command` which means that they must override `execute()`. Each `Command` returns an instance of `CommandResult` upon success and `CommandResult#feedbackToUser` is printed to the `ResultDisplay`. -Let’s start by creating a new `RemarkCommand` class in the `src/main/java/seedu/address/logic/command` directory. +Let’s start by creating a new `RemarkCommand` class in the `src/main/java/housekeeping/address/logic/command` directory. For now, let’s keep `RemarkCommand` as simple as possible and print some output. We accomplish that by returning a `CommandResult` with an accompanying message. **`RemarkCommand.java`:** ``` java -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; -import seedu.address.model.Model; +import housekeeping.hub.model.Model; /** * Changes the remark of an existing person in the address book. @@ -91,7 +91,7 @@ Let’s change `RemarkCommand` to parse input from the user. We start by modifying the constructor of `RemarkCommand` to accept an `Index` and a `String`. While we are at it, let’s change the error message to echo the values. While this is not a replacement for tests, it is an obvious way to tell if our code is functioning as intended. ``` java -import static seedu.address.commons.util.CollectionUtil.requireAllNonNull; +import static housekeeping.hub.commons.util.CollectionUtil.requireAllNonNull; //... public class RemarkCommand extends Command { //... @@ -140,7 +140,7 @@ Your code should look something like [this](https://github.com/se-edu/addressboo Now let’s move on to writing a parser that will extract the index and remark from the input provided by the user. -Create a `RemarkCommandParser` class in the `seedu.address.logic.parser` package. The class must extend the `Parser` interface. +Create a `RemarkCommandParser` class in the `housekeeping.hub.logic.parser` package. The class must extend the `Parser` interface. ![The relationship between Parser and RemarkCommandParser](../images/add-remark/RemarkCommandParserClass.png) @@ -227,7 +227,7 @@ Now that we have all the information that we need, let’s lay the groundwork fo ### Add a new `Remark` class -Create a new `Remark` in `seedu.address.model.person`. Since a `Remark` is a field that is similar to `Address`, we can reuse a significant bit of code. +Create a new `Remark` in `housekeeping.hub.model.person`. Since a `Remark` is a field that is similar to `Address`, we can reuse a significant bit of code. A copy-paste and search-replace later, you should have something like [this](https://github.com/se-edu/addressbook-level3/commit/4516e099699baa9e2d51801bd26f016d812dedcc#diff-41bb13c581e280c686198251ad6cc337cd5e27032772f06ed9bf7f1440995ece). Note how `Remark` has no constrains and thus does not require input validation. @@ -240,7 +240,7 @@ Let’s change `RemarkCommand` and `RemarkCommandParser` to use the new `Remark` Without getting too deep into `fxml`, let’s go on a 5 minute adventure to get some placeholder text to show up for each person. -Simply add the following to [`seedu.address.ui.PersonCard`](https://github.com/se-edu/addressbook-level3/commit/850b78879582f38accb05dd20c245963c65ea599#diff-639834f1e05afe2276a86372adf0fe5f69314642c2d93cfa543d614ce5a76688). +Simply add the following to [`housekeeping.hub.ui.PersonCard`](https://github.com/se-edu/addressbook-level3/commit/850b78879582f38accb05dd20c245963c65ea599#diff-639834f1e05afe2276a86372adf0fe5f69314642c2d93cfa543d614ce5a76688). **`PersonCard.java`:** diff --git a/docs/tutorials/RemovingFields.md b/docs/tutorials/RemovingFields.md index f29169bc924..0c4c661b9ca 100644 --- a/docs/tutorials/RemovingFields.md +++ b/docs/tutorials/RemovingFields.md @@ -28,7 +28,7 @@ IntelliJ IDEA provides a refactoring tool that can identify *most* parts of a re ### Assisted refactoring -The `address` field in `Person` is actually an instance of the `seedu.address.model.person.Address` class. Since removing the `Address` class will break the application, we start by identifying `Address`'s usages. This allows us to see code that depends on `Address` to function properly and edit them on a case-by-case basis. Right-click the `Address` class and select `Refactor` \> `Safe Delete` through the menu. +The `address` field in `Person` is actually an instance of the `housekeeping.hub.model.person.Address` class. Since removing the `Address` class will break the application, we start by identifying `Address`'s usages. This allows us to see code that depends on `Address` to function properly and edit them on a case-by-case basis. Right-click the `Address` class and select `Refactor` \> `Safe Delete` through the menu. * :bulb: To make things simpler, you can unselect the options `Search in comments and strings` and `Search for text occurrences` ![Usages detected](../images/remove/UnsafeDelete.png) diff --git a/docs/tutorials/TracingCode.md b/docs/tutorials/TracingCode.md index 4fb62a83ef6..00e4bb22ba0 100644 --- a/docs/tutorials/TracingCode.md +++ b/docs/tutorials/TracingCode.md @@ -39,7 +39,7 @@ In our case, we would want to begin the tracing at the very point where the App -According to the sequence diagram you saw earlier (and repeated above for reference), the `UI` component yields control to the `Logic` component through a method named `execute`. Searching through the code base for an `execute()` method that belongs to the `Logic` component yields a promising candidate in `seedu.address.logic.Logic`. +According to the sequence diagram you saw earlier (and repeated above for reference), the `UI` component yields control to the `Logic` component through a method named `execute`. Searching through the code base for an `execute()` method that belongs to the `Logic` component yields a promising candidate in `housekeeping.hub.logic.Logic`. @@ -48,7 +48,7 @@ According to the sequence diagram you saw earlier (and repeated above for refere :bulb: **Intellij Tip:** The ['**Search Everywhere**' feature](https://www.jetbrains.com/help/idea/searching-everywhere.html) can be used here. In particular, the '**Find Symbol**' ('Symbol' here refers to methods, variables, classes etc.) variant of that feature is quite useful here as we are looking for a _method_ named `execute`, not simply the text `execute`. -A quick look at the `seedu.address.logic.Logic` (an extract given below) confirms that this indeed might be what we’re looking for. +A quick look at the `housekeeping.hub.logic.Logic` (an extract given below) confirms that this indeed might be what we’re looking for. ```java public interface Logic { diff --git a/src/main/java/seedu/address/AppParameters.java b/src/main/java/housekeeping/hub/AppParameters.java similarity index 91% rename from src/main/java/seedu/address/AppParameters.java rename to src/main/java/housekeeping/hub/AppParameters.java index 3d603622d4e..e98edfe598c 100644 --- a/src/main/java/seedu/address/AppParameters.java +++ b/src/main/java/housekeeping/hub/AppParameters.java @@ -1,4 +1,4 @@ -package seedu.address; +package housekeeping.hub; import java.nio.file.Path; import java.nio.file.Paths; @@ -7,9 +7,9 @@ import java.util.logging.Logger; import javafx.application.Application; -import seedu.address.commons.core.LogsCenter; -import seedu.address.commons.util.FileUtil; -import seedu.address.commons.util.ToStringBuilder; +import housekeeping.hub.commons.core.LogsCenter; +import housekeeping.hub.commons.util.FileUtil; +import housekeeping.hub.commons.util.ToStringBuilder; /** * Represents the parsed command-line parameters given to the application. diff --git a/src/main/java/seedu/address/Main.java b/src/main/java/housekeeping/hub/Main.java similarity index 95% rename from src/main/java/seedu/address/Main.java rename to src/main/java/housekeeping/hub/Main.java index ec1b7958746..f68456afa86 100644 --- a/src/main/java/seedu/address/Main.java +++ b/src/main/java/housekeeping/hub/Main.java @@ -1,9 +1,9 @@ -package seedu.address; +package housekeeping.hub; import java.util.logging.Logger; import javafx.application.Application; -import seedu.address.commons.core.LogsCenter; +import housekeeping.hub.commons.core.LogsCenter; /** * The main entry point to the application. diff --git a/src/main/java/seedu/address/MainApp.java b/src/main/java/housekeeping/hub/MainApp.java similarity index 81% rename from src/main/java/seedu/address/MainApp.java rename to src/main/java/housekeeping/hub/MainApp.java index 4b8262981ca..d2174239333 100644 --- a/src/main/java/seedu/address/MainApp.java +++ b/src/main/java/housekeeping/hub/MainApp.java @@ -1,4 +1,4 @@ -package seedu.address; +package housekeeping.hub; import java.io.IOException; import java.nio.file.Path; @@ -7,29 +7,29 @@ import javafx.application.Application; import javafx.stage.Stage; -import seedu.address.commons.core.Config; -import seedu.address.commons.core.LogsCenter; -import seedu.address.commons.core.Version; -import seedu.address.commons.exceptions.DataLoadingException; -import seedu.address.commons.util.ConfigUtil; -import seedu.address.commons.util.StringUtil; -import seedu.address.logic.Logic; -import seedu.address.logic.LogicManager; -import seedu.address.model.AddressBook; -import seedu.address.model.Model; -import seedu.address.model.ModelManager; -import seedu.address.model.ReadOnlyAddressBook; -import seedu.address.model.ReadOnlyUserPrefs; -import seedu.address.model.UserPrefs; -import seedu.address.model.util.SampleDataUtil; -import seedu.address.storage.AddressBookStorage; -import seedu.address.storage.JsonAddressBookStorage; -import seedu.address.storage.JsonUserPrefsStorage; -import seedu.address.storage.Storage; -import seedu.address.storage.StorageManager; -import seedu.address.storage.UserPrefsStorage; -import seedu.address.ui.Ui; -import seedu.address.ui.UiManager; +import housekeeping.hub.commons.core.Config; +import housekeeping.hub.commons.core.LogsCenter; +import housekeeping.hub.commons.core.Version; +import housekeeping.hub.commons.exceptions.DataLoadingException; +import housekeeping.hub.commons.util.ConfigUtil; +import housekeeping.hub.commons.util.StringUtil; +import housekeeping.hub.logic.Logic; +import housekeeping.hub.logic.LogicManager; +import housekeeping.hub.model.AddressBook; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.ModelManager; +import housekeeping.hub.model.ReadOnlyAddressBook; +import housekeeping.hub.model.ReadOnlyUserPrefs; +import housekeeping.hub.model.UserPrefs; +import housekeeping.hub.model.util.SampleDataUtil; +import housekeeping.hub.storage.AddressBookStorage; +import housekeeping.hub.storage.JsonAddressBookStorage; +import housekeeping.hub.storage.JsonUserPrefsStorage; +import housekeeping.hub.storage.Storage; +import housekeeping.hub.storage.StorageManager; +import housekeeping.hub.storage.UserPrefsStorage; +import housekeeping.hub.ui.Ui; +import housekeeping.hub.ui.UiManager; /** * Runs the application. @@ -68,9 +68,9 @@ public void init() throws Exception { } /** - * Returns a {@code ModelManager} with the data from {@code storage}'s address book and {@code userPrefs}.
- * The data from the sample address book will be used instead if {@code storage}'s address book is not found, - * or an empty address book will be used instead if errors occur when reading {@code storage}'s address book. + * Returns a {@code ModelManager} with the data from {@code storage}'s hub book and {@code userPrefs}.
+ * The data from the sample hub book will be used instead if {@code storage}'s hub book is not found, + * or an empty hub book will be used instead if errors occur when reading {@code storage}'s hub book. */ private Model initModelManager(Storage storage, ReadOnlyUserPrefs userPrefs) { logger.info("Using data file : " + storage.getAddressBookFilePath()); diff --git a/src/main/java/seedu/address/commons/core/Config.java b/src/main/java/housekeeping/hub/commons/core/Config.java similarity index 94% rename from src/main/java/seedu/address/commons/core/Config.java rename to src/main/java/housekeeping/hub/commons/core/Config.java index 485f85a5e05..a2e96586b98 100644 --- a/src/main/java/seedu/address/commons/core/Config.java +++ b/src/main/java/housekeeping/hub/commons/core/Config.java @@ -1,11 +1,11 @@ -package seedu.address.commons.core; +package housekeeping.hub.commons.core; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Objects; import java.util.logging.Level; -import seedu.address.commons.util.ToStringBuilder; +import housekeeping.hub.commons.util.ToStringBuilder; /** * Config values used by the app diff --git a/src/main/java/seedu/address/commons/core/GuiSettings.java b/src/main/java/housekeeping/hub/commons/core/GuiSettings.java similarity index 96% rename from src/main/java/seedu/address/commons/core/GuiSettings.java rename to src/main/java/housekeeping/hub/commons/core/GuiSettings.java index a97a86ee8d7..75af07c5148 100644 --- a/src/main/java/seedu/address/commons/core/GuiSettings.java +++ b/src/main/java/housekeeping/hub/commons/core/GuiSettings.java @@ -1,10 +1,10 @@ -package seedu.address.commons.core; +package housekeeping.hub.commons.core; import java.awt.Point; import java.io.Serializable; import java.util.Objects; -import seedu.address.commons.util.ToStringBuilder; +import housekeeping.hub.commons.util.ToStringBuilder; /** * A Serializable class that contains the GUI settings. diff --git a/src/main/java/seedu/address/commons/core/LogsCenter.java b/src/main/java/housekeeping/hub/commons/core/LogsCenter.java similarity index 99% rename from src/main/java/seedu/address/commons/core/LogsCenter.java rename to src/main/java/housekeeping/hub/commons/core/LogsCenter.java index 8cf8e15a0f0..aaad14a6a6e 100644 --- a/src/main/java/seedu/address/commons/core/LogsCenter.java +++ b/src/main/java/housekeeping/hub/commons/core/LogsCenter.java @@ -1,4 +1,4 @@ -package seedu.address.commons.core; +package housekeeping.hub.commons.core; import static java.util.Objects.requireNonNull; diff --git a/src/main/java/seedu/address/commons/core/Version.java b/src/main/java/housekeeping/hub/commons/core/Version.java similarity index 98% rename from src/main/java/seedu/address/commons/core/Version.java rename to src/main/java/housekeeping/hub/commons/core/Version.java index 491d24559b4..deb8f886d06 100644 --- a/src/main/java/seedu/address/commons/core/Version.java +++ b/src/main/java/housekeeping/hub/commons/core/Version.java @@ -1,4 +1,4 @@ -package seedu.address.commons.core; +package housekeeping.hub.commons.core; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/seedu/address/commons/core/index/Index.java b/src/main/java/housekeeping/hub/commons/core/index/Index.java similarity index 94% rename from src/main/java/seedu/address/commons/core/index/Index.java rename to src/main/java/housekeeping/hub/commons/core/index/Index.java index dd170d8b68d..4c7003135d0 100644 --- a/src/main/java/seedu/address/commons/core/index/Index.java +++ b/src/main/java/housekeeping/hub/commons/core/index/Index.java @@ -1,6 +1,6 @@ -package seedu.address.commons.core.index; +package housekeeping.hub.commons.core.index; -import seedu.address.commons.util.ToStringBuilder; +import housekeeping.hub.commons.util.ToStringBuilder; /** * Represents a zero-based or one-based index. diff --git a/src/main/java/seedu/address/commons/exceptions/DataLoadingException.java b/src/main/java/housekeeping/hub/commons/exceptions/DataLoadingException.java similarity index 81% rename from src/main/java/seedu/address/commons/exceptions/DataLoadingException.java rename to src/main/java/housekeeping/hub/commons/exceptions/DataLoadingException.java index 9904ba47afe..9b99276dceb 100644 --- a/src/main/java/seedu/address/commons/exceptions/DataLoadingException.java +++ b/src/main/java/housekeeping/hub/commons/exceptions/DataLoadingException.java @@ -1,4 +1,4 @@ -package seedu.address.commons.exceptions; +package housekeeping.hub.commons.exceptions; /** * Represents an error during loading of data from a file. diff --git a/src/main/java/seedu/address/commons/exceptions/IllegalValueException.java b/src/main/java/housekeeping/hub/commons/exceptions/IllegalValueException.java similarity index 92% rename from src/main/java/seedu/address/commons/exceptions/IllegalValueException.java rename to src/main/java/housekeeping/hub/commons/exceptions/IllegalValueException.java index 19124db485c..3127183bb2b 100644 --- a/src/main/java/seedu/address/commons/exceptions/IllegalValueException.java +++ b/src/main/java/housekeeping/hub/commons/exceptions/IllegalValueException.java @@ -1,4 +1,4 @@ -package seedu.address.commons.exceptions; +package housekeeping.hub.commons.exceptions; /** * Signals that some given data does not fulfill some constraints. diff --git a/src/main/java/seedu/address/commons/util/AppUtil.java b/src/main/java/housekeeping/hub/commons/util/AppUtil.java similarity index 94% rename from src/main/java/seedu/address/commons/util/AppUtil.java rename to src/main/java/housekeeping/hub/commons/util/AppUtil.java index 87aa89c0326..89915c7c77d 100644 --- a/src/main/java/seedu/address/commons/util/AppUtil.java +++ b/src/main/java/housekeeping/hub/commons/util/AppUtil.java @@ -1,9 +1,9 @@ -package seedu.address.commons.util; +package housekeeping.hub.commons.util; import static java.util.Objects.requireNonNull; import javafx.scene.image.Image; -import seedu.address.MainApp; +import housekeeping.hub.MainApp; /** * A container for App specific utility functions diff --git a/src/main/java/seedu/address/commons/util/CollectionUtil.java b/src/main/java/housekeeping/hub/commons/util/CollectionUtil.java similarity index 96% rename from src/main/java/seedu/address/commons/util/CollectionUtil.java rename to src/main/java/housekeeping/hub/commons/util/CollectionUtil.java index eafe4dfd681..7e96110d21a 100644 --- a/src/main/java/seedu/address/commons/util/CollectionUtil.java +++ b/src/main/java/housekeeping/hub/commons/util/CollectionUtil.java @@ -1,4 +1,4 @@ -package seedu.address.commons.util; +package housekeeping.hub.commons.util; import static java.util.Objects.requireNonNull; diff --git a/src/main/java/seedu/address/commons/util/ConfigUtil.java b/src/main/java/housekeeping/hub/commons/util/ConfigUtil.java similarity index 76% rename from src/main/java/seedu/address/commons/util/ConfigUtil.java rename to src/main/java/housekeeping/hub/commons/util/ConfigUtil.java index 7b829c3c4cc..b424ded2ebf 100644 --- a/src/main/java/seedu/address/commons/util/ConfigUtil.java +++ b/src/main/java/housekeeping/hub/commons/util/ConfigUtil.java @@ -1,11 +1,11 @@ -package seedu.address.commons.util; +package housekeeping.hub.commons.util; import java.io.IOException; import java.nio.file.Path; import java.util.Optional; -import seedu.address.commons.core.Config; -import seedu.address.commons.exceptions.DataLoadingException; +import housekeeping.hub.commons.core.Config; +import housekeeping.hub.commons.exceptions.DataLoadingException; /** * A class for accessing the Config File. diff --git a/src/main/java/seedu/address/commons/util/FileUtil.java b/src/main/java/housekeeping/hub/commons/util/FileUtil.java similarity index 98% rename from src/main/java/seedu/address/commons/util/FileUtil.java rename to src/main/java/housekeeping/hub/commons/util/FileUtil.java index b1e2767cdd9..d615a40b437 100644 --- a/src/main/java/seedu/address/commons/util/FileUtil.java +++ b/src/main/java/housekeeping/hub/commons/util/FileUtil.java @@ -1,4 +1,4 @@ -package seedu.address.commons.util; +package housekeeping.hub.commons.util; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/seedu/address/commons/util/JsonUtil.java b/src/main/java/housekeeping/hub/commons/util/JsonUtil.java similarity index 97% rename from src/main/java/seedu/address/commons/util/JsonUtil.java rename to src/main/java/housekeeping/hub/commons/util/JsonUtil.java index 100cb16c395..ef4e2d68058 100644 --- a/src/main/java/seedu/address/commons/util/JsonUtil.java +++ b/src/main/java/housekeeping/hub/commons/util/JsonUtil.java @@ -1,4 +1,4 @@ -package seedu.address.commons.util; +package housekeeping.hub.commons.util; import static java.util.Objects.requireNonNull; @@ -20,8 +20,8 @@ import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import seedu.address.commons.core.LogsCenter; -import seedu.address.commons.exceptions.DataLoadingException; +import housekeeping.hub.commons.core.LogsCenter; +import housekeeping.hub.commons.exceptions.DataLoadingException; /** * Converts a Java object instance to JSON and vice versa diff --git a/src/main/java/seedu/address/commons/util/StringUtil.java b/src/main/java/housekeeping/hub/commons/util/StringUtil.java similarity index 95% rename from src/main/java/seedu/address/commons/util/StringUtil.java rename to src/main/java/housekeeping/hub/commons/util/StringUtil.java index 61cc8c9a1cb..3a9f1dbe9e5 100644 --- a/src/main/java/seedu/address/commons/util/StringUtil.java +++ b/src/main/java/housekeeping/hub/commons/util/StringUtil.java @@ -1,7 +1,7 @@ -package seedu.address.commons.util; +package housekeeping.hub.commons.util; import static java.util.Objects.requireNonNull; -import static seedu.address.commons.util.AppUtil.checkArgument; +import static housekeeping.hub.commons.util.AppUtil.checkArgument; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/src/main/java/seedu/address/commons/util/ToStringBuilder.java b/src/main/java/housekeeping/hub/commons/util/ToStringBuilder.java similarity index 97% rename from src/main/java/seedu/address/commons/util/ToStringBuilder.java rename to src/main/java/housekeeping/hub/commons/util/ToStringBuilder.java index d979b926734..08a41cf0912 100644 --- a/src/main/java/seedu/address/commons/util/ToStringBuilder.java +++ b/src/main/java/housekeeping/hub/commons/util/ToStringBuilder.java @@ -1,4 +1,4 @@ -package seedu.address.commons.util; +package housekeeping.hub.commons.util; /** * Builds a string representation of an object that is suitable as the return value of {@link Object#toString()}. diff --git a/src/main/java/seedu/address/logic/Logic.java b/src/main/java/housekeeping/hub/logic/Logic.java similarity index 70% rename from src/main/java/seedu/address/logic/Logic.java rename to src/main/java/housekeeping/hub/logic/Logic.java index be36e245bac..18dea0cef78 100644 --- a/src/main/java/seedu/address/logic/Logic.java +++ b/src/main/java/housekeeping/hub/logic/Logic.java @@ -1,16 +1,15 @@ -package seedu.address.logic; +package housekeeping.hub.logic; import java.nio.file.Path; import javafx.collections.ObservableList; -import seedu.address.commons.core.GuiSettings; -import seedu.address.logic.commands.CommandResult; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.logic.parser.exceptions.ParseException; -import seedu.address.model.ReadOnlyAddressBook; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; +import housekeeping.hub.commons.core.GuiSettings; +import housekeeping.hub.logic.commands.CommandResult; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.logic.parser.exceptions.ParseException; +import housekeeping.hub.model.ReadOnlyAddressBook; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; /** * API of the Logic component @@ -28,7 +27,7 @@ public interface Logic { /** * Returns the AddressBook. * - * @see seedu.address.model.Model#getAddressBook() + * @see housekeeping.hub.model.Model#getAddressBook() */ ReadOnlyAddressBook getAddressBook(); @@ -42,7 +41,7 @@ public interface Logic { ObservableList getFilteredHousekeeperList(); /** - * Returns the user prefs' address book file path. + * Returns the user prefs' hub book file path. */ Path getAddressBookFilePath(); diff --git a/src/main/java/seedu/address/logic/LogicManager.java b/src/main/java/housekeeping/hub/logic/LogicManager.java similarity index 79% rename from src/main/java/seedu/address/logic/LogicManager.java rename to src/main/java/housekeeping/hub/logic/LogicManager.java index a13fc5e4a3d..1170ffd09ac 100644 --- a/src/main/java/seedu/address/logic/LogicManager.java +++ b/src/main/java/housekeeping/hub/logic/LogicManager.java @@ -1,4 +1,4 @@ -package seedu.address.logic; +package housekeeping.hub.logic; import java.io.IOException; import java.nio.file.AccessDeniedException; @@ -6,19 +6,18 @@ import java.util.logging.Logger; import javafx.collections.ObservableList; -import seedu.address.commons.core.GuiSettings; -import seedu.address.commons.core.LogsCenter; -import seedu.address.logic.commands.Command; -import seedu.address.logic.commands.CommandResult; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.logic.parser.AddressBookParser; -import seedu.address.logic.parser.exceptions.ParseException; -import seedu.address.model.Model; -import seedu.address.model.ReadOnlyAddressBook; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; -import seedu.address.storage.Storage; +import housekeeping.hub.commons.core.GuiSettings; +import housekeeping.hub.commons.core.LogsCenter; +import housekeeping.hub.logic.commands.Command; +import housekeeping.hub.logic.commands.CommandResult; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.logic.parser.AddressBookParser; +import housekeeping.hub.logic.parser.exceptions.ParseException; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.ReadOnlyAddressBook; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.storage.Storage; /** * The main LogicManager of the app. diff --git a/src/main/java/seedu/address/logic/Messages.java b/src/main/java/housekeeping/hub/logic/Messages.java similarity index 93% rename from src/main/java/seedu/address/logic/Messages.java rename to src/main/java/housekeeping/hub/logic/Messages.java index a10300a3da2..6e94f6901dd 100644 --- a/src/main/java/seedu/address/logic/Messages.java +++ b/src/main/java/housekeeping/hub/logic/Messages.java @@ -1,15 +1,14 @@ -package seedu.address.logic; +package housekeeping.hub.logic; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import seedu.address.logic.parser.Prefix; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.HousekeepingDetails; -import seedu.address.model.person.Person; -import seedu.address.model.tag.Tag; +import housekeeping.hub.logic.parser.Prefix; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.HousekeepingDetails; +import housekeeping.hub.model.tag.Tag; /** * Container for user visible messages. diff --git a/src/main/java/seedu/address/logic/commands/AddClientCommand.java b/src/main/java/housekeeping/hub/logic/commands/AddClientCommand.java similarity index 72% rename from src/main/java/seedu/address/logic/commands/AddClientCommand.java rename to src/main/java/housekeeping/hub/logic/commands/AddClientCommand.java index d4f8de2a2a1..50898eb179d 100644 --- a/src/main/java/seedu/address/logic/commands/AddClientCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/AddClientCommand.java @@ -1,16 +1,16 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.Model; -import seedu.address.model.person.Client; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.Client; public class AddClientCommand extends AddCommand { public static final String MESSAGE_SUCCESS = "New client added: %1$s"; - public static final String MESSAGE_DUPLICATE_CLIENT = "This client already exists in the address book"; + public static final String MESSAGE_DUPLICATE_CLIENT = "This client already exists in the hub book"; public AddClientCommand(Client client) { super(client); diff --git a/src/main/java/seedu/address/logic/commands/AddCommand.java b/src/main/java/housekeeping/hub/logic/commands/AddCommand.java similarity index 66% rename from src/main/java/seedu/address/logic/commands/AddCommand.java rename to src/main/java/housekeeping/hub/logic/commands/AddCommand.java index bfbf88cb444..ce60fe087a7 100644 --- a/src/main/java/seedu/address/logic/commands/AddCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/AddCommand.java @@ -1,29 +1,25 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS; -import static seedu.address.logic.parser.CliSyntax.PREFIX_AREA; -import static seedu.address.logic.parser.CliSyntax.PREFIX_DETAILS; -import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL; -import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME; -import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE; -import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_ADDRESS; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_AREA; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_DETAILS; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_EMAIL; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_NAME; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_PHONE; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_TAG; -import seedu.address.commons.util.ToStringBuilder; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.Model; -import seedu.address.model.person.Client; -import seedu.address.model.person.Person; +import housekeeping.hub.commons.util.ToStringBuilder; +import housekeeping.hub.model.person.Person; /** - * Adds a person to the address book. + * Adds a person to the hub book. */ abstract public class AddCommand extends Command { public static final String COMMAND_WORD = "add"; - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a client or housekeeper to the address book.\n" + public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a client or housekeeper to the hub book.\n" + "Parameters: " + "TYPE(client or housekeeper) " + PREFIX_NAME + "NAME " diff --git a/src/main/java/seedu/address/logic/commands/AddHousekeeperCommand.java b/src/main/java/housekeeping/hub/logic/commands/AddHousekeeperCommand.java similarity index 76% rename from src/main/java/seedu/address/logic/commands/AddHousekeeperCommand.java rename to src/main/java/housekeeping/hub/logic/commands/AddHousekeeperCommand.java index 2fcc569f707..d088db58e97 100644 --- a/src/main/java/seedu/address/logic/commands/AddHousekeeperCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/AddHousekeeperCommand.java @@ -1,15 +1,15 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.Model; -import seedu.address.model.person.Housekeeper; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.Housekeeper; public class AddHousekeeperCommand extends AddCommand { public static final String MESSAGE_SUCCESS = "New housekeeper added: %1$s"; - public static final String MESSAGE_DUPLICATE_HOUSEKEEPER = "This housekeeper already exists in the address book"; + public static final String MESSAGE_DUPLICATE_HOUSEKEEPER = "This housekeeper already exists in the hub book"; public static final String MESSAGE_NO_HOUSEKEEPING_DETAILS = "Housekeeper should not have housekeeping details, " + "that is specifically for client."; diff --git a/src/main/java/seedu/address/logic/commands/BookingCommand.java b/src/main/java/housekeeping/hub/logic/commands/BookingCommand.java similarity index 95% rename from src/main/java/seedu/address/logic/commands/BookingCommand.java rename to src/main/java/housekeeping/hub/logic/commands/BookingCommand.java index 88816e41b8c..a3c1903c92d 100644 --- a/src/main/java/seedu/address/logic/commands/BookingCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/BookingCommand.java @@ -1,26 +1,26 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import static seedu.address.model.Model.PREDICATE_SHOW_ALL_CLIENTS; -import static seedu.address.model.Model.PREDICATE_SHOW_ALL_HOUSEKEEPERS; +import static housekeeping.hub.model.Model.PREDICATE_SHOW_ALL_CLIENTS; +import static housekeeping.hub.model.Model.PREDICATE_SHOW_ALL_HOUSEKEEPERS; import java.time.Period; import java.time.LocalDate; import java.time.format.DateTimeParseException; import java.util.List; -import seedu.address.commons.core.index.Index; -import seedu.address.commons.util.ToStringBuilder; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.Model; -import seedu.address.model.person.Area; -import seedu.address.model.person.Booking; -import seedu.address.model.person.BookingList; -import seedu.address.model.person.BookingSearchPredicate; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.HousekeepingDetails; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.commons.util.ToStringBuilder; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.Booking; +import housekeeping.hub.model.person.BookingList; +import housekeeping.hub.model.person.BookingSearchPredicate; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.HousekeepingDetails; /** * Encapsulates booking actions (add, delete, list) for a housekeeper. diff --git a/src/main/java/seedu/address/logic/commands/ClearCommand.java b/src/main/java/housekeeping/hub/logic/commands/ClearCommand.java similarity index 75% rename from src/main/java/seedu/address/logic/commands/ClearCommand.java rename to src/main/java/housekeeping/hub/logic/commands/ClearCommand.java index 9c86b1fa6e4..211e479e2d9 100644 --- a/src/main/java/seedu/address/logic/commands/ClearCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/ClearCommand.java @@ -1,12 +1,12 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import seedu.address.model.AddressBook; -import seedu.address.model.Model; +import housekeeping.hub.model.AddressBook; +import housekeeping.hub.model.Model; /** - * Clears the address book. + * Clears the hub book. */ public class ClearCommand extends Command { diff --git a/src/main/java/seedu/address/logic/commands/Command.java b/src/main/java/housekeeping/hub/logic/commands/Command.java similarity index 77% rename from src/main/java/seedu/address/logic/commands/Command.java rename to src/main/java/housekeeping/hub/logic/commands/Command.java index 64f18992160..045cab43727 100644 --- a/src/main/java/seedu/address/logic/commands/Command.java +++ b/src/main/java/housekeeping/hub/logic/commands/Command.java @@ -1,7 +1,7 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.Model; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.model.Model; /** * Represents a command with hidden internal logic and the ability to be executed. diff --git a/src/main/java/seedu/address/logic/commands/CommandResult.java b/src/main/java/housekeeping/hub/logic/commands/CommandResult.java similarity index 95% rename from src/main/java/seedu/address/logic/commands/CommandResult.java rename to src/main/java/housekeeping/hub/logic/commands/CommandResult.java index 249b6072d0d..feee61aa585 100644 --- a/src/main/java/seedu/address/logic/commands/CommandResult.java +++ b/src/main/java/housekeeping/hub/logic/commands/CommandResult.java @@ -1,10 +1,10 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; import java.util.Objects; -import seedu.address.commons.util.ToStringBuilder; +import housekeeping.hub.commons.util.ToStringBuilder; /** * Represents the result of a command execution. diff --git a/src/main/java/seedu/address/logic/commands/DeleteClientCommand.java b/src/main/java/housekeeping/hub/logic/commands/DeleteClientCommand.java similarity index 76% rename from src/main/java/seedu/address/logic/commands/DeleteClientCommand.java rename to src/main/java/housekeeping/hub/logic/commands/DeleteClientCommand.java index 5e498d0fd51..377fb0055b4 100644 --- a/src/main/java/seedu/address/logic/commands/DeleteClientCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/DeleteClientCommand.java @@ -1,14 +1,14 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; import java.util.List; -import seedu.address.commons.core.index.Index; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.Model; -import seedu.address.model.person.Client; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.Client; public class DeleteClientCommand extends DeleteCommand { public static final String MESSAGE_DELETE_CLIENT_SUCCESS = "Deleted Client: %1$s"; diff --git a/src/main/java/seedu/address/logic/commands/DeleteCommand.java b/src/main/java/housekeeping/hub/logic/commands/DeleteCommand.java similarity index 76% rename from src/main/java/seedu/address/logic/commands/DeleteCommand.java rename to src/main/java/housekeeping/hub/logic/commands/DeleteCommand.java index f3b56697f7e..a138d8da285 100644 --- a/src/main/java/seedu/address/logic/commands/DeleteCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/DeleteCommand.java @@ -1,19 +1,12 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import java.util.List; - -import seedu.address.commons.core.index.Index; -import seedu.address.commons.util.ToStringBuilder; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.Model; -import seedu.address.model.person.Client; -import seedu.address.model.person.Type; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.commons.util.ToStringBuilder; /** - * Deletes a person identified using it's displayed index from the address book. + * Deletes a person identified using it's displayed index from the hub book. */ abstract public class DeleteCommand extends Command { diff --git a/src/main/java/seedu/address/logic/commands/DeleteHousekeeperCommand.java b/src/main/java/housekeeping/hub/logic/commands/DeleteHousekeeperCommand.java similarity index 76% rename from src/main/java/seedu/address/logic/commands/DeleteHousekeeperCommand.java rename to src/main/java/housekeeping/hub/logic/commands/DeleteHousekeeperCommand.java index 79ae46f7a85..b82ac951c25 100644 --- a/src/main/java/seedu/address/logic/commands/DeleteHousekeeperCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/DeleteHousekeeperCommand.java @@ -1,15 +1,14 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; import java.util.List; -import seedu.address.commons.core.index.Index; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.Model; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.Housekeeper; public class DeleteHousekeeperCommand extends DeleteCommand { public static final String MESSAGE_DELETE_HOUSEKEEPER_SUCCESS = "Deleted Housekeeper: %1$s"; diff --git a/src/main/java/seedu/address/logic/commands/EditClientCommand.java b/src/main/java/housekeeping/hub/logic/commands/EditClientCommand.java similarity index 76% rename from src/main/java/seedu/address/logic/commands/EditClientCommand.java rename to src/main/java/housekeeping/hub/logic/commands/EditClientCommand.java index a91eb7f5138..441b915ecf3 100644 --- a/src/main/java/seedu/address/logic/commands/EditClientCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/EditClientCommand.java @@ -1,29 +1,27 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import static seedu.address.model.Model.PREDICATE_SHOW_ALL_CLIENTS; import java.util.List; import java.util.Set; -import seedu.address.commons.core.index.Index; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.Model; -import seedu.address.model.person.Address; -import seedu.address.model.person.Area; -import seedu.address.model.person.Client; -import seedu.address.model.person.Email; -import seedu.address.model.person.HousekeepingDetails; -import seedu.address.model.person.Name; -import seedu.address.model.person.Person; -import seedu.address.model.person.Phone; -import seedu.address.model.person.Type; -import seedu.address.model.tag.Tag; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.HousekeepingDetails; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Person; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.tag.Tag; public class EditClientCommand extends EditCommand { public static final String MESSAGE_EDIT_CLIENT_SUCCESS = "Edited Client: %1$s"; - public static final String MESSAGE_DUPLICATE_CLIENT = "This client already exists in the address book."; + public static final String MESSAGE_DUPLICATE_CLIENT = "This client already exists in the hub book."; public EditClientCommand(Index index, EditPersonDescriptor editPersonDescriptor) { super(index, editPersonDescriptor); diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/housekeeping/hub/logic/commands/EditCommand.java similarity index 87% rename from src/main/java/seedu/address/logic/commands/EditCommand.java rename to src/main/java/housekeeping/hub/logic/commands/EditCommand.java index c7f6ef65497..457c0232748 100644 --- a/src/main/java/seedu/address/logic/commands/EditCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/EditCommand.java @@ -1,11 +1,11 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS; -import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL; -import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME; -import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE; -import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_ADDRESS; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_EMAIL; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_NAME; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_PHONE; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_TAG; import java.util.Collections; import java.util.HashSet; @@ -13,22 +13,21 @@ import java.util.Optional; import java.util.Set; -import seedu.address.commons.core.index.Index; -import seedu.address.commons.util.CollectionUtil; -import seedu.address.commons.util.ToStringBuilder; -import seedu.address.model.person.Address; -import seedu.address.model.person.BookingList; -import seedu.address.model.person.Area; -import seedu.address.model.person.Email; -import seedu.address.model.person.HousekeepingDetails; -import seedu.address.model.person.Name; -import seedu.address.model.person.Person; -import seedu.address.model.person.Phone; -import seedu.address.model.person.Type; -import seedu.address.model.tag.Tag; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.commons.util.CollectionUtil; +import housekeeping.hub.commons.util.ToStringBuilder; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.BookingList; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.HousekeepingDetails; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Person; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.tag.Tag; /** - * Edits the details of an existing person in the address book. + * Edits the details of an existing person in the hub book. */ abstract public class EditCommand extends Command { @@ -233,7 +232,7 @@ public String toString() { .add("name", name) .add("phone", phone) .add("email", email) - .add("address", address) + .add("hub", address) .add("tags", tags) .add("area", area) .add("booking list", bookingList) diff --git a/src/main/java/seedu/address/logic/commands/EditHousekeeperCommand.java b/src/main/java/housekeeping/hub/logic/commands/EditHousekeeperCommand.java similarity index 78% rename from src/main/java/seedu/address/logic/commands/EditHousekeeperCommand.java rename to src/main/java/housekeeping/hub/logic/commands/EditHousekeeperCommand.java index 0de6a4efcf3..560bb8512c4 100644 --- a/src/main/java/seedu/address/logic/commands/EditHousekeeperCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/EditHousekeeperCommand.java @@ -1,29 +1,28 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import static seedu.address.model.Model.PREDICATE_SHOW_ALL_HOUSEKEEPERS; +import static housekeeping.hub.model.Model.PREDICATE_SHOW_ALL_HOUSEKEEPERS; import java.util.List; import java.util.Set; -import seedu.address.commons.core.index.Index; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.Model; -import seedu.address.model.person.Address; -import seedu.address.model.person.Area; -import seedu.address.model.person.Email; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Name; -import seedu.address.model.person.Person; -import seedu.address.model.person.Phone; -import seedu.address.model.person.Type; -import seedu.address.model.person.BookingList; -import seedu.address.model.tag.Tag; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Person; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.person.BookingList; +import housekeeping.hub.model.tag.Tag; public class EditHousekeeperCommand extends EditCommand { public static final String MESSAGE_EDIT_HOUSEKEEPER_SUCCESS = "Edited Housekeeper: %1$s"; - public static final String MESSAGE_DUPLICATE_HOUSEKEEPER = "This housekeeper already exists in the address book."; + public static final String MESSAGE_DUPLICATE_HOUSEKEEPER = "This housekeeper already exists in the hub book."; public EditHousekeeperCommand(Index index, EditPersonDescriptor editPersonDescriptor) { super(index, editPersonDescriptor); diff --git a/src/main/java/seedu/address/logic/commands/EditHousekeepingDetailsCommand.java b/src/main/java/housekeeping/hub/logic/commands/EditHousekeepingDetailsCommand.java similarity index 89% rename from src/main/java/seedu/address/logic/commands/EditHousekeepingDetailsCommand.java rename to src/main/java/housekeeping/hub/logic/commands/EditHousekeepingDetailsCommand.java index 75194524392..89e341d0d31 100644 --- a/src/main/java/seedu/address/logic/commands/EditHousekeepingDetailsCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/EditHousekeepingDetailsCommand.java @@ -1,33 +1,32 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import static seedu.address.logic.parser.CliSyntax.PREFIX_LHD; -import static seedu.address.logic.parser.CliSyntax.PREFIX_PI; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_LHD; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_PI; import java.time.LocalDate; import java.time.Period; import java.util.*; -import seedu.address.commons.core.index.Index; -import seedu.address.commons.util.CollectionUtil; -import seedu.address.commons.util.ToStringBuilder; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.Model; -import seedu.address.model.person.Address; -import seedu.address.model.person.Area; -import seedu.address.model.person.Booking; -import seedu.address.model.person.Client; -import seedu.address.model.person.Email; -import seedu.address.model.person.HousekeepingDetails; -import seedu.address.model.person.Name; -import seedu.address.model.person.Person; -import seedu.address.model.person.Phone; -import seedu.address.model.person.Type; -import seedu.address.model.tag.Tag; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.commons.util.CollectionUtil; +import housekeeping.hub.commons.util.ToStringBuilder; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.Booking; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.HousekeepingDetails; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Person; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.tag.Tag; /** - * Edits the details of an existing person in the address book. + * Edits the details of an existing person in the hub book. */ public class EditHousekeepingDetailsCommand extends BookingCommand { @@ -45,7 +44,7 @@ public class EditHousekeepingDetailsCommand extends BookingCommand { public static final String MESSAGE_EDIT_PERSON_SUCCESS = "Edited Person: %1$s"; public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided."; - public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book."; + public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the hub book."; protected final Index index; protected final EditHousekeepingDetailsDescriptor editPersonDescriptor; diff --git a/src/main/java/seedu/address/logic/commands/ExitCommand.java b/src/main/java/housekeeping/hub/logic/commands/ExitCommand.java similarity index 83% rename from src/main/java/seedu/address/logic/commands/ExitCommand.java rename to src/main/java/housekeeping/hub/logic/commands/ExitCommand.java index 3dd85a8ba90..24c61344a1b 100644 --- a/src/main/java/seedu/address/logic/commands/ExitCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/ExitCommand.java @@ -1,6 +1,6 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; -import seedu.address.model.Model; +import housekeeping.hub.model.Model; /** * Terminates the program. diff --git a/src/main/java/seedu/address/logic/commands/FindClientCommand.java b/src/main/java/housekeeping/hub/logic/commands/FindClientCommand.java similarity index 73% rename from src/main/java/seedu/address/logic/commands/FindClientCommand.java rename to src/main/java/housekeeping/hub/logic/commands/FindClientCommand.java index 22bffc4286a..3044277dc4b 100644 --- a/src/main/java/seedu/address/logic/commands/FindClientCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/FindClientCommand.java @@ -1,10 +1,10 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import seedu.address.logic.Messages; -import seedu.address.model.Model; -import seedu.address.model.person.ContainsKeywordsPredicate; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.ContainsKeywordsPredicate; public class FindClientCommand extends FindCommand { public FindClientCommand(ContainsKeywordsPredicate predicate) { diff --git a/src/main/java/seedu/address/logic/commands/FindCommand.java b/src/main/java/housekeeping/hub/logic/commands/FindCommand.java similarity index 58% rename from src/main/java/seedu/address/logic/commands/FindCommand.java rename to src/main/java/housekeeping/hub/logic/commands/FindCommand.java index c7c13292688..540b85d471e 100644 --- a/src/main/java/seedu/address/logic/commands/FindCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/FindCommand.java @@ -1,31 +1,12 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import java.util.Collections; -import java.util.HashSet; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; - -import seedu.address.commons.util.CollectionUtil; -import seedu.address.commons.util.ToStringBuilder; -import seedu.address.logic.Messages; -import seedu.address.model.Model; -import seedu.address.model.person.Address; -import seedu.address.model.person.Area; -import seedu.address.model.person.BookingList; -import seedu.address.model.person.ContainsKeywordsPredicate; -import seedu.address.model.person.Email; -import seedu.address.model.person.HousekeepingDetails; -import seedu.address.model.person.Name; -import seedu.address.model.person.NameContainsKeywordsPredicate; -import seedu.address.model.person.Phone; -import seedu.address.model.person.Type; -import seedu.address.model.tag.Tag; +import housekeeping.hub.commons.util.ToStringBuilder; +import housekeeping.hub.model.person.ContainsKeywordsPredicate; /** - * Finds and lists all persons in address book whose name contains any of the argument keywords. + * Finds and lists all persons in hub book whose name contains any of the argument keywords. * Keyword matching is case-insensitive. */ abstract public class FindCommand extends Command { @@ -33,7 +14,7 @@ abstract public class FindCommand extends Command { public static final String COMMAND_WORD = "find"; public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all clients or housekeepers filtered by " - + "the specified attribute(s). Valid attributes: {name, phone, address, area}\n" + + "the specified attribute(s). Valid attributes: {name, phone, hub, area}\n" + "Parameters: TYPE(client or housekeeper) PREFIX/KEYWORD [PREFIX/KEYWORDS...] (optional)\n" + "Example: " + COMMAND_WORD + " client n/alice p/90274629"; diff --git a/src/main/java/seedu/address/logic/commands/FindHousekeeperCommand.java b/src/main/java/housekeeping/hub/logic/commands/FindHousekeeperCommand.java similarity index 74% rename from src/main/java/seedu/address/logic/commands/FindHousekeeperCommand.java rename to src/main/java/housekeeping/hub/logic/commands/FindHousekeeperCommand.java index 5c018c7e425..b0ee4d8662f 100644 --- a/src/main/java/seedu/address/logic/commands/FindHousekeeperCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/FindHousekeeperCommand.java @@ -1,10 +1,10 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import seedu.address.logic.Messages; -import seedu.address.model.Model; -import seedu.address.model.person.ContainsKeywordsPredicate; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.ContainsKeywordsPredicate; public class FindHousekeeperCommand extends FindCommand { public FindHousekeeperCommand(ContainsKeywordsPredicate predicate) { diff --git a/src/main/java/seedu/address/logic/commands/HelpCommand.java b/src/main/java/housekeeping/hub/logic/commands/HelpCommand.java similarity index 87% rename from src/main/java/seedu/address/logic/commands/HelpCommand.java rename to src/main/java/housekeeping/hub/logic/commands/HelpCommand.java index bf824f91bd0..9f370c3870c 100644 --- a/src/main/java/seedu/address/logic/commands/HelpCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/HelpCommand.java @@ -1,6 +1,6 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; -import seedu.address.model.Model; +import housekeeping.hub.model.Model; /** * Format full help instructions for every command for display. diff --git a/src/main/java/seedu/address/logic/commands/LeadsCommand.java b/src/main/java/housekeeping/hub/logic/commands/LeadsCommand.java similarity index 81% rename from src/main/java/seedu/address/logic/commands/LeadsCommand.java rename to src/main/java/housekeeping/hub/logic/commands/LeadsCommand.java index fe4a8b2162d..3de49f2d6a8 100644 --- a/src/main/java/seedu/address/logic/commands/LeadsCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/LeadsCommand.java @@ -1,13 +1,13 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import seedu.address.commons.util.ToStringBuilder; -import seedu.address.logic.Messages; -import seedu.address.model.Model; -import seedu.address.model.person.Client; -import seedu.address.model.person.ClientComparator; -import seedu.address.model.person.LeadsFilterPredicate; +import housekeeping.hub.commons.util.ToStringBuilder; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.ClientComparator; +import housekeeping.hub.model.person.LeadsFilterPredicate; import java.util.Comparator; diff --git a/src/main/java/seedu/address/logic/commands/ListClientCommand.java b/src/main/java/housekeeping/hub/logic/commands/ListClientCommand.java similarity index 76% rename from src/main/java/seedu/address/logic/commands/ListClientCommand.java rename to src/main/java/housekeeping/hub/logic/commands/ListClientCommand.java index 85a9ea676c0..157fa6c8dd4 100644 --- a/src/main/java/seedu/address/logic/commands/ListClientCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/ListClientCommand.java @@ -1,9 +1,9 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import seedu.address.model.Model; -import seedu.address.model.person.TypePredicate; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.TypePredicate; public class ListClientCommand extends ListCommand { public ListClientCommand() { diff --git a/src/main/java/seedu/address/logic/commands/ListCommand.java b/src/main/java/housekeeping/hub/logic/commands/ListCommand.java similarity index 83% rename from src/main/java/seedu/address/logic/commands/ListCommand.java rename to src/main/java/housekeeping/hub/logic/commands/ListCommand.java index ba7516d4619..69efb193229 100644 --- a/src/main/java/seedu/address/logic/commands/ListCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/ListCommand.java @@ -1,12 +1,11 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import seedu.address.model.Model; -import seedu.address.model.person.TypePredicate; +import housekeeping.hub.model.person.TypePredicate; /** - * Lists all persons in the address book to the user. + * Lists all persons in the hub book to the user. */ abstract public class ListCommand extends Command { diff --git a/src/main/java/seedu/address/logic/commands/ListHousekeeperCommand.java b/src/main/java/housekeeping/hub/logic/commands/ListHousekeeperCommand.java similarity index 77% rename from src/main/java/seedu/address/logic/commands/ListHousekeeperCommand.java rename to src/main/java/housekeeping/hub/logic/commands/ListHousekeeperCommand.java index f745e1636b5..c3e80b27bd9 100644 --- a/src/main/java/seedu/address/logic/commands/ListHousekeeperCommand.java +++ b/src/main/java/housekeeping/hub/logic/commands/ListHousekeeperCommand.java @@ -1,9 +1,9 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; -import seedu.address.model.Model; -import seedu.address.model.person.TypePredicate; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.TypePredicate; public class ListHousekeeperCommand extends ListCommand { public ListHousekeeperCommand() { diff --git a/src/main/java/seedu/address/logic/commands/exceptions/CommandException.java b/src/main/java/housekeeping/hub/logic/commands/exceptions/CommandException.java similarity index 89% rename from src/main/java/seedu/address/logic/commands/exceptions/CommandException.java rename to src/main/java/housekeeping/hub/logic/commands/exceptions/CommandException.java index a16bd14f2cd..8a4d488ccb0 100644 --- a/src/main/java/seedu/address/logic/commands/exceptions/CommandException.java +++ b/src/main/java/housekeeping/hub/logic/commands/exceptions/CommandException.java @@ -1,4 +1,4 @@ -package seedu.address.logic.commands.exceptions; +package housekeeping.hub.logic.commands.exceptions; /** * Represents an error which occurs during execution of a {@link Command}. diff --git a/src/main/java/seedu/address/logic/parser/AddCommandParser.java b/src/main/java/housekeeping/hub/logic/parser/AddCommandParser.java similarity index 69% rename from src/main/java/seedu/address/logic/parser/AddCommandParser.java rename to src/main/java/housekeeping/hub/logic/parser/AddCommandParser.java index 7f78452c627..bcb38a501bf 100644 --- a/src/main/java/seedu/address/logic/parser/AddCommandParser.java +++ b/src/main/java/housekeeping/hub/logic/parser/AddCommandParser.java @@ -1,35 +1,33 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS; -import static seedu.address.logic.parser.CliSyntax.PREFIX_DETAILS; -import static seedu.address.logic.parser.CliSyntax.PREFIX_AREA; -import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL; -import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME; -import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE; -import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; -import static seedu.address.model.person.Type.preambleIsAllowed; +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_ADDRESS; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_DETAILS; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_AREA; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_EMAIL; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_NAME; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_PHONE; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_TAG; +import static housekeeping.hub.model.person.Type.preambleIsAllowed; import java.util.Set; import java.util.stream.Stream; -import seedu.address.logic.commands.AddClientCommand; -import seedu.address.logic.commands.AddCommand; -import seedu.address.logic.commands.AddHousekeeperCommand; -import seedu.address.logic.parser.exceptions.ParseException; +import housekeeping.hub.logic.commands.AddClientCommand; +import housekeeping.hub.logic.commands.AddCommand; +import housekeeping.hub.logic.commands.AddHousekeeperCommand; +import housekeeping.hub.logic.parser.exceptions.ParseException; -import seedu.address.model.person.Address; -import seedu.address.model.person.BookingList; -import seedu.address.model.person.Area; -import seedu.address.model.person.Client; -import seedu.address.model.person.Email; -import seedu.address.model.person.HousekeepingDetails; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Name; -import seedu.address.model.person.Person; -import seedu.address.model.person.Phone; -import seedu.address.model.person.Type; -import seedu.address.model.tag.Tag; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.BookingList; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.HousekeepingDetails; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.tag.Tag; /** * Parses input arguments and creates a new AddCommand object diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/housekeeping/hub/logic/parser/AddressBookParser.java similarity index 88% rename from src/main/java/seedu/address/logic/parser/AddressBookParser.java rename to src/main/java/housekeeping/hub/logic/parser/AddressBookParser.java index 77024dde887..fa0aaef6ac7 100644 --- a/src/main/java/seedu/address/logic/parser/AddressBookParser.java +++ b/src/main/java/housekeeping/hub/logic/parser/AddressBookParser.java @@ -1,15 +1,15 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import static seedu.address.logic.Messages.MESSAGE_UNKNOWN_COMMAND; +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static housekeeping.hub.logic.Messages.MESSAGE_UNKNOWN_COMMAND; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import seedu.address.commons.core.LogsCenter; -import seedu.address.logic.commands.*; -import seedu.address.logic.parser.exceptions.ParseException; +import housekeeping.hub.commons.core.LogsCenter; +import housekeeping.hub.logic.commands.*; +import housekeeping.hub.logic.parser.exceptions.ParseException; /** * Parses user input. diff --git a/src/main/java/seedu/address/logic/parser/ArgumentMultimap.java b/src/main/java/housekeeping/hub/logic/parser/ArgumentMultimap.java similarity index 95% rename from src/main/java/seedu/address/logic/parser/ArgumentMultimap.java rename to src/main/java/housekeeping/hub/logic/parser/ArgumentMultimap.java index 21e26887a83..816486c737c 100644 --- a/src/main/java/seedu/address/logic/parser/ArgumentMultimap.java +++ b/src/main/java/housekeeping/hub/logic/parser/ArgumentMultimap.java @@ -1,4 +1,4 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; import java.util.ArrayList; import java.util.HashMap; @@ -7,8 +7,8 @@ import java.util.Optional; import java.util.stream.Stream; -import seedu.address.logic.Messages; -import seedu.address.logic.parser.exceptions.ParseException; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.parser.exceptions.ParseException; /** * Stores mapping of prefixes to their respective arguments. diff --git a/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java b/src/main/java/housekeeping/hub/logic/parser/ArgumentTokenizer.java similarity index 99% rename from src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java rename to src/main/java/housekeeping/hub/logic/parser/ArgumentTokenizer.java index 5c9aebfa488..e40ae89b082 100644 --- a/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java +++ b/src/main/java/housekeeping/hub/logic/parser/ArgumentTokenizer.java @@ -1,4 +1,4 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/seedu/address/logic/parser/BookingCommandParser.java b/src/main/java/housekeeping/hub/logic/parser/BookingCommandParser.java similarity index 94% rename from src/main/java/seedu/address/logic/parser/BookingCommandParser.java rename to src/main/java/housekeeping/hub/logic/parser/BookingCommandParser.java index 2c3c45e9503..3790aa34c1e 100644 --- a/src/main/java/seedu/address/logic/parser/BookingCommandParser.java +++ b/src/main/java/housekeeping/hub/logic/parser/BookingCommandParser.java @@ -1,18 +1,18 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; import static java.util.Objects.requireNonNull; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; import java.time.Period; import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -import seedu.address.commons.core.index.Index; -import seedu.address.logic.commands.BookingCommand; -import seedu.address.logic.parser.exceptions.ParseException; -import seedu.address.model.person.BookingSearchPredicate; -import seedu.address.model.person.HousekeepingDetails; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.logic.commands.BookingCommand; +import housekeeping.hub.logic.parser.exceptions.ParseException; +import housekeeping.hub.model.person.BookingSearchPredicate; +import housekeeping.hub.model.person.HousekeepingDetails; public class BookingCommandParser implements Parser { private static final Pattern PATTERN_TYPE = Pattern.compile("^(client|housekeeper).*"); diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/housekeeping/hub/logic/parser/CliSyntax.java similarity index 96% rename from src/main/java/seedu/address/logic/parser/CliSyntax.java rename to src/main/java/housekeeping/hub/logic/parser/CliSyntax.java index 7e585948642..328c93e7f79 100644 --- a/src/main/java/seedu/address/logic/parser/CliSyntax.java +++ b/src/main/java/housekeeping/hub/logic/parser/CliSyntax.java @@ -1,4 +1,4 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; /** diff --git a/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java b/src/main/java/housekeeping/hub/logic/parser/DeleteCommandParser.java similarity index 72% rename from src/main/java/seedu/address/logic/parser/DeleteCommandParser.java rename to src/main/java/housekeeping/hub/logic/parser/DeleteCommandParser.java index c07a1c0d5c0..d6521e1a569 100644 --- a/src/main/java/seedu/address/logic/parser/DeleteCommandParser.java +++ b/src/main/java/housekeeping/hub/logic/parser/DeleteCommandParser.java @@ -1,16 +1,13 @@ -package seedu.address.logic.parser; - -import static seedu.address.logic.Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import static seedu.address.logic.Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX; - -import seedu.address.commons.core.index.Index; -import seedu.address.logic.commands.DeleteClientCommand; -import seedu.address.logic.commands.DeleteCommand; -import seedu.address.logic.commands.DeleteHousekeeperCommand; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.logic.parser.exceptions.ParseException; -import seedu.address.model.person.Type; +package housekeeping.hub.logic.parser; + +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX; + +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.logic.commands.DeleteClientCommand; +import housekeeping.hub.logic.commands.DeleteCommand; +import housekeeping.hub.logic.commands.DeleteHousekeeperCommand; +import housekeeping.hub.logic.parser.exceptions.ParseException; /** * Parses input arguments and creates a new DeleteCommand object diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/housekeeping/hub/logic/parser/EditCommandParser.java similarity index 85% rename from src/main/java/seedu/address/logic/parser/EditCommandParser.java rename to src/main/java/housekeeping/hub/logic/parser/EditCommandParser.java index 2a0d87c236d..448270cc49f 100644 --- a/src/main/java/seedu/address/logic/parser/EditCommandParser.java +++ b/src/main/java/housekeeping/hub/logic/parser/EditCommandParser.java @@ -1,24 +1,22 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; import static java.util.Objects.requireNonNull; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import static seedu.address.logic.Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX; -import static seedu.address.logic.parser.CliSyntax.*; +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX; +import static housekeeping.hub.logic.parser.CliSyntax.*; import java.util.Collection; import java.util.Collections; import java.util.Optional; import java.util.Set; -import seedu.address.commons.core.index.Index; -import seedu.address.logic.commands.DeleteCommand; -import seedu.address.logic.commands.EditClientCommand; -import seedu.address.logic.commands.EditCommand; -import seedu.address.logic.commands.EditCommand.EditPersonDescriptor; -import seedu.address.logic.commands.EditHousekeeperCommand; -import seedu.address.logic.parser.exceptions.ParseException; -import seedu.address.model.person.Type; -import seedu.address.model.tag.Tag; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.logic.commands.EditClientCommand; +import housekeeping.hub.logic.commands.EditCommand; +import housekeeping.hub.logic.commands.EditCommand.EditPersonDescriptor; +import housekeeping.hub.logic.commands.EditHousekeeperCommand; +import housekeeping.hub.logic.parser.exceptions.ParseException; +import housekeeping.hub.model.tag.Tag; /** * Parses input arguments and creates a new EditCommand object diff --git a/src/main/java/seedu/address/logic/parser/EditHousekeepingDetailsParser.java b/src/main/java/housekeeping/hub/logic/parser/EditHousekeepingDetailsParser.java similarity index 78% rename from src/main/java/seedu/address/logic/parser/EditHousekeepingDetailsParser.java rename to src/main/java/housekeeping/hub/logic/parser/EditHousekeepingDetailsParser.java index 67277c1db70..30a82683813 100644 --- a/src/main/java/seedu/address/logic/parser/EditHousekeepingDetailsParser.java +++ b/src/main/java/housekeeping/hub/logic/parser/EditHousekeepingDetailsParser.java @@ -1,16 +1,16 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; import static java.util.Objects.requireNonNull; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import static seedu.address.logic.parser.CliSyntax.PREFIX_BD; -import static seedu.address.logic.parser.CliSyntax.PREFIX_DEFERMENT; -import static seedu.address.logic.parser.CliSyntax.PREFIX_LHD; -import static seedu.address.logic.parser.CliSyntax.PREFIX_PI; +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_BD; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_DEFERMENT; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_LHD; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_PI; -import seedu.address.commons.core.index.Index; -import seedu.address.logic.commands.EditHousekeepingDetailsCommand; -import seedu.address.logic.commands.EditHousekeepingDetailsCommand.EditHousekeepingDetailsDescriptor; -import seedu.address.logic.parser.exceptions.ParseException; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.logic.commands.EditHousekeepingDetailsCommand; +import housekeeping.hub.logic.commands.EditHousekeepingDetailsCommand.EditHousekeepingDetailsDescriptor; +import housekeeping.hub.logic.parser.exceptions.ParseException; /** * Parses input arguments and creates a new EditCommand object diff --git a/src/main/java/seedu/address/logic/parser/FindCommandParser.java b/src/main/java/housekeeping/hub/logic/parser/FindCommandParser.java similarity index 79% rename from src/main/java/seedu/address/logic/parser/FindCommandParser.java rename to src/main/java/housekeeping/hub/logic/parser/FindCommandParser.java index 6e00b90403f..88b43c97da6 100644 --- a/src/main/java/seedu/address/logic/parser/FindCommandParser.java +++ b/src/main/java/housekeeping/hub/logic/parser/FindCommandParser.java @@ -1,21 +1,17 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import static seedu.address.logic.parser.CliSyntax.*; -import static seedu.address.logic.parser.CliSyntax.PREFIX_AREA; +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static housekeeping.hub.logic.parser.CliSyntax.*; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_AREA; import java.util.Arrays; -import seedu.address.logic.commands.EditCommand; -import seedu.address.logic.commands.FindClientCommand; -import seedu.address.logic.commands.FindCommand; -import seedu.address.logic.commands.FindHousekeeperCommand; -import seedu.address.logic.parser.exceptions.ParseException; -import seedu.address.model.person.Address; -import seedu.address.model.person.Area; -import seedu.address.model.person.ContainsKeywordsPredicate; -import seedu.address.model.person.NameContainsKeywordsPredicate; -import seedu.address.model.person.Type; +import housekeeping.hub.logic.commands.FindClientCommand; +import housekeeping.hub.logic.commands.FindCommand; +import housekeeping.hub.logic.commands.FindHousekeeperCommand; +import housekeeping.hub.logic.parser.exceptions.ParseException; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.ContainsKeywordsPredicate; /** * Parses input arguments and creates a new FindCommand object diff --git a/src/main/java/seedu/address/logic/parser/ListCommandParser.java b/src/main/java/housekeeping/hub/logic/parser/ListCommandParser.java similarity index 78% rename from src/main/java/seedu/address/logic/parser/ListCommandParser.java rename to src/main/java/housekeeping/hub/logic/parser/ListCommandParser.java index 44ed79bf087..5fdf752f735 100644 --- a/src/main/java/seedu/address/logic/parser/ListCommandParser.java +++ b/src/main/java/housekeeping/hub/logic/parser/ListCommandParser.java @@ -1,12 +1,11 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import seedu.address.logic.commands.ListClientCommand; -import seedu.address.logic.commands.ListCommand; -import seedu.address.logic.commands.ListHousekeeperCommand; -import seedu.address.logic.parser.exceptions.ParseException; -import seedu.address.model.person.TypePredicate; +import housekeeping.hub.logic.commands.ListClientCommand; +import housekeeping.hub.logic.commands.ListCommand; +import housekeeping.hub.logic.commands.ListHousekeeperCommand; +import housekeeping.hub.logic.parser.exceptions.ParseException; /** * Parses input arguments and creates a new FindCommand object diff --git a/src/main/java/seedu/address/logic/parser/Parser.java b/src/main/java/housekeeping/hub/logic/parser/Parser.java similarity index 71% rename from src/main/java/seedu/address/logic/parser/Parser.java rename to src/main/java/housekeeping/hub/logic/parser/Parser.java index d6551ad8e3f..45ca2b11345 100644 --- a/src/main/java/seedu/address/logic/parser/Parser.java +++ b/src/main/java/housekeeping/hub/logic/parser/Parser.java @@ -1,7 +1,7 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; -import seedu.address.logic.commands.Command; -import seedu.address.logic.parser.exceptions.ParseException; +import housekeeping.hub.logic.commands.Command; +import housekeeping.hub.logic.parser.exceptions.ParseException; /** * Represents a Parser that is able to parse user input into a {@code Command} of type {@code T}. diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/housekeeping/hub/logic/parser/ParserUtil.java similarity index 94% rename from src/main/java/seedu/address/logic/parser/ParserUtil.java rename to src/main/java/housekeeping/hub/logic/parser/ParserUtil.java index 7df6f5f8620..bfeb727e7fe 100644 --- a/src/main/java/seedu/address/logic/parser/ParserUtil.java +++ b/src/main/java/housekeeping/hub/logic/parser/ParserUtil.java @@ -1,7 +1,7 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; import static java.util.Objects.requireNonNull; -import static seedu.address.logic.parser.CliSyntax.ALLOWED_PREAMBLES_TYPE; +import static housekeeping.hub.logic.parser.CliSyntax.ALLOWED_PREAMBLES_TYPE; import java.time.LocalDate; import java.time.Period; @@ -12,11 +12,11 @@ import java.util.Set; import java.util.regex.Pattern; -import seedu.address.commons.core.index.Index; -import seedu.address.commons.util.StringUtil; -import seedu.address.logic.parser.exceptions.ParseException; -import seedu.address.model.person.*; -import seedu.address.model.tag.Tag; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.commons.util.StringUtil; +import housekeeping.hub.logic.parser.exceptions.ParseException; +import housekeeping.hub.model.person.*; +import housekeeping.hub.model.tag.Tag; /** * Contains utility methods used for parsing strings in the various *Parser classes. @@ -74,10 +74,10 @@ public static Phone parsePhone(String phone) throws ParseException { } /** - * Parses a {@code String address} into an {@code Address}. + * Parses a {@code String hub} into an {@code Address}. * Leading and trailing whitespaces will be trimmed. * - * @throws ParseException if the given {@code address} is invalid. + * @throws ParseException if the given {@code hub} is invalid. */ public static Address parseAddress(String address) throws ParseException { requireNonNull(address); diff --git a/src/main/java/seedu/address/logic/parser/Prefix.java b/src/main/java/housekeeping/hub/logic/parser/Prefix.java similarity index 95% rename from src/main/java/seedu/address/logic/parser/Prefix.java rename to src/main/java/housekeeping/hub/logic/parser/Prefix.java index 348b7686c8a..db2e0293715 100644 --- a/src/main/java/seedu/address/logic/parser/Prefix.java +++ b/src/main/java/housekeeping/hub/logic/parser/Prefix.java @@ -1,4 +1,4 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; /** * A prefix that marks the beginning of an argument in an arguments string. diff --git a/src/main/java/seedu/address/logic/parser/exceptions/ParseException.java b/src/main/java/housekeeping/hub/logic/parser/exceptions/ParseException.java similarity index 72% rename from src/main/java/seedu/address/logic/parser/exceptions/ParseException.java rename to src/main/java/housekeeping/hub/logic/parser/exceptions/ParseException.java index 158a1a54c1c..55691046789 100644 --- a/src/main/java/seedu/address/logic/parser/exceptions/ParseException.java +++ b/src/main/java/housekeeping/hub/logic/parser/exceptions/ParseException.java @@ -1,6 +1,6 @@ -package seedu.address.logic.parser.exceptions; +package housekeeping.hub.logic.parser.exceptions; -import seedu.address.commons.exceptions.IllegalValueException; +import housekeeping.hub.commons.exceptions.IllegalValueException; /** * Represents a parse error encountered by a parser. diff --git a/src/main/java/seedu/address/model/AddressBook.java b/src/main/java/housekeeping/hub/model/AddressBook.java similarity index 83% rename from src/main/java/seedu/address/model/AddressBook.java rename to src/main/java/housekeeping/hub/model/AddressBook.java index 78a3026f640..b297c4996ca 100644 --- a/src/main/java/seedu/address/model/AddressBook.java +++ b/src/main/java/housekeeping/hub/model/AddressBook.java @@ -1,20 +1,18 @@ -package seedu.address.model; +package housekeeping.hub.model; import static java.util.Objects.requireNonNull; import java.util.Comparator; import java.util.List; -import javafx.collections.FXCollections; import javafx.collections.ObservableList; -import seedu.address.commons.util.ToStringBuilder; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; -import seedu.address.model.person.UniquePersonList; +import housekeeping.hub.commons.util.ToStringBuilder; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.UniquePersonList; /** - * Wraps all data at the address-book level + * Wraps all data at the hub-book level * Duplicates are not allowed (by .isSamePerson comparison) */ public class AddressBook implements ReadOnlyAddressBook { @@ -79,7 +77,7 @@ public void resetData(ReadOnlyAddressBook newData) { //// person-level operations /** - * Returns true if a client with the same identity as {@code client} exists in the address book. + * Returns true if a client with the same identity as {@code client} exists in the hub book. */ public boolean hasClient(Client client) { requireNonNull(client); @@ -87,7 +85,7 @@ public boolean hasClient(Client client) { } /** - * Returns true if a housekeeper with the same identity as {@code housekeeper} exists in the address book. + * Returns true if a housekeeper with the same identity as {@code housekeeper} exists in the hub book. */ public boolean hasHousekeeper(Housekeeper housekeeper) { requireNonNull(housekeeper); @@ -95,16 +93,16 @@ public boolean hasHousekeeper(Housekeeper housekeeper) { } /** - * Adds a client to the address book. - * The client must not already exist in the address book. + * Adds a client to the hub book. + * The client must not already exist in the hub book. */ public void addClient(Client client) { clients.add(client); } /** - * Adds a housekeeper to the address book. - * The housekeeper must not already exist in the address book. + * Adds a housekeeper to the hub book. + * The housekeeper must not already exist in the hub book. */ public void addHousekeeper(Housekeeper housekeeper) { housekeepers.add(housekeeper); @@ -112,8 +110,8 @@ public void addHousekeeper(Housekeeper housekeeper) { /** * Replaces the given client {@code target} in the list with {@code editedClient}. - * {@code target} must exist in the address book. - * The client identity of {@code editedClient} must not be the same as another existing client in the address book. + * {@code target} must exist in the hub book. + * The client identity of {@code editedClient} must not be the same as another existing client in the hub book. */ public void setClient(Client target, Client editedClient) { requireNonNull(editedClient); @@ -123,8 +121,8 @@ public void setClient(Client target, Client editedClient) { /** * Replaces the given housekeeper {@code target} in the list with {@code editedHousekeeper}. - * {@code target} must exist in the address book. - * The housekeeper identity of {@code editedHousekeeper} must not be the same as another existing housekeeper in the address book. + * {@code target} must exist in the hub book. + * The housekeeper identity of {@code editedHousekeeper} must not be the same as another existing housekeeper in the hub book. */ public void setHousekeeper(Housekeeper target, Housekeeper editedHousekeeper) { requireNonNull(editedHousekeeper); @@ -134,7 +132,7 @@ public void setHousekeeper(Housekeeper target, Housekeeper editedHousekeeper) { /** * Removes {@code client} from this {@code AddressBook}. - * {@code client} must exist in the address book. + * {@code client} must exist in the hub book. */ public void removeClient(Client client) { clients.remove(client); @@ -142,7 +140,7 @@ public void removeClient(Client client) { /** * Removes {@code housekeeper} from this {@code AddressBook}. - * {@code housekeeper} must exist in the address book. + * {@code housekeeper} must exist in the hub book. */ public void removeHousekeeper(Housekeeper housekeeper) { housekeepers.remove(housekeeper); diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/housekeeping/hub/model/Model.java similarity index 75% rename from src/main/java/seedu/address/model/Model.java rename to src/main/java/housekeeping/hub/model/Model.java index 6f428c8bbc5..a2a44e48c70 100644 --- a/src/main/java/seedu/address/model/Model.java +++ b/src/main/java/housekeeping/hub/model/Model.java @@ -1,20 +1,17 @@ -package seedu.address.model; +package housekeeping.hub.model; import static java.util.Objects.requireNonNull; -import static seedu.address.commons.util.CollectionUtil.requireAllNonNull; +import static housekeeping.hub.commons.util.CollectionUtil.requireAllNonNull; import java.nio.file.Path; import java.util.Comparator; import java.util.function.Predicate; -import java.util.logging.Logger; import javafx.collections.ObservableList; -import javafx.collections.transformation.FilteredList; -import seedu.address.commons.core.GuiSettings; -import seedu.address.commons.core.LogsCenter; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; +import housekeeping.hub.commons.core.GuiSettings; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.Person; /** * The API of the Model component. @@ -45,17 +42,17 @@ public interface Model { void setGuiSettings(GuiSettings guiSettings); /** - * Returns the user prefs' address book file path. + * Returns the user prefs' hub book file path. */ Path getAddressBookFilePath(); /** - * Sets the user prefs' address book file path. + * Sets the user prefs' hub book file path. */ void setAddressBookFilePath(Path addressBookFilePath); /** - * Replaces address book data with the data in {@code addressBook}. + * Replaces hub book data with the data in {@code addressBook}. */ void setAddressBook(ReadOnlyAddressBook addressBook); @@ -63,50 +60,50 @@ public interface Model { ReadOnlyAddressBook getAddressBook(); /** - * Returns true if a client with the same identity as {@code client} exists in the address book. + * Returns true if a client with the same identity as {@code client} exists in the hub book. */ boolean hasClient(Client client); /** - * Returns true if a housekeeper with the same identity as {@code housekeeper} exists in the address book. + * Returns true if a housekeeper with the same identity as {@code housekeeper} exists in the hub book. */ boolean hasHousekeeper(Housekeeper housekeeper); /** * Deletes the given client. - * The client must exist in the address book. + * The client must exist in the hub book. */ void deleteClient(Client target); /** * Deletes the given housekeeper. - * The housekeeper must exist in the address book. + * The housekeeper must exist in the hub book. */ void deleteHousekeeper(Housekeeper target); /** * Adds the given client. - * {@code client} must not already exist in the address book. + * {@code client} must not already exist in the hub book. */ void addClient(Client client); /** * Adds the given housekeeper. - * {@code housekeeper} must not already exist in the address book. + * {@code housekeeper} must not already exist in the hub book. */ void addHousekeeper(Housekeeper housekeeper); /** * Replaces the given client {@code target} with {@code editedClient}. - * {@code target} must exist in the address book. - * The client identity of {@code editedClient} must not be the same as another existing client in the address book. + * {@code target} must exist in the hub book. + * The client identity of {@code editedClient} must not be the same as another existing client in the hub book. */ void setClient(Client target, Client editedClient); /** * Replaces the given housekeeper {@code target} with {@code editedHousekeeper}. - * {@code target} must exist in the address book. - * The housekeeper identity of {@code editedHousekeeper} must not be the same as another existing housekeeper in the address book. + * {@code target} must exist in the hub book. + * The housekeeper identity of {@code editedHousekeeper} must not be the same as another existing housekeeper in the hub book. */ void setHousekeeper(Housekeeper target, Housekeeper editedHousekeeper); diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/housekeeping/hub/model/ModelManager.java similarity index 92% rename from src/main/java/seedu/address/model/ModelManager.java rename to src/main/java/housekeeping/hub/model/ModelManager.java index 24202ab2eec..13c8797bf2e 100644 --- a/src/main/java/seedu/address/model/ModelManager.java +++ b/src/main/java/housekeeping/hub/model/ModelManager.java @@ -1,7 +1,7 @@ -package seedu.address.model; +package housekeeping.hub.model; import static java.util.Objects.requireNonNull; -import static seedu.address.commons.util.CollectionUtil.requireAllNonNull; +import static housekeeping.hub.commons.util.CollectionUtil.requireAllNonNull; import java.nio.file.Path; import java.util.Comparator; @@ -10,14 +10,14 @@ import javafx.collections.ObservableList; import javafx.collections.transformation.FilteredList; -import seedu.address.commons.core.GuiSettings; -import seedu.address.commons.core.LogsCenter; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; +import housekeeping.hub.commons.core.GuiSettings; +import housekeeping.hub.commons.core.LogsCenter; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.Person; /** - * Represents the in-memory model of the address book data. + * Represents the in-memory model of the hub book data. */ public class ModelManager implements Model { private static final Logger logger = LogsCenter.getLogger(ModelManager.class); @@ -33,7 +33,7 @@ public class ModelManager implements Model { public ModelManager(ReadOnlyAddressBook addressBook, ReadOnlyUserPrefs userPrefs) { requireAllNonNull(addressBook, userPrefs); - logger.fine("Initializing with address book: " + addressBook + " and user prefs " + userPrefs); + logger.fine("Initializing with hub book: " + addressBook + " and user prefs " + userPrefs); this.addressBook = new AddressBook(addressBook); this.userPrefs = new UserPrefs(userPrefs); diff --git a/src/main/java/seedu/address/model/ReadOnlyAddressBook.java b/src/main/java/housekeeping/hub/model/ReadOnlyAddressBook.java similarity index 76% rename from src/main/java/seedu/address/model/ReadOnlyAddressBook.java rename to src/main/java/housekeeping/hub/model/ReadOnlyAddressBook.java index cbca8946ac7..97d97cd70ab 100644 --- a/src/main/java/seedu/address/model/ReadOnlyAddressBook.java +++ b/src/main/java/housekeeping/hub/model/ReadOnlyAddressBook.java @@ -1,12 +1,11 @@ -package seedu.address.model; +package housekeeping.hub.model; import javafx.collections.ObservableList; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; /** - * Unmodifiable view of an address book + * Unmodifiable view of an hub book */ public interface ReadOnlyAddressBook { diff --git a/src/main/java/seedu/address/model/ReadOnlyUserPrefs.java b/src/main/java/housekeeping/hub/model/ReadOnlyUserPrefs.java similarity index 69% rename from src/main/java/seedu/address/model/ReadOnlyUserPrefs.java rename to src/main/java/housekeeping/hub/model/ReadOnlyUserPrefs.java index e6810b61b6b..2559e212030 100644 --- a/src/main/java/seedu/address/model/ReadOnlyUserPrefs.java +++ b/src/main/java/housekeeping/hub/model/ReadOnlyUserPrefs.java @@ -1,8 +1,8 @@ -package seedu.address.model; +package housekeeping.hub.model; import java.nio.file.Path; -import seedu.address.commons.core.GuiSettings; +import housekeeping.hub.commons.core.GuiSettings; /** * Unmodifiable view of user prefs. diff --git a/src/main/java/seedu/address/model/UserPrefs.java b/src/main/java/housekeeping/hub/model/UserPrefs.java similarity index 96% rename from src/main/java/seedu/address/model/UserPrefs.java rename to src/main/java/housekeeping/hub/model/UserPrefs.java index b0cc2b25a2c..4717c861962 100644 --- a/src/main/java/seedu/address/model/UserPrefs.java +++ b/src/main/java/housekeeping/hub/model/UserPrefs.java @@ -1,4 +1,4 @@ -package seedu.address.model; +package housekeeping.hub.model; import static java.util.Objects.requireNonNull; @@ -6,7 +6,7 @@ import java.nio.file.Paths; import java.util.Objects; -import seedu.address.commons.core.GuiSettings; +import housekeeping.hub.commons.core.GuiSettings; /** * Represents User's preferences. diff --git a/src/main/java/seedu/address/model/person/Address.java b/src/main/java/housekeeping/hub/model/person/Address.java similarity index 83% rename from src/main/java/seedu/address/model/person/Address.java rename to src/main/java/housekeeping/hub/model/person/Address.java index 469a2cc9a1e..f6a105c77da 100644 --- a/src/main/java/seedu/address/model/person/Address.java +++ b/src/main/java/housekeeping/hub/model/person/Address.java @@ -1,10 +1,10 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static java.util.Objects.requireNonNull; -import static seedu.address.commons.util.AppUtil.checkArgument; +import static housekeeping.hub.commons.util.AppUtil.checkArgument; /** - * Represents a Person's address in the address book. + * Represents a Person's hub in the hub book. * Guarantees: immutable; is valid as declared in {@link #isValidAddress(String)} */ public class Address { @@ -12,7 +12,7 @@ public class Address { public static final String MESSAGE_CONSTRAINTS = "Addresses can take any values, and it should not be blank"; /* - * The first character of the address must not be a whitespace, + * The first character of the hub must not be a whitespace, * otherwise " " (a blank string) becomes a valid input. */ public static final String VALIDATION_REGEX = "[^\\s].*"; @@ -22,7 +22,7 @@ public class Address { /** * Constructs an {@code Address}. * - * @param address A valid address. + * @param address A valid hub. */ public Address(String address) { requireNonNull(address); diff --git a/src/main/java/seedu/address/model/person/Area.java b/src/main/java/housekeeping/hub/model/person/Area.java similarity index 88% rename from src/main/java/seedu/address/model/person/Area.java rename to src/main/java/housekeeping/hub/model/person/Area.java index 8c965998735..1c4b50f17f4 100644 --- a/src/main/java/seedu/address/model/person/Area.java +++ b/src/main/java/housekeeping/hub/model/person/Area.java @@ -1,11 +1,11 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static java.util.Objects.requireNonNull; -import static seedu.address.commons.util.AppUtil.checkArgument; -import static seedu.address.logic.parser.CliSyntax.ALLOWED_PREAMBLES_AREA; +import static housekeeping.hub.commons.util.AppUtil.checkArgument; +import static housekeeping.hub.logic.parser.CliSyntax.ALLOWED_PREAMBLES_AREA; /** - * Represents a Person's area in the address book. + * Represents a Person's area in the hub book. * Guarantees: immutable; is valid as declared in {@link #isValidArea(String)} */ public class Area { diff --git a/src/main/java/seedu/address/model/person/Booking.java b/src/main/java/housekeeping/hub/model/person/Booking.java similarity index 97% rename from src/main/java/seedu/address/model/person/Booking.java rename to src/main/java/housekeeping/hub/model/person/Booking.java index e38275be894..da7ccc1dc67 100644 --- a/src/main/java/seedu/address/model/person/Booking.java +++ b/src/main/java/housekeeping/hub/model/person/Booking.java @@ -1,7 +1,7 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static java.util.Objects.requireNonNull; -import static seedu.address.commons.util.AppUtil.checkArgument; +import static housekeeping.hub.commons.util.AppUtil.checkArgument; import java.time.LocalDate; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/seedu/address/model/person/BookingList.java b/src/main/java/housekeeping/hub/model/person/BookingList.java similarity index 99% rename from src/main/java/seedu/address/model/person/BookingList.java rename to src/main/java/housekeeping/hub/model/person/BookingList.java index 3abaadf15f1..92769bb2fc5 100644 --- a/src/main/java/seedu/address/model/person/BookingList.java +++ b/src/main/java/housekeeping/hub/model/person/BookingList.java @@ -1,4 +1,4 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/seedu/address/model/person/BookingSearchPredicate.java b/src/main/java/housekeeping/hub/model/person/BookingSearchPredicate.java similarity index 92% rename from src/main/java/seedu/address/model/person/BookingSearchPredicate.java rename to src/main/java/housekeeping/hub/model/person/BookingSearchPredicate.java index 3a74d2c4c5c..e7d2b37073a 100644 --- a/src/main/java/seedu/address/model/person/BookingSearchPredicate.java +++ b/src/main/java/housekeeping/hub/model/person/BookingSearchPredicate.java @@ -1,9 +1,9 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import java.util.function.Predicate; -import seedu.address.commons.util.StringUtil; -import seedu.address.commons.util.ToStringBuilder; +import housekeeping.hub.commons.util.StringUtil; +import housekeeping.hub.commons.util.ToStringBuilder; /** * Tests that a {@code Housekeeper}'s {@code Area} matches the specified area and that they do not have a booking diff --git a/src/main/java/seedu/address/model/person/Client.java b/src/main/java/housekeeping/hub/model/person/Client.java similarity index 93% rename from src/main/java/seedu/address/model/person/Client.java rename to src/main/java/housekeeping/hub/model/person/Client.java index a3c98d9bb89..ef367e2e890 100644 --- a/src/main/java/seedu/address/model/person/Client.java +++ b/src/main/java/housekeeping/hub/model/person/Client.java @@ -1,15 +1,14 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import java.time.LocalDate; -import java.util.Comparator; import java.util.Set; -import seedu.address.commons.util.ToStringBuilder; -import seedu.address.model.tag.Tag; +import housekeeping.hub.commons.util.ToStringBuilder; +import housekeeping.hub.model.tag.Tag; /** - * Represents a Person in the address book. + * Represents a Person in the hub book. * Guarantees: details are present and not null, field values are validated, immutable. */ public class Client extends Person implements Comparable { @@ -106,7 +105,7 @@ public String toString() { .add("name", this.getName()) .add("phone", this.getPhone()) .add("email", this.getEmail()) - .add("address", this.getAddress()) + .add("hub", this.getAddress()) .add("tags", this.getTags()) .add("housekeepingDetails", this.housekeepingDetails) .toString(); diff --git a/src/main/java/seedu/address/model/person/ClientComparator.java b/src/main/java/housekeeping/hub/model/person/ClientComparator.java similarity index 87% rename from src/main/java/seedu/address/model/person/ClientComparator.java rename to src/main/java/housekeeping/hub/model/person/ClientComparator.java index 954a8a286ce..77ea7268d34 100644 --- a/src/main/java/seedu/address/model/person/ClientComparator.java +++ b/src/main/java/housekeeping/hub/model/person/ClientComparator.java @@ -1,4 +1,4 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import java.util.Comparator; diff --git a/src/main/java/seedu/address/model/person/ContainsKeywordsPredicate.java b/src/main/java/housekeeping/hub/model/person/ContainsKeywordsPredicate.java similarity index 94% rename from src/main/java/seedu/address/model/person/ContainsKeywordsPredicate.java rename to src/main/java/housekeeping/hub/model/person/ContainsKeywordsPredicate.java index 0255326ca49..dea80903c6d 100644 --- a/src/main/java/seedu/address/model/person/ContainsKeywordsPredicate.java +++ b/src/main/java/housekeeping/hub/model/person/ContainsKeywordsPredicate.java @@ -1,10 +1,10 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import java.util.List; import java.util.function.Predicate; -import seedu.address.commons.util.StringUtil; -import seedu.address.commons.util.ToStringBuilder; +import housekeeping.hub.commons.util.StringUtil; +import housekeeping.hub.commons.util.ToStringBuilder; /** * Tests that a {@code Person}'s {@code Name} matches any of the keywords given. diff --git a/src/main/java/seedu/address/model/person/Email.java b/src/main/java/housekeeping/hub/model/person/Email.java similarity index 93% rename from src/main/java/seedu/address/model/person/Email.java rename to src/main/java/housekeeping/hub/model/person/Email.java index c62e512bc29..34a737e3df1 100644 --- a/src/main/java/seedu/address/model/person/Email.java +++ b/src/main/java/housekeeping/hub/model/person/Email.java @@ -1,10 +1,10 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static java.util.Objects.requireNonNull; -import static seedu.address.commons.util.AppUtil.checkArgument; +import static housekeeping.hub.commons.util.AppUtil.checkArgument; /** - * Represents a Person's email in the address book. + * Represents a Person's email in the hub book. * Guarantees: immutable; is valid as declared in {@link #isValidEmail(String)} */ public class Email { @@ -36,7 +36,7 @@ public class Email { /** * Constructs an {@code Email}. * - * @param email A valid email address. + * @param email A valid email hub. */ public Email(String email) { requireNonNull(email); diff --git a/src/main/java/seedu/address/model/person/Housekeeper.java b/src/main/java/housekeeping/hub/model/person/Housekeeper.java similarity index 95% rename from src/main/java/seedu/address/model/person/Housekeeper.java rename to src/main/java/housekeeping/hub/model/person/Housekeeper.java index 999454a4f7a..26bca8fedf1 100644 --- a/src/main/java/seedu/address/model/person/Housekeeper.java +++ b/src/main/java/housekeeping/hub/model/person/Housekeeper.java @@ -1,12 +1,12 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import java.util.Set; -import seedu.address.model.tag.Tag; +import housekeeping.hub.model.tag.Tag; /** - * Represents a Housekeeper in the address book. + * Represents a Housekeeper in the hub book. * Guarantees: details are present and not null, field values are validated, immutable. */ public class Housekeeper extends Person { diff --git a/src/main/java/seedu/address/model/person/HousekeepingDetails.java b/src/main/java/housekeeping/hub/model/person/HousekeepingDetails.java similarity index 99% rename from src/main/java/seedu/address/model/person/HousekeepingDetails.java rename to src/main/java/housekeeping/hub/model/person/HousekeepingDetails.java index 6886dfe457a..27c3e84b872 100644 --- a/src/main/java/seedu/address/model/person/HousekeepingDetails.java +++ b/src/main/java/housekeeping/hub/model/person/HousekeepingDetails.java @@ -1,4 +1,4 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import java.time.LocalDate; import java.time.Period; diff --git a/src/main/java/seedu/address/model/person/LeadsFilterPredicate.java b/src/main/java/housekeeping/hub/model/person/LeadsFilterPredicate.java similarity index 92% rename from src/main/java/seedu/address/model/person/LeadsFilterPredicate.java rename to src/main/java/housekeeping/hub/model/person/LeadsFilterPredicate.java index 916bf9c2f95..f85a47dedf3 100644 --- a/src/main/java/seedu/address/model/person/LeadsFilterPredicate.java +++ b/src/main/java/housekeeping/hub/model/person/LeadsFilterPredicate.java @@ -1,9 +1,9 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import java.time.LocalDate; import java.util.function.Predicate; -import seedu.address.commons.util.ToStringBuilder; +import housekeeping.hub.commons.util.ToStringBuilder; /** * Tests that a {@code Person}'s {@code Name} matches any of the keywords given. diff --git a/src/main/java/seedu/address/model/person/Name.java b/src/main/java/housekeeping/hub/model/person/Name.java similarity index 86% rename from src/main/java/seedu/address/model/person/Name.java rename to src/main/java/housekeeping/hub/model/person/Name.java index 173f15b9b00..72ed5995679 100644 --- a/src/main/java/seedu/address/model/person/Name.java +++ b/src/main/java/housekeeping/hub/model/person/Name.java @@ -1,10 +1,10 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static java.util.Objects.requireNonNull; -import static seedu.address.commons.util.AppUtil.checkArgument; +import static housekeeping.hub.commons.util.AppUtil.checkArgument; /** - * Represents a Person's name in the address book. + * Represents a Person's name in the hub book. * Guarantees: immutable; is valid as declared in {@link #isValidName(String)} */ public class Name { @@ -13,7 +13,7 @@ public class Name { "Names should only contain alphanumeric characters and spaces, and it should not be blank"; /* - * The first character of the address must not be a whitespace, + * The first character of the hub must not be a whitespace, * otherwise " " (a blank string) becomes a valid input. */ public static final String VALIDATION_REGEX = "[\\p{Alnum}][\\p{Alnum} ]*"; diff --git a/src/main/java/seedu/address/model/person/NameContainsKeywordsPredicate.java b/src/main/java/housekeeping/hub/model/person/NameContainsKeywordsPredicate.java similarity index 89% rename from src/main/java/seedu/address/model/person/NameContainsKeywordsPredicate.java rename to src/main/java/housekeeping/hub/model/person/NameContainsKeywordsPredicate.java index 62d19be2977..730cc6fa2b8 100644 --- a/src/main/java/seedu/address/model/person/NameContainsKeywordsPredicate.java +++ b/src/main/java/housekeeping/hub/model/person/NameContainsKeywordsPredicate.java @@ -1,10 +1,10 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import java.util.List; import java.util.function.Predicate; -import seedu.address.commons.util.StringUtil; -import seedu.address.commons.util.ToStringBuilder; +import housekeeping.hub.commons.util.StringUtil; +import housekeeping.hub.commons.util.ToStringBuilder; /** * Tests that a {@code Person}'s {@code Name} matches any of the keywords given. diff --git a/src/main/java/seedu/address/model/person/Person.java b/src/main/java/housekeeping/hub/model/person/Person.java similarity index 89% rename from src/main/java/seedu/address/model/person/Person.java rename to src/main/java/housekeeping/hub/model/person/Person.java index dd04bae7646..3db2499e60e 100644 --- a/src/main/java/seedu/address/model/person/Person.java +++ b/src/main/java/housekeeping/hub/model/person/Person.java @@ -1,17 +1,16 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; -import static seedu.address.commons.util.CollectionUtil.requireAllNonNull; +import static housekeeping.hub.commons.util.CollectionUtil.requireAllNonNull; import java.util.Collections; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import seedu.address.commons.util.ToStringBuilder; -import seedu.address.model.tag.Tag; +import housekeeping.hub.model.tag.Tag; /** - * Represents a Person in the address book. + * Represents a Person in the hub book. * Guarantees: details are present and not null, field values are validated, immutable. */ public abstract class Person { diff --git a/src/main/java/seedu/address/model/person/Phone.java b/src/main/java/housekeeping/hub/model/person/Phone.java similarity index 89% rename from src/main/java/seedu/address/model/person/Phone.java rename to src/main/java/housekeeping/hub/model/person/Phone.java index d733f63d739..8fde38ad91d 100644 --- a/src/main/java/seedu/address/model/person/Phone.java +++ b/src/main/java/housekeeping/hub/model/person/Phone.java @@ -1,10 +1,10 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static java.util.Objects.requireNonNull; -import static seedu.address.commons.util.AppUtil.checkArgument; +import static housekeeping.hub.commons.util.AppUtil.checkArgument; /** - * Represents a Person's phone number in the address book. + * Represents a Person's phone number in the hub book. * Guarantees: immutable; is valid as declared in {@link #isValidPhone(String)} */ public class Phone { diff --git a/src/main/java/seedu/address/model/person/Type.java b/src/main/java/housekeeping/hub/model/person/Type.java similarity index 89% rename from src/main/java/seedu/address/model/person/Type.java rename to src/main/java/housekeeping/hub/model/person/Type.java index f73bb61e64a..dc042290c8a 100644 --- a/src/main/java/seedu/address/model/person/Type.java +++ b/src/main/java/housekeeping/hub/model/person/Type.java @@ -1,11 +1,11 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static java.util.Objects.requireNonNull; -import static seedu.address.commons.util.AppUtil.checkArgument; -import static seedu.address.logic.parser.CliSyntax.ALLOWED_PREAMBLES_TYPE; +import static housekeeping.hub.commons.util.AppUtil.checkArgument; +import static housekeeping.hub.logic.parser.CliSyntax.ALLOWED_PREAMBLES_TYPE; /** - * Represents a Person's Type in the address book. + * Represents a Person's Type in the hub book. * Guarantees: immutable; is valid as declared in {@link #isValidType(String)} */ public class Type { diff --git a/src/main/java/seedu/address/model/person/TypePredicate.java b/src/main/java/housekeeping/hub/model/person/TypePredicate.java similarity index 92% rename from src/main/java/seedu/address/model/person/TypePredicate.java rename to src/main/java/housekeeping/hub/model/person/TypePredicate.java index eeeec32a1f9..cbf0ad17583 100644 --- a/src/main/java/seedu/address/model/person/TypePredicate.java +++ b/src/main/java/housekeeping/hub/model/person/TypePredicate.java @@ -1,8 +1,8 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import java.util.function.Predicate; -import seedu.address.commons.util.ToStringBuilder; +import housekeeping.hub.commons.util.ToStringBuilder; /** * Tests that a {@code Person}'s {@code Name} matches any of the keywords given. diff --git a/src/main/java/seedu/address/model/person/UniquePersonList.java b/src/main/java/housekeeping/hub/model/person/UniquePersonList.java similarity index 94% rename from src/main/java/seedu/address/model/person/UniquePersonList.java rename to src/main/java/housekeeping/hub/model/person/UniquePersonList.java index 697d7529cba..d3048174c2e 100644 --- a/src/main/java/seedu/address/model/person/UniquePersonList.java +++ b/src/main/java/housekeeping/hub/model/person/UniquePersonList.java @@ -1,7 +1,7 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static java.util.Objects.requireNonNull; -import static seedu.address.commons.util.CollectionUtil.requireAllNonNull; +import static housekeeping.hub.commons.util.CollectionUtil.requireAllNonNull; import java.util.Comparator; import java.util.Iterator; @@ -9,8 +9,8 @@ import javafx.collections.FXCollections; import javafx.collections.ObservableList; -import seedu.address.model.person.exceptions.DuplicatePersonException; -import seedu.address.model.person.exceptions.PersonNotFoundException; +import housekeeping.hub.model.person.exceptions.DuplicatePersonException; +import housekeeping.hub.model.person.exceptions.PersonNotFoundException; /** * A list of persons that enforces uniqueness between its elements and does not allow nulls. diff --git a/src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java b/src/main/java/housekeeping/hub/model/person/exceptions/DuplicatePersonException.java similarity index 86% rename from src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java rename to src/main/java/housekeeping/hub/model/person/exceptions/DuplicatePersonException.java index d7290f59442..0eb435b7cdd 100644 --- a/src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java +++ b/src/main/java/housekeeping/hub/model/person/exceptions/DuplicatePersonException.java @@ -1,4 +1,4 @@ -package seedu.address.model.person.exceptions; +package housekeeping.hub.model.person.exceptions; /** * Signals that the operation will result in duplicate Persons (Persons are considered duplicates if they have the same diff --git a/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java b/src/main/java/housekeeping/hub/model/person/exceptions/PersonNotFoundException.java similarity index 74% rename from src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java rename to src/main/java/housekeeping/hub/model/person/exceptions/PersonNotFoundException.java index fa764426ca7..e498705ab85 100644 --- a/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java +++ b/src/main/java/housekeeping/hub/model/person/exceptions/PersonNotFoundException.java @@ -1,4 +1,4 @@ -package seedu.address.model.person.exceptions; +package housekeeping.hub.model.person.exceptions; /** * Signals that the operation is unable to find the specified person. diff --git a/src/main/java/seedu/address/model/tag/Tag.java b/src/main/java/housekeeping/hub/model/tag/Tag.java similarity index 91% rename from src/main/java/seedu/address/model/tag/Tag.java rename to src/main/java/housekeeping/hub/model/tag/Tag.java index 28fba86ae8b..767d57dc0c7 100644 --- a/src/main/java/seedu/address/model/tag/Tag.java +++ b/src/main/java/housekeeping/hub/model/tag/Tag.java @@ -1,10 +1,10 @@ -package seedu.address.model.tag; +package housekeeping.hub.model.tag; import static java.util.Objects.requireNonNull; -import static seedu.address.commons.util.AppUtil.checkArgument; +import static housekeeping.hub.commons.util.AppUtil.checkArgument; /** - * Represents a Tag in the address book. + * Represents a Tag in the hub book. * Guarantees: immutable; name is valid as declared in {@link #isValidTagName(String)} */ public class Tag { diff --git a/src/main/java/seedu/address/model/util/SampleDataUtil.java b/src/main/java/housekeeping/hub/model/util/SampleDataUtil.java similarity index 88% rename from src/main/java/seedu/address/model/util/SampleDataUtil.java rename to src/main/java/housekeeping/hub/model/util/SampleDataUtil.java index af10f9b48b4..f4d2b70e1ed 100644 --- a/src/main/java/seedu/address/model/util/SampleDataUtil.java +++ b/src/main/java/housekeeping/hub/model/util/SampleDataUtil.java @@ -1,24 +1,23 @@ -package seedu.address.model.util; +package housekeeping.hub.model.util; import java.util.Arrays; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import seedu.address.logic.parser.ParserUtil; -import seedu.address.model.AddressBook; -import seedu.address.model.ReadOnlyAddressBook; -import seedu.address.model.person.Address; -import seedu.address.model.person.BookingList; -import seedu.address.model.person.Area; -import seedu.address.model.person.Client; -import seedu.address.model.person.Email; -import seedu.address.model.person.HousekeepingDetails; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Name; -import seedu.address.model.person.Phone; -import seedu.address.model.person.Type; -import seedu.address.model.tag.Tag; +import housekeeping.hub.logic.parser.ParserUtil; +import housekeeping.hub.model.AddressBook; +import housekeeping.hub.model.ReadOnlyAddressBook; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.BookingList; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.HousekeepingDetails; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.tag.Tag; /** * Contains utility methods for populating {@code AddressBook} with sample data. diff --git a/src/main/java/seedu/address/storage/AddressBookStorage.java b/src/main/java/housekeeping/hub/storage/AddressBookStorage.java similarity index 83% rename from src/main/java/seedu/address/storage/AddressBookStorage.java rename to src/main/java/housekeeping/hub/storage/AddressBookStorage.java index 490685ad07b..6ae36555f54 100644 --- a/src/main/java/seedu/address/storage/AddressBookStorage.java +++ b/src/main/java/housekeeping/hub/storage/AddressBookStorage.java @@ -1,14 +1,14 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import java.io.IOException; import java.nio.file.Path; import java.util.Optional; -import seedu.address.commons.exceptions.DataLoadingException; -import seedu.address.model.ReadOnlyAddressBook; +import housekeeping.hub.commons.exceptions.DataLoadingException; +import housekeeping.hub.model.ReadOnlyAddressBook; /** - * Represents a storage for {@link seedu.address.model.AddressBook}. + * Represents a storage for {@link housekeeping.hub.model.AddressBook}. */ public interface AddressBookStorage { diff --git a/src/main/java/seedu/address/storage/JsonAdaptedBooking.java b/src/main/java/housekeeping/hub/storage/JsonAdaptedBooking.java similarity index 89% rename from src/main/java/seedu/address/storage/JsonAdaptedBooking.java rename to src/main/java/housekeeping/hub/storage/JsonAdaptedBooking.java index e1ee2e2e18b..37a18e4aa84 100644 --- a/src/main/java/seedu/address/storage/JsonAdaptedBooking.java +++ b/src/main/java/housekeeping/hub/storage/JsonAdaptedBooking.java @@ -1,10 +1,10 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import seedu.address.commons.exceptions.IllegalValueException; -import seedu.address.model.person.Booking; +import housekeeping.hub.commons.exceptions.IllegalValueException; +import housekeeping.hub.model.person.Booking; /** * Jackson-friendly version of {@link Booking}. diff --git a/src/main/java/seedu/address/storage/JsonAdaptedClient.java b/src/main/java/housekeeping/hub/storage/JsonAdaptedClient.java similarity index 85% rename from src/main/java/seedu/address/storage/JsonAdaptedClient.java rename to src/main/java/housekeeping/hub/storage/JsonAdaptedClient.java index 065dcaba153..f7d35674930 100644 --- a/src/main/java/seedu/address/storage/JsonAdaptedClient.java +++ b/src/main/java/housekeeping/hub/storage/JsonAdaptedClient.java @@ -1,24 +1,22 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import seedu.address.commons.exceptions.IllegalValueException; -import seedu.address.model.person.Address; -import seedu.address.model.person.Area; -import seedu.address.model.person.Client; -import seedu.address.model.person.Email; -import seedu.address.model.person.HousekeepingDetails; -import seedu.address.model.person.Name; -import seedu.address.model.person.Phone; -import seedu.address.model.person.Type; -import seedu.address.model.tag.Tag; +import housekeeping.hub.commons.exceptions.IllegalValueException; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.HousekeepingDetails; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.tag.Tag; public class JsonAdaptedClient extends JsonAdaptedPerson { protected final JsonAdaptedDetails details; @@ -28,7 +26,7 @@ public class JsonAdaptedClient extends JsonAdaptedPerson { */ @JsonCreator public JsonAdaptedClient(@JsonProperty("name") String name, @JsonProperty("phone") String phone, - @JsonProperty("email") String email, @JsonProperty("address") String address, + @JsonProperty("email") String email, @JsonProperty("hub") String address, @JsonProperty("tags") List tags, @JsonProperty("details") JsonAdaptedDetails details, @JsonProperty("area") String area) { super(name, phone, email, address, tags, area); diff --git a/src/main/java/seedu/address/storage/JsonAdaptedDetails.java b/src/main/java/housekeeping/hub/storage/JsonAdaptedDetails.java similarity index 86% rename from src/main/java/seedu/address/storage/JsonAdaptedDetails.java rename to src/main/java/housekeeping/hub/storage/JsonAdaptedDetails.java index 233f85b0cd0..f3a2aaefcb6 100644 --- a/src/main/java/seedu/address/storage/JsonAdaptedDetails.java +++ b/src/main/java/housekeeping/hub/storage/JsonAdaptedDetails.java @@ -1,10 +1,10 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import seedu.address.commons.exceptions.IllegalValueException; -import seedu.address.model.person.HousekeepingDetails; +import housekeeping.hub.commons.exceptions.IllegalValueException; +import housekeeping.hub.model.person.HousekeepingDetails; /** * Jackson-friendly version of {@link HousekeepingDetails}. diff --git a/src/main/java/seedu/address/storage/JsonAdaptedHousekeeper.java b/src/main/java/housekeeping/hub/storage/JsonAdaptedHousekeeper.java similarity index 85% rename from src/main/java/seedu/address/storage/JsonAdaptedHousekeeper.java rename to src/main/java/housekeeping/hub/storage/JsonAdaptedHousekeeper.java index 6f74d1c6cc8..06c164992fd 100644 --- a/src/main/java/seedu/address/storage/JsonAdaptedHousekeeper.java +++ b/src/main/java/housekeeping/hub/storage/JsonAdaptedHousekeeper.java @@ -1,4 +1,4 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import java.util.ArrayList; import java.util.HashSet; @@ -8,18 +8,16 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import seedu.address.commons.exceptions.IllegalValueException; -import seedu.address.model.person.Address; -import seedu.address.model.person.Booking; -import seedu.address.model.person.BookingList; -import seedu.address.model.person.Client; -import seedu.address.model.person.Area; -import seedu.address.model.person.Email; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Name; -import seedu.address.model.person.Phone; -import seedu.address.model.person.Type; -import seedu.address.model.tag.Tag; +import housekeeping.hub.commons.exceptions.IllegalValueException; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.Booking; +import housekeeping.hub.model.person.BookingList; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.tag.Tag; public class JsonAdaptedHousekeeper extends JsonAdaptedPerson { protected final ArrayList bookingList; @@ -29,7 +27,7 @@ public class JsonAdaptedHousekeeper extends JsonAdaptedPerson { */ @JsonCreator public JsonAdaptedHousekeeper(@JsonProperty("name") String name, @JsonProperty("phone") String phone, - @JsonProperty("email") String email, @JsonProperty("address") String address, + @JsonProperty("email") String email, @JsonProperty("hub") String address, @JsonProperty("tags") List tags, @JsonProperty("area") String area, @JsonProperty("booking list") ArrayList bookingList) { super(name, phone, email, address, tags, area); diff --git a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java b/src/main/java/housekeeping/hub/storage/JsonAdaptedPerson.java similarity index 78% rename from src/main/java/seedu/address/storage/JsonAdaptedPerson.java rename to src/main/java/housekeeping/hub/storage/JsonAdaptedPerson.java index 0991e78f260..ead1207134a 100644 --- a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java +++ b/src/main/java/housekeeping/hub/storage/JsonAdaptedPerson.java @@ -1,24 +1,14 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import seedu.address.commons.exceptions.IllegalValueException; -import seedu.address.model.person.Address; -import seedu.address.model.person.Client; -import seedu.address.model.person.Email; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Name; -import seedu.address.model.person.Person; -import seedu.address.model.person.Phone; -import seedu.address.model.person.Type; -import seedu.address.model.tag.Tag; +import housekeeping.hub.commons.exceptions.IllegalValueException; +import housekeeping.hub.model.person.Person; /** * Jackson-friendly version of {@link Person}. @@ -39,7 +29,7 @@ abstract class JsonAdaptedPerson { */ @JsonCreator public JsonAdaptedPerson(@JsonProperty("name") String name, @JsonProperty("phone") String phone, - @JsonProperty("email") String email, @JsonProperty("address") String address, + @JsonProperty("email") String email, @JsonProperty("hub") String address, @JsonProperty("tags") List tags, @JsonProperty("area") String area) { this.name = name; this.phone = phone; diff --git a/src/main/java/seedu/address/storage/JsonAdaptedTag.java b/src/main/java/housekeeping/hub/storage/JsonAdaptedTag.java similarity index 88% rename from src/main/java/seedu/address/storage/JsonAdaptedTag.java rename to src/main/java/housekeeping/hub/storage/JsonAdaptedTag.java index 0df22bdb754..8badd29bc6f 100644 --- a/src/main/java/seedu/address/storage/JsonAdaptedTag.java +++ b/src/main/java/housekeeping/hub/storage/JsonAdaptedTag.java @@ -1,10 +1,10 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import seedu.address.commons.exceptions.IllegalValueException; -import seedu.address.model.tag.Tag; +import housekeeping.hub.commons.exceptions.IllegalValueException; +import housekeeping.hub.model.tag.Tag; /** * Jackson-friendly version of {@link Tag}. diff --git a/src/main/java/seedu/address/storage/JsonAddressBookStorage.java b/src/main/java/housekeeping/hub/storage/JsonAddressBookStorage.java similarity index 86% rename from src/main/java/seedu/address/storage/JsonAddressBookStorage.java rename to src/main/java/housekeeping/hub/storage/JsonAddressBookStorage.java index 41e06f264e1..d8a6fe8adbf 100644 --- a/src/main/java/seedu/address/storage/JsonAddressBookStorage.java +++ b/src/main/java/housekeeping/hub/storage/JsonAddressBookStorage.java @@ -1,4 +1,4 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import static java.util.Objects.requireNonNull; @@ -7,12 +7,12 @@ import java.util.Optional; import java.util.logging.Logger; -import seedu.address.commons.core.LogsCenter; -import seedu.address.commons.exceptions.DataLoadingException; -import seedu.address.commons.exceptions.IllegalValueException; -import seedu.address.commons.util.FileUtil; -import seedu.address.commons.util.JsonUtil; -import seedu.address.model.ReadOnlyAddressBook; +import housekeeping.hub.commons.core.LogsCenter; +import housekeeping.hub.commons.exceptions.DataLoadingException; +import housekeeping.hub.commons.exceptions.IllegalValueException; +import housekeeping.hub.commons.util.FileUtil; +import housekeeping.hub.commons.util.JsonUtil; +import housekeeping.hub.model.ReadOnlyAddressBook; /** * A class to access AddressBook data stored as a json file on the hard disk. diff --git a/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java b/src/main/java/housekeeping/hub/storage/JsonSerializableAddressBook.java similarity index 86% rename from src/main/java/seedu/address/storage/JsonSerializableAddressBook.java rename to src/main/java/housekeeping/hub/storage/JsonSerializableAddressBook.java index 94ed08a23dd..2cfedd7c819 100644 --- a/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java +++ b/src/main/java/housekeeping/hub/storage/JsonSerializableAddressBook.java @@ -1,4 +1,4 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import java.util.ArrayList; import java.util.List; @@ -8,12 +8,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; -import seedu.address.commons.exceptions.IllegalValueException; -import seedu.address.model.AddressBook; -import seedu.address.model.ReadOnlyAddressBook; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; +import housekeeping.hub.commons.exceptions.IllegalValueException; +import housekeeping.hub.model.AddressBook; +import housekeeping.hub.model.ReadOnlyAddressBook; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; /** * An Immutable AddressBook that is serializable to JSON format. @@ -49,7 +48,7 @@ public JsonSerializableAddressBook(ReadOnlyAddressBook source) { } /** - * Converts this address book into the model's {@code AddressBook} object. + * Converts this hub book into the model's {@code AddressBook} object. * * @throws IllegalValueException if there were any data constraints violated. */ diff --git a/src/main/java/seedu/address/storage/JsonUserPrefsStorage.java b/src/main/java/housekeeping/hub/storage/JsonUserPrefsStorage.java similarity index 82% rename from src/main/java/seedu/address/storage/JsonUserPrefsStorage.java rename to src/main/java/housekeeping/hub/storage/JsonUserPrefsStorage.java index 48a9754807d..583ad4a3db4 100644 --- a/src/main/java/seedu/address/storage/JsonUserPrefsStorage.java +++ b/src/main/java/housekeeping/hub/storage/JsonUserPrefsStorage.java @@ -1,13 +1,13 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import java.io.IOException; import java.nio.file.Path; import java.util.Optional; -import seedu.address.commons.exceptions.DataLoadingException; -import seedu.address.commons.util.JsonUtil; -import seedu.address.model.ReadOnlyUserPrefs; -import seedu.address.model.UserPrefs; +import housekeeping.hub.commons.exceptions.DataLoadingException; +import housekeeping.hub.commons.util.JsonUtil; +import housekeeping.hub.model.ReadOnlyUserPrefs; +import housekeeping.hub.model.UserPrefs; /** * A class to access UserPrefs stored in the hard disk as a json file diff --git a/src/main/java/seedu/address/storage/Storage.java b/src/main/java/housekeeping/hub/storage/Storage.java similarity index 71% rename from src/main/java/seedu/address/storage/Storage.java rename to src/main/java/housekeeping/hub/storage/Storage.java index 9fba0c7a1d6..6739fe2b2e5 100644 --- a/src/main/java/seedu/address/storage/Storage.java +++ b/src/main/java/housekeeping/hub/storage/Storage.java @@ -1,13 +1,13 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import java.io.IOException; import java.nio.file.Path; import java.util.Optional; -import seedu.address.commons.exceptions.DataLoadingException; -import seedu.address.model.ReadOnlyAddressBook; -import seedu.address.model.ReadOnlyUserPrefs; -import seedu.address.model.UserPrefs; +import housekeeping.hub.commons.exceptions.DataLoadingException; +import housekeeping.hub.model.ReadOnlyAddressBook; +import housekeeping.hub.model.ReadOnlyUserPrefs; +import housekeeping.hub.model.UserPrefs; /** * API of the Storage component diff --git a/src/main/java/seedu/address/storage/StorageManager.java b/src/main/java/housekeeping/hub/storage/StorageManager.java similarity index 89% rename from src/main/java/seedu/address/storage/StorageManager.java rename to src/main/java/housekeeping/hub/storage/StorageManager.java index 78c378dd4ce..4067eb8fd58 100644 --- a/src/main/java/seedu/address/storage/StorageManager.java +++ b/src/main/java/housekeeping/hub/storage/StorageManager.java @@ -1,15 +1,15 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import java.io.IOException; import java.nio.file.Path; import java.util.Optional; import java.util.logging.Logger; -import seedu.address.commons.core.LogsCenter; -import seedu.address.commons.exceptions.DataLoadingException; -import seedu.address.model.ReadOnlyAddressBook; -import seedu.address.model.ReadOnlyUserPrefs; -import seedu.address.model.UserPrefs; +import housekeeping.hub.commons.core.LogsCenter; +import housekeeping.hub.commons.exceptions.DataLoadingException; +import housekeeping.hub.model.ReadOnlyAddressBook; +import housekeeping.hub.model.ReadOnlyUserPrefs; +import housekeeping.hub.model.UserPrefs; /** * Manages storage of AddressBook data in local storage. diff --git a/src/main/java/seedu/address/storage/UserPrefsStorage.java b/src/main/java/housekeeping/hub/storage/UserPrefsStorage.java similarity index 67% rename from src/main/java/seedu/address/storage/UserPrefsStorage.java rename to src/main/java/housekeeping/hub/storage/UserPrefsStorage.java index e94ca422ea8..66d2442588e 100644 --- a/src/main/java/seedu/address/storage/UserPrefsStorage.java +++ b/src/main/java/housekeeping/hub/storage/UserPrefsStorage.java @@ -1,15 +1,15 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import java.io.IOException; import java.nio.file.Path; import java.util.Optional; -import seedu.address.commons.exceptions.DataLoadingException; -import seedu.address.model.ReadOnlyUserPrefs; -import seedu.address.model.UserPrefs; +import housekeeping.hub.commons.exceptions.DataLoadingException; +import housekeeping.hub.model.ReadOnlyUserPrefs; +import housekeeping.hub.model.UserPrefs; /** - * Represents a storage for {@link seedu.address.model.UserPrefs}. + * Represents a storage for {@link housekeeping.hub.model.UserPrefs}. */ public interface UserPrefsStorage { @@ -27,7 +27,7 @@ public interface UserPrefsStorage { Optional readUserPrefs() throws DataLoadingException; /** - * Saves the given {@link seedu.address.model.ReadOnlyUserPrefs} to the storage. + * Saves the given {@link housekeeping.hub.model.ReadOnlyUserPrefs} to the storage. * @param userPrefs cannot be null. * @throws IOException if there was any problem writing to the file. */ diff --git a/src/main/java/seedu/address/ui/ClientCard.java b/src/main/java/housekeeping/hub/ui/ClientCard.java similarity index 82% rename from src/main/java/seedu/address/ui/ClientCard.java rename to src/main/java/housekeeping/hub/ui/ClientCard.java index fa08438f82a..330dfe3cd1a 100644 --- a/src/main/java/seedu/address/ui/ClientCard.java +++ b/src/main/java/housekeeping/hub/ui/ClientCard.java @@ -1,9 +1,9 @@ -package seedu.address.ui; +package housekeeping.hub.ui; import javafx.fxml.FXML; import javafx.scene.control.Label; -import seedu.address.model.person.Client; -import seedu.address.model.person.HousekeepingDetails; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.HousekeepingDetails; public class ClientCard extends PersonCard { private static final String FXML = "ClientListCard.fxml"; diff --git a/src/main/java/seedu/address/ui/CommandBox.java b/src/main/java/housekeeping/hub/ui/CommandBox.java similarity index 89% rename from src/main/java/seedu/address/ui/CommandBox.java rename to src/main/java/housekeeping/hub/ui/CommandBox.java index 9e75478664b..2a20475da82 100644 --- a/src/main/java/seedu/address/ui/CommandBox.java +++ b/src/main/java/housekeeping/hub/ui/CommandBox.java @@ -1,12 +1,12 @@ -package seedu.address.ui; +package housekeeping.hub.ui; import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.scene.control.TextField; import javafx.scene.layout.Region; -import seedu.address.logic.commands.CommandResult; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.logic.parser.exceptions.ParseException; +import housekeeping.hub.logic.commands.CommandResult; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.logic.parser.exceptions.ParseException; /** * The UI component that is responsible for receiving user command inputs. @@ -77,7 +77,7 @@ public interface CommandExecutor { /** * Executes the command and returns the result. * - * @see seedu.address.logic.Logic#execute(String) + * @see housekeeping.hub.logic.Logic#execute(String) */ CommandResult execute(String commandText) throws CommandException, ParseException; } diff --git a/src/main/java/seedu/address/ui/HelpWindow.java b/src/main/java/housekeeping/hub/ui/HelpWindow.java similarity index 97% rename from src/main/java/seedu/address/ui/HelpWindow.java rename to src/main/java/housekeeping/hub/ui/HelpWindow.java index 6f16ab10c48..be30abf90d3 100644 --- a/src/main/java/seedu/address/ui/HelpWindow.java +++ b/src/main/java/housekeeping/hub/ui/HelpWindow.java @@ -1,4 +1,4 @@ -package seedu.address.ui; +package housekeeping.hub.ui; import java.util.logging.Logger; @@ -8,7 +8,7 @@ import javafx.scene.input.Clipboard; import javafx.scene.input.ClipboardContent; import javafx.stage.Stage; -import seedu.address.commons.core.LogsCenter; +import housekeeping.hub.commons.core.LogsCenter; /** * Controller for a help page diff --git a/src/main/java/seedu/address/ui/HousekeeperCard.java b/src/main/java/housekeeping/hub/ui/HousekeeperCard.java similarity index 76% rename from src/main/java/seedu/address/ui/HousekeeperCard.java rename to src/main/java/housekeeping/hub/ui/HousekeeperCard.java index 3c13783098e..30889372fbb 100644 --- a/src/main/java/seedu/address/ui/HousekeeperCard.java +++ b/src/main/java/housekeeping/hub/ui/HousekeeperCard.java @@ -1,6 +1,6 @@ -package seedu.address.ui; +package housekeeping.hub.ui; -import seedu.address.model.person.Housekeeper; +import housekeeping.hub.model.person.Housekeeper; public class HousekeeperCard extends PersonCard { private static final String FXML = "HousekeeperListCard.fxml"; diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/housekeeping/hub/ui/MainWindow.java similarity index 92% rename from src/main/java/seedu/address/ui/MainWindow.java rename to src/main/java/housekeeping/hub/ui/MainWindow.java index 9df3526a4a0..445e1cd6a0e 100644 --- a/src/main/java/seedu/address/ui/MainWindow.java +++ b/src/main/java/housekeeping/hub/ui/MainWindow.java @@ -1,4 +1,4 @@ -package seedu.address.ui; +package housekeeping.hub.ui; import java.util.logging.Logger; @@ -8,17 +8,16 @@ import javafx.scene.control.TextInputControl; import javafx.scene.input.KeyCombination; import javafx.scene.input.KeyEvent; -import javafx.scene.layout.HBox; import javafx.scene.layout.StackPane; import javafx.stage.Stage; -import seedu.address.commons.core.GuiSettings; -import seedu.address.commons.core.LogsCenter; -import seedu.address.logic.Logic; -import seedu.address.logic.commands.CommandResult; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.logic.parser.exceptions.ParseException; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; +import housekeeping.hub.commons.core.GuiSettings; +import housekeeping.hub.commons.core.LogsCenter; +import housekeeping.hub.logic.Logic; +import housekeeping.hub.logic.commands.CommandResult; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.logic.parser.exceptions.ParseException; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; /** * The Main Window. Provides the basic application layout containing @@ -186,7 +185,7 @@ public PersonListPanel getHousekeeperListPanel() { /** * Executes the command and returns the result. * - * @see seedu.address.logic.Logic#execute(String) + * @see housekeeping.hub.logic.Logic#execute(String) */ private CommandResult executeCommand(String commandText) throws CommandException, ParseException { try { diff --git a/src/main/java/seedu/address/ui/PersonCard.java b/src/main/java/housekeeping/hub/ui/PersonCard.java similarity index 93% rename from src/main/java/seedu/address/ui/PersonCard.java rename to src/main/java/housekeeping/hub/ui/PersonCard.java index 0a943501de4..8bb702767c5 100644 --- a/src/main/java/seedu/address/ui/PersonCard.java +++ b/src/main/java/housekeeping/hub/ui/PersonCard.java @@ -1,4 +1,4 @@ -package seedu.address.ui; +package housekeeping.hub.ui; import java.util.Comparator; @@ -7,8 +7,7 @@ import javafx.scene.layout.FlowPane; import javafx.scene.layout.HBox; import javafx.scene.layout.Region; -import seedu.address.model.person.HousekeepingDetails; -import seedu.address.model.person.Person; +import housekeeping.hub.model.person.Person; /** * An UI component that displays information of a {@code Person}. diff --git a/src/main/java/seedu/address/ui/PersonListPanel.java b/src/main/java/housekeeping/hub/ui/PersonListPanel.java similarity index 87% rename from src/main/java/seedu/address/ui/PersonListPanel.java rename to src/main/java/housekeeping/hub/ui/PersonListPanel.java index e1fc90f5768..39705bd713c 100644 --- a/src/main/java/seedu/address/ui/PersonListPanel.java +++ b/src/main/java/housekeeping/hub/ui/PersonListPanel.java @@ -1,4 +1,4 @@ -package seedu.address.ui; +package housekeeping.hub.ui; import java.util.logging.Logger; @@ -7,10 +7,10 @@ import javafx.scene.control.ListCell; import javafx.scene.control.ListView; import javafx.scene.layout.Region; -import seedu.address.commons.core.LogsCenter; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; +import housekeeping.hub.commons.core.LogsCenter; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.Person; /** * Panel containing the list of persons. diff --git a/src/main/java/seedu/address/ui/ResultDisplay.java b/src/main/java/housekeeping/hub/ui/ResultDisplay.java similarity index 95% rename from src/main/java/seedu/address/ui/ResultDisplay.java rename to src/main/java/housekeeping/hub/ui/ResultDisplay.java index 7d98e84eedf..702518716c8 100644 --- a/src/main/java/seedu/address/ui/ResultDisplay.java +++ b/src/main/java/housekeeping/hub/ui/ResultDisplay.java @@ -1,4 +1,4 @@ -package seedu.address.ui; +package housekeeping.hub.ui; import static java.util.Objects.requireNonNull; diff --git a/src/main/java/seedu/address/ui/StatusBarFooter.java b/src/main/java/housekeeping/hub/ui/StatusBarFooter.java similarity index 95% rename from src/main/java/seedu/address/ui/StatusBarFooter.java rename to src/main/java/housekeeping/hub/ui/StatusBarFooter.java index b577f829423..334bca4c338 100644 --- a/src/main/java/seedu/address/ui/StatusBarFooter.java +++ b/src/main/java/housekeeping/hub/ui/StatusBarFooter.java @@ -1,4 +1,4 @@ -package seedu.address.ui; +package housekeeping.hub.ui; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/src/main/java/seedu/address/ui/Ui.java b/src/main/java/housekeeping/hub/ui/Ui.java similarity index 84% rename from src/main/java/seedu/address/ui/Ui.java rename to src/main/java/housekeeping/hub/ui/Ui.java index 17aa0b494fe..eb45cada45d 100644 --- a/src/main/java/seedu/address/ui/Ui.java +++ b/src/main/java/housekeeping/hub/ui/Ui.java @@ -1,4 +1,4 @@ -package seedu.address.ui; +package housekeeping.hub.ui; import javafx.stage.Stage; diff --git a/src/main/java/seedu/address/ui/UiManager.java b/src/main/java/housekeeping/hub/ui/UiManager.java similarity index 93% rename from src/main/java/seedu/address/ui/UiManager.java rename to src/main/java/housekeeping/hub/ui/UiManager.java index 939951361b7..95eb18be9c2 100644 --- a/src/main/java/seedu/address/ui/UiManager.java +++ b/src/main/java/housekeeping/hub/ui/UiManager.java @@ -1,4 +1,4 @@ -package seedu.address.ui; +package housekeeping.hub.ui; import java.util.logging.Logger; @@ -7,10 +7,10 @@ import javafx.scene.control.Alert.AlertType; import javafx.scene.image.Image; import javafx.stage.Stage; -import seedu.address.MainApp; -import seedu.address.commons.core.LogsCenter; -import seedu.address.commons.util.StringUtil; -import seedu.address.logic.Logic; +import housekeeping.hub.MainApp; +import housekeeping.hub.commons.core.LogsCenter; +import housekeeping.hub.commons.util.StringUtil; +import housekeeping.hub.logic.Logic; /** * The manager of the UI component. diff --git a/src/main/java/seedu/address/ui/UiPart.java b/src/main/java/housekeeping/hub/ui/UiPart.java similarity index 97% rename from src/main/java/seedu/address/ui/UiPart.java rename to src/main/java/housekeeping/hub/ui/UiPart.java index fc820e01a9c..57ba78c72c4 100644 --- a/src/main/java/seedu/address/ui/UiPart.java +++ b/src/main/java/housekeeping/hub/ui/UiPart.java @@ -1,4 +1,4 @@ -package seedu.address.ui; +package housekeeping.hub.ui; import static java.util.Objects.requireNonNull; @@ -6,7 +6,7 @@ import java.net.URL; import javafx.fxml.FXMLLoader; -import seedu.address.MainApp; +import housekeeping.hub.MainApp; /** * Represents a distinct part of the UI. e.g. Windows, dialogs, panels, status bars, etc. diff --git a/src/test/java/seedu/address/AppParametersTest.java b/src/test/java/housekeeping/hub/AppParametersTest.java similarity index 99% rename from src/test/java/seedu/address/AppParametersTest.java rename to src/test/java/housekeeping/hub/AppParametersTest.java index 133cc008bce..61f458f4cd8 100644 --- a/src/test/java/seedu/address/AppParametersTest.java +++ b/src/test/java/housekeeping/hub/AppParametersTest.java @@ -1,4 +1,4 @@ -package seedu.address; +package housekeeping.hub; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/seedu/address/commons/core/ConfigTest.java b/src/test/java/housekeeping/hub/commons/core/ConfigTest.java similarity index 95% rename from src/test/java/seedu/address/commons/core/ConfigTest.java rename to src/test/java/housekeeping/hub/commons/core/ConfigTest.java index d3ba2a52a89..913518681f1 100644 --- a/src/test/java/seedu/address/commons/core/ConfigTest.java +++ b/src/test/java/housekeeping/hub/commons/core/ConfigTest.java @@ -1,4 +1,4 @@ -package seedu.address.commons.core; +package housekeeping.hub.commons.core; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/seedu/address/commons/core/GuiSettingsTest.java b/src/test/java/housekeeping/hub/commons/core/GuiSettingsTest.java similarity index 93% rename from src/test/java/seedu/address/commons/core/GuiSettingsTest.java rename to src/test/java/housekeeping/hub/commons/core/GuiSettingsTest.java index b7876c4349d..80543b5febc 100644 --- a/src/test/java/seedu/address/commons/core/GuiSettingsTest.java +++ b/src/test/java/housekeeping/hub/commons/core/GuiSettingsTest.java @@ -1,4 +1,4 @@ -package seedu.address.commons.core; +package housekeeping.hub.commons.core; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/seedu/address/commons/core/VersionTest.java b/src/test/java/housekeeping/hub/commons/core/VersionTest.java similarity index 97% rename from src/test/java/seedu/address/commons/core/VersionTest.java rename to src/test/java/housekeeping/hub/commons/core/VersionTest.java index 495cd231554..6778c387375 100644 --- a/src/test/java/seedu/address/commons/core/VersionTest.java +++ b/src/test/java/housekeeping/hub/commons/core/VersionTest.java @@ -1,8 +1,8 @@ -package seedu.address.commons.core; +package housekeeping.hub.commons.core; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import org.junit.jupiter.api.Test; diff --git a/src/test/java/seedu/address/commons/core/index/IndexTest.java b/src/test/java/housekeeping/hub/commons/core/index/IndexTest.java similarity index 95% rename from src/test/java/seedu/address/commons/core/index/IndexTest.java rename to src/test/java/housekeeping/hub/commons/core/index/IndexTest.java index fc395ab964b..6aba78e8645 100644 --- a/src/test/java/seedu/address/commons/core/index/IndexTest.java +++ b/src/test/java/housekeeping/hub/commons/core/index/IndexTest.java @@ -1,9 +1,9 @@ -package seedu.address.commons.core.index; +package housekeeping.hub.commons.core.index; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import org.junit.jupiter.api.Test; diff --git a/src/test/java/seedu/address/commons/util/AppUtilTest.java b/src/test/java/housekeeping/hub/commons/util/AppUtilTest.java similarity index 91% rename from src/test/java/seedu/address/commons/util/AppUtilTest.java rename to src/test/java/housekeeping/hub/commons/util/AppUtilTest.java index 594de1e6365..d47e135ec78 100644 --- a/src/test/java/seedu/address/commons/util/AppUtilTest.java +++ b/src/test/java/housekeeping/hub/commons/util/AppUtilTest.java @@ -1,7 +1,7 @@ -package seedu.address.commons.util; +package housekeeping.hub.commons.util; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import org.junit.jupiter.api.Test; diff --git a/src/test/java/seedu/address/commons/util/CollectionUtilTest.java b/src/test/java/housekeeping/hub/commons/util/CollectionUtilTest.java similarity index 96% rename from src/test/java/seedu/address/commons/util/CollectionUtilTest.java rename to src/test/java/housekeeping/hub/commons/util/CollectionUtilTest.java index b467a3dc025..75a2f3c16e8 100644 --- a/src/test/java/seedu/address/commons/util/CollectionUtilTest.java +++ b/src/test/java/housekeeping/hub/commons/util/CollectionUtilTest.java @@ -1,9 +1,9 @@ -package seedu.address.commons.util; +package housekeeping.hub.commons.util; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.commons.util.CollectionUtil.requireAllNonNull; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.commons.util.CollectionUtil.requireAllNonNull; +import static housekeeping.hub.testutil.Assert.assertThrows; import java.util.Arrays; import java.util.Collection; diff --git a/src/test/java/seedu/address/commons/util/ConfigUtilTest.java b/src/test/java/housekeeping/hub/commons/util/ConfigUtilTest.java similarity index 94% rename from src/test/java/seedu/address/commons/util/ConfigUtilTest.java rename to src/test/java/housekeeping/hub/commons/util/ConfigUtilTest.java index 69d7b89cfd8..8f7e8134650 100644 --- a/src/test/java/seedu/address/commons/util/ConfigUtilTest.java +++ b/src/test/java/housekeeping/hub/commons/util/ConfigUtilTest.java @@ -1,8 +1,8 @@ -package seedu.address.commons.util; +package housekeeping.hub.commons.util; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import java.io.IOException; import java.nio.file.Path; @@ -13,8 +13,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import seedu.address.commons.core.Config; -import seedu.address.commons.exceptions.DataLoadingException; +import housekeeping.hub.commons.core.Config; +import housekeeping.hub.commons.exceptions.DataLoadingException; public class ConfigUtilTest { diff --git a/src/test/java/seedu/address/commons/util/FileUtilTest.java b/src/test/java/housekeeping/hub/commons/util/FileUtilTest.java similarity index 84% rename from src/test/java/seedu/address/commons/util/FileUtilTest.java rename to src/test/java/housekeeping/hub/commons/util/FileUtilTest.java index 1fe5478c756..a54a0233478 100644 --- a/src/test/java/seedu/address/commons/util/FileUtilTest.java +++ b/src/test/java/housekeeping/hub/commons/util/FileUtilTest.java @@ -1,8 +1,8 @@ -package seedu.address.commons.util; +package housekeeping.hub.commons.util; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import org.junit.jupiter.api.Test; diff --git a/src/test/java/seedu/address/commons/util/JsonUtilTest.java b/src/test/java/housekeeping/hub/commons/util/JsonUtilTest.java similarity index 92% rename from src/test/java/seedu/address/commons/util/JsonUtilTest.java rename to src/test/java/housekeeping/hub/commons/util/JsonUtilTest.java index d4907539dee..68417c2c9f1 100644 --- a/src/test/java/seedu/address/commons/util/JsonUtilTest.java +++ b/src/test/java/housekeeping/hub/commons/util/JsonUtilTest.java @@ -1,4 +1,4 @@ -package seedu.address.commons.util; +package housekeeping.hub.commons.util; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -7,8 +7,8 @@ import org.junit.jupiter.api.Test; -import seedu.address.testutil.SerializableTestClass; -import seedu.address.testutil.TestUtil; +import housekeeping.hub.testutil.SerializableTestClass; +import housekeeping.hub.testutil.TestUtil; /** * Tests JSON Read and Write diff --git a/src/test/java/seedu/address/commons/util/StringUtilTest.java b/src/test/java/housekeeping/hub/commons/util/StringUtilTest.java similarity index 98% rename from src/test/java/seedu/address/commons/util/StringUtilTest.java rename to src/test/java/housekeeping/hub/commons/util/StringUtilTest.java index c56d407bf3f..552b5412bcb 100644 --- a/src/test/java/seedu/address/commons/util/StringUtilTest.java +++ b/src/test/java/housekeeping/hub/commons/util/StringUtilTest.java @@ -1,8 +1,8 @@ -package seedu.address.commons.util; +package housekeeping.hub.commons.util; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import java.io.FileNotFoundException; diff --git a/src/test/java/seedu/address/logic/LogicManagerTest.java b/src/test/java/housekeeping/hub/logic/LogicManagerTest.java similarity index 83% rename from src/test/java/seedu/address/logic/LogicManagerTest.java rename to src/test/java/housekeeping/hub/logic/LogicManagerTest.java index a8c27ef8a59..6fc5081027c 100644 --- a/src/test/java/seedu/address/logic/LogicManagerTest.java +++ b/src/test/java/housekeeping/hub/logic/LogicManagerTest.java @@ -1,14 +1,14 @@ -package seedu.address.logic; +package housekeeping.hub.logic; import static org.junit.jupiter.api.Assertions.assertEquals; -import static seedu.address.logic.Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX; -import static seedu.address.logic.Messages.MESSAGE_UNKNOWN_COMMAND; -import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY; -import static seedu.address.testutil.Assert.assertThrows; -import static seedu.address.testutil.TypicalPersons.AMY; +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX; +import static housekeeping.hub.logic.Messages.MESSAGE_UNKNOWN_COMMAND; +import static housekeeping.hub.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.EMAIL_DESC_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.NAME_DESC_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.PHONE_DESC_AMY; +import static housekeeping.hub.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.TypicalPersons.AMY; import java.io.IOException; import java.nio.file.AccessDeniedException; @@ -18,20 +18,20 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import seedu.address.logic.commands.AddCommand; -import seedu.address.logic.commands.CommandResult; -import seedu.address.logic.commands.ListCommand; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.logic.parser.exceptions.ParseException; -import seedu.address.model.Model; -import seedu.address.model.ModelManager; -import seedu.address.model.ReadOnlyAddressBook; -import seedu.address.model.UserPrefs; -import seedu.address.model.person.Client; -import seedu.address.storage.JsonAddressBookStorage; -import seedu.address.storage.JsonUserPrefsStorage; -import seedu.address.storage.StorageManager; -import seedu.address.testutil.ClientBuilder; +import housekeeping.hub.logic.commands.AddCommand; +import housekeeping.hub.logic.commands.CommandResult; +import housekeeping.hub.logic.commands.ListCommand; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.logic.parser.exceptions.ParseException; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.ModelManager; +import housekeeping.hub.model.ReadOnlyAddressBook; +import housekeeping.hub.model.UserPrefs; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.storage.JsonAddressBookStorage; +import housekeeping.hub.storage.JsonUserPrefsStorage; +import housekeeping.hub.storage.StorageManager; +import housekeeping.hub.testutil.ClientBuilder; public class LogicManagerTest { private static final IOException DUMMY_IO_EXCEPTION = new IOException("dummy IO exception"); diff --git a/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java b/src/test/java/housekeeping/hub/logic/commands/AddCommandIntegrationTest.java similarity index 75% rename from src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java rename to src/test/java/housekeeping/hub/logic/commands/AddCommandIntegrationTest.java index e465484c887..070c1aa5539 100644 --- a/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java +++ b/src/test/java/housekeeping/hub/logic/commands/AddCommandIntegrationTest.java @@ -1,20 +1,20 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; -import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook; +import static housekeeping.hub.logic.commands.CommandTestUtil.assertCommandFailure; +import static housekeeping.hub.logic.commands.CommandTestUtil.assertCommandSuccess; +import static housekeeping.hub.testutil.TypicalPersons.getTypicalAddressBook; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import seedu.address.logic.Messages; -import seedu.address.model.Model; -import seedu.address.model.ModelManager; -import seedu.address.model.UserPrefs; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.testutil.ClientBuilder; -import seedu.address.testutil.HousekeeperBuilder; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.ModelManager; +import housekeeping.hub.model.UserPrefs; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.testutil.ClientBuilder; +import housekeeping.hub.testutil.HousekeeperBuilder; /** * Contains integration tests (interaction with the Model) for {@code AddCommand}. diff --git a/src/test/java/seedu/address/logic/commands/AddCommandTest.java b/src/test/java/housekeeping/hub/logic/commands/AddCommandTest.java similarity index 93% rename from src/test/java/seedu/address/logic/commands/AddCommandTest.java rename to src/test/java/housekeeping/hub/logic/commands/AddCommandTest.java index 06c2643f232..9618972e9df 100644 --- a/src/test/java/seedu/address/logic/commands/AddCommandTest.java +++ b/src/test/java/housekeeping/hub/logic/commands/AddCommandTest.java @@ -1,12 +1,12 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static java.util.Objects.requireNonNull; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.testutil.Assert.assertThrows; -import static seedu.address.testutil.TypicalPersons.ALICE; -import static seedu.address.testutil.TypicalPersons.BOB; +import static housekeeping.hub.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.TypicalPersons.ALICE; +import static housekeeping.hub.testutil.TypicalPersons.BOB; import java.nio.file.Path; import java.util.ArrayList; @@ -17,18 +17,18 @@ import org.junit.jupiter.api.Test; import javafx.collections.ObservableList; -import seedu.address.commons.core.GuiSettings; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.AddressBook; -import seedu.address.model.Model; -import seedu.address.model.ReadOnlyAddressBook; -import seedu.address.model.ReadOnlyUserPrefs; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; -import seedu.address.testutil.ClientBuilder; -import seedu.address.testutil.HousekeeperBuilder; +import housekeeping.hub.commons.core.GuiSettings; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.model.AddressBook; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.ReadOnlyAddressBook; +import housekeeping.hub.model.ReadOnlyUserPrefs; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.Person; +import housekeeping.hub.testutil.ClientBuilder; +import housekeeping.hub.testutil.HousekeeperBuilder; public class AddCommandTest { diff --git a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java b/src/test/java/housekeeping/hub/logic/commands/ClearCommandTest.java similarity index 66% rename from src/test/java/seedu/address/logic/commands/ClearCommandTest.java rename to src/test/java/housekeeping/hub/logic/commands/ClearCommandTest.java index 80d9110c03a..7918946df85 100644 --- a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java +++ b/src/test/java/housekeeping/hub/logic/commands/ClearCommandTest.java @@ -1,14 +1,14 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; -import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook; +import static housekeeping.hub.logic.commands.CommandTestUtil.assertCommandSuccess; +import static housekeeping.hub.testutil.TypicalPersons.getTypicalAddressBook; import org.junit.jupiter.api.Test; -import seedu.address.model.AddressBook; -import seedu.address.model.Model; -import seedu.address.model.ModelManager; -import seedu.address.model.UserPrefs; +import housekeeping.hub.model.AddressBook; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.ModelManager; +import housekeeping.hub.model.UserPrefs; public class ClearCommandTest { diff --git a/src/test/java/seedu/address/logic/commands/CommandResultTest.java b/src/test/java/housekeeping/hub/logic/commands/CommandResultTest.java similarity index 98% rename from src/test/java/seedu/address/logic/commands/CommandResultTest.java rename to src/test/java/housekeeping/hub/logic/commands/CommandResultTest.java index 7b8c7cd4546..0c3e3e28204 100644 --- a/src/test/java/seedu/address/logic/commands/CommandResultTest.java +++ b/src/test/java/housekeeping/hub/logic/commands/CommandResultTest.java @@ -1,4 +1,4 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/housekeeping/hub/logic/commands/CommandTestUtil.java similarity index 86% rename from src/test/java/seedu/address/logic/commands/CommandTestUtil.java rename to src/test/java/housekeeping/hub/logic/commands/CommandTestUtil.java index 07a89d8474f..4923aca6068 100644 --- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java +++ b/src/test/java/housekeeping/hub/logic/commands/CommandTestUtil.java @@ -1,29 +1,28 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS; -import static seedu.address.logic.parser.CliSyntax.PREFIX_AREA; -import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL; -import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME; -import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE; -import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_ADDRESS; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_AREA; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_EMAIL; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_NAME; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_PHONE; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_TAG; +import static housekeeping.hub.testutil.Assert.assertThrows; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import seedu.address.commons.core.index.Index; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.AddressBook; -import seedu.address.model.Model; -import seedu.address.model.person.BookingList; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.NameContainsKeywordsPredicate; -import seedu.address.model.person.Person; -import seedu.address.testutil.EditPersonDescriptorBuilder; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.logic.commands.exceptions.CommandException; +import housekeeping.hub.model.AddressBook; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.BookingList; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.NameContainsKeywordsPredicate; +import housekeeping.hub.testutil.EditPersonDescriptorBuilder; /** * Contains helper methods for testing commands. @@ -110,7 +109,7 @@ public static void assertCommandSuccess(Command command, Model actualModel, Stri * Executes the given {@code command}, confirms that
* - a {@code CommandException} is thrown
* - the CommandException message matches {@code expectedMessage}
- * - the address book, filtered person list and selected person in {@code actualModel} remain unchanged + * - the hub book, filtered person list and selected person in {@code actualModel} remain unchanged */ public static void assertCommandFailure(Command command, Model actualModel, String expectedMessage) { // we are unable to defensively copy the model for comparison later, so we can @@ -127,7 +126,7 @@ public static void assertCommandFailure(Command command, Model actualModel, Stri /** * Updates {@code model}'s filtered client list to show only the client at the given {@code targetIndex} in the - * {@code model}'s address book. + * {@code model}'s hub book. */ public static void showClientAtIndex(Model model, Index targetIndex) { assertTrue(targetIndex.getZeroBased() < model.getFilteredClientList().size()); @@ -141,7 +140,7 @@ public static void showClientAtIndex(Model model, Index targetIndex) { /** * Updates {@code model}'s filtered housekeeper list to show only the housekeeper at the given {@code targetIndex} - * in the {@code model}'s address book. + * in the {@code model}'s hub book. */ public static void showHousekeeperAtIndex(Model model, Index targetIndex) { assertTrue(targetIndex.getZeroBased() < model.getFilteredHousekeeperList().size()); diff --git a/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java b/src/test/java/housekeeping/hub/logic/commands/DeleteCommandTest.java similarity index 90% rename from src/test/java/seedu/address/logic/commands/DeleteCommandTest.java rename to src/test/java/housekeeping/hub/logic/commands/DeleteCommandTest.java index 0f0d7677727..0942eb86f0b 100644 --- a/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java +++ b/src/test/java/housekeeping/hub/logic/commands/DeleteCommandTest.java @@ -1,26 +1,25 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; -import static seedu.address.logic.commands.CommandTestUtil.showClientAtIndex; -import static seedu.address.logic.commands.CommandTestUtil.showHousekeeperAtIndex; -import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; -import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON; -import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook; +import static housekeeping.hub.logic.commands.CommandTestUtil.assertCommandFailure; +import static housekeeping.hub.logic.commands.CommandTestUtil.assertCommandSuccess; +import static housekeeping.hub.logic.commands.CommandTestUtil.showClientAtIndex; +import static housekeeping.hub.logic.commands.CommandTestUtil.showHousekeeperAtIndex; +import static housekeeping.hub.testutil.TypicalIndexes.INDEX_FIRST_PERSON; +import static housekeeping.hub.testutil.TypicalIndexes.INDEX_SECOND_PERSON; +import static housekeeping.hub.testutil.TypicalPersons.getTypicalAddressBook; import org.junit.jupiter.api.Test; -import seedu.address.commons.core.index.Index; -import seedu.address.logic.Messages; -import seedu.address.model.Model; -import seedu.address.model.ModelManager; -import seedu.address.model.UserPrefs; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.ModelManager; +import housekeeping.hub.model.UserPrefs; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; /** * Contains integration tests (interaction with the Model) and unit tests for diff --git a/src/test/java/seedu/address/logic/commands/EditCommandTest.java b/src/test/java/housekeeping/hub/logic/commands/EditCommandTest.java similarity index 84% rename from src/test/java/seedu/address/logic/commands/EditCommandTest.java rename to src/test/java/housekeeping/hub/logic/commands/EditCommandTest.java index cbb63992622..61e5ddbb3b1 100644 --- a/src/test/java/seedu/address/logic/commands/EditCommandTest.java +++ b/src/test/java/housekeeping/hub/logic/commands/EditCommandTest.java @@ -1,35 +1,35 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.logic.commands.CommandTestUtil.DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; -import static seedu.address.logic.commands.CommandTestUtil.showClientAtIndex; -import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; -import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON; -import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook; +import static housekeeping.hub.logic.commands.CommandTestUtil.DESC_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.DESC_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_NAME_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_PHONE_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; +import static housekeeping.hub.logic.commands.CommandTestUtil.assertCommandFailure; +import static housekeeping.hub.logic.commands.CommandTestUtil.assertCommandSuccess; +import static housekeeping.hub.logic.commands.CommandTestUtil.showClientAtIndex; +import static housekeeping.hub.testutil.TypicalIndexes.INDEX_FIRST_PERSON; +import static housekeeping.hub.testutil.TypicalIndexes.INDEX_SECOND_PERSON; +import static housekeeping.hub.testutil.TypicalPersons.getTypicalAddressBook; import org.junit.jupiter.api.Test; -import seedu.address.commons.core.index.Index; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.EditCommand.EditPersonDescriptor; -import seedu.address.model.AddressBook; -import seedu.address.model.Model; -import seedu.address.model.ModelManager; -import seedu.address.model.UserPrefs; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; -import seedu.address.testutil.ClientBuilder; -import seedu.address.testutil.EditPersonDescriptorBuilder; -import seedu.address.testutil.HousekeeperBuilder; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.commands.EditCommand.EditPersonDescriptor; +import housekeeping.hub.model.AddressBook; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.ModelManager; +import housekeeping.hub.model.UserPrefs; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.Person; +import housekeeping.hub.testutil.ClientBuilder; +import housekeeping.hub.testutil.EditPersonDescriptorBuilder; +import housekeeping.hub.testutil.HousekeeperBuilder; /** * Contains integration tests (interaction with the Model) and unit tests for EditCommand. @@ -142,7 +142,7 @@ public void execute_duplicatePersonUnfilteredList_failure() { public void execute_duplicatePersonFilteredList_failure() { showClientAtIndex(model, INDEX_FIRST_PERSON); - // edit person in filtered list into a duplicate in address book + // edit person in filtered list into a duplicate in hub book Person personInList = model.getAddressBook().getClientList().get(INDEX_SECOND_PERSON.getZeroBased()); EditCommand editCommand = new EditClientCommand(INDEX_FIRST_PERSON, new EditPersonDescriptorBuilder(personInList).build()); @@ -161,13 +161,13 @@ public void execute_invalidPersonIndexUnfilteredList_failure() { /** * Edit filtered list where index is larger than size of filtered list, - * but smaller than size of address book + * but smaller than size of hub book */ @Test public void execute_invalidPersonIndexFilteredList_failure() { showClientAtIndex(model, INDEX_FIRST_PERSON); Index outOfBoundIndex = INDEX_SECOND_PERSON; - // ensures that outOfBoundIndex is still in bounds of address book list + // ensures that outOfBoundIndex is still in bounds of hub book list assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getClientList().size()); EditCommand editCommand = new EditClientCommand(outOfBoundIndex, diff --git a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java b/src/test/java/housekeeping/hub/logic/commands/EditPersonDescriptorTest.java similarity index 77% rename from src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java rename to src/test/java/housekeeping/hub/logic/commands/EditPersonDescriptorTest.java index 12fd6af89d9..2a8e0f1d4a7 100644 --- a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java +++ b/src/test/java/housekeeping/hub/logic/commands/EditPersonDescriptorTest.java @@ -1,20 +1,20 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.logic.commands.CommandTestUtil.DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; +import static housekeeping.hub.logic.commands.CommandTestUtil.DESC_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.DESC_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_EMAIL_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_NAME_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_PHONE_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; import org.junit.jupiter.api.Test; -import seedu.address.logic.commands.EditCommand.EditPersonDescriptor; -import seedu.address.testutil.EditPersonDescriptorBuilder; +import housekeeping.hub.logic.commands.EditCommand.EditPersonDescriptor; +import housekeeping.hub.testutil.EditPersonDescriptorBuilder; public class EditPersonDescriptorTest { @@ -48,7 +48,7 @@ public void equals() { editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withEmail(VALID_EMAIL_BOB).build(); assertFalse(DESC_AMY.equals(editedAmy)); - // different address -> returns false + // different hub -> returns false editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withAddress(VALID_ADDRESS_BOB).build(); assertFalse(DESC_AMY.equals(editedAmy)); @@ -63,7 +63,7 @@ public void toStringMethod() { String expected = EditPersonDescriptor.class.getCanonicalName() + "{name=" + editPersonDescriptor.getName().orElse(null) + ", phone=" + editPersonDescriptor.getPhone().orElse(null) + ", email=" - + editPersonDescriptor.getEmail().orElse(null) + ", address=" + + editPersonDescriptor.getEmail().orElse(null) + ", hub=" + editPersonDescriptor.getAddress().orElse(null) + ", tags=" + editPersonDescriptor.getTags().orElse(null) + ", area=" + editPersonDescriptor.getArea().orElse(null) + ", booking list=" diff --git a/src/test/java/seedu/address/logic/commands/ExitCommandTest.java b/src/test/java/housekeeping/hub/logic/commands/ExitCommandTest.java similarity index 59% rename from src/test/java/seedu/address/logic/commands/ExitCommandTest.java rename to src/test/java/housekeeping/hub/logic/commands/ExitCommandTest.java index 9533c473875..f7efdb4175b 100644 --- a/src/test/java/seedu/address/logic/commands/ExitCommandTest.java +++ b/src/test/java/housekeeping/hub/logic/commands/ExitCommandTest.java @@ -1,12 +1,12 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; -import static seedu.address.logic.commands.ExitCommand.MESSAGE_EXIT_ACKNOWLEDGEMENT; +import static housekeeping.hub.logic.commands.CommandTestUtil.assertCommandSuccess; +import static housekeeping.hub.logic.commands.ExitCommand.MESSAGE_EXIT_ACKNOWLEDGEMENT; import org.junit.jupiter.api.Test; -import seedu.address.model.Model; -import seedu.address.model.ModelManager; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.ModelManager; public class ExitCommandTest { private Model model = new ModelManager(); diff --git a/src/test/java/seedu/address/logic/commands/FindCommandTest.java b/src/test/java/housekeeping/hub/logic/commands/FindCommandTest.java similarity index 86% rename from src/test/java/seedu/address/logic/commands/FindCommandTest.java rename to src/test/java/housekeeping/hub/logic/commands/FindCommandTest.java index 5d982f4f70b..1a46d1b2b8e 100644 --- a/src/test/java/seedu/address/logic/commands/FindCommandTest.java +++ b/src/test/java/housekeeping/hub/logic/commands/FindCommandTest.java @@ -1,25 +1,23 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.logic.Messages.*; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; -import static seedu.address.testutil.TypicalPersons.CARL; -import static seedu.address.testutil.TypicalPersons.ELLE; -import static seedu.address.testutil.TypicalPersons.FIONA; -import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook; +import static housekeeping.hub.logic.Messages.*; +import static housekeeping.hub.logic.commands.CommandTestUtil.assertCommandSuccess; +import static housekeeping.hub.testutil.TypicalPersons.ELLE; +import static housekeeping.hub.testutil.TypicalPersons.FIONA; +import static housekeeping.hub.testutil.TypicalPersons.getTypicalAddressBook; import java.util.Arrays; import java.util.Collections; import org.junit.jupiter.api.Test; -import seedu.address.model.Model; -import seedu.address.model.ModelManager; -import seedu.address.model.UserPrefs; -import seedu.address.model.person.ContainsKeywordsPredicate; -import seedu.address.model.person.NameContainsKeywordsPredicate; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.ModelManager; +import housekeeping.hub.model.UserPrefs; +import housekeeping.hub.model.person.ContainsKeywordsPredicate; /** * Contains integration tests (interaction with the Model) for {@code FindCommand}. @@ -118,7 +116,7 @@ public void toStringMethod() { }*/ /** - * Parses {@code name}, {@code address} and {@code area} into a {@code ContainsKeywordsPredicate}. + * Parses {@code name}, {@code hub} and {@code area} into a {@code ContainsKeywordsPredicate}. */ private ContainsKeywordsPredicate preparePredicate(String name, String address, String area) { return new ContainsKeywordsPredicate(Arrays.asList(name.split("\\s+")), Arrays.asList(address.split("\\s+")), diff --git a/src/test/java/seedu/address/logic/commands/HelpCommandTest.java b/src/test/java/housekeeping/hub/logic/commands/HelpCommandTest.java similarity index 59% rename from src/test/java/seedu/address/logic/commands/HelpCommandTest.java rename to src/test/java/housekeeping/hub/logic/commands/HelpCommandTest.java index 4904fc4352e..be8409f0073 100644 --- a/src/test/java/seedu/address/logic/commands/HelpCommandTest.java +++ b/src/test/java/housekeeping/hub/logic/commands/HelpCommandTest.java @@ -1,12 +1,12 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; -import static seedu.address.logic.commands.HelpCommand.SHOWING_HELP_MESSAGE; +import static housekeeping.hub.logic.commands.CommandTestUtil.assertCommandSuccess; +import static housekeeping.hub.logic.commands.HelpCommand.SHOWING_HELP_MESSAGE; import org.junit.jupiter.api.Test; -import seedu.address.model.Model; -import seedu.address.model.ModelManager; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.ModelManager; public class HelpCommandTest { private Model model = new ModelManager(); diff --git a/src/test/java/seedu/address/logic/commands/ListCommandTest.java b/src/test/java/housekeeping/hub/logic/commands/ListCommandTest.java similarity index 72% rename from src/test/java/seedu/address/logic/commands/ListCommandTest.java rename to src/test/java/housekeeping/hub/logic/commands/ListCommandTest.java index 87dabe77ec4..e2de10afa70 100644 --- a/src/test/java/seedu/address/logic/commands/ListCommandTest.java +++ b/src/test/java/housekeeping/hub/logic/commands/ListCommandTest.java @@ -1,15 +1,14 @@ -package seedu.address.logic.commands; +package housekeeping.hub.logic.commands; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; -import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook; +import static housekeeping.hub.logic.commands.CommandTestUtil.assertCommandSuccess; +import static housekeeping.hub.testutil.TypicalPersons.getTypicalAddressBook; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import seedu.address.model.Model; -import seedu.address.model.ModelManager; -import seedu.address.model.UserPrefs; -import seedu.address.model.person.TypePredicate; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.ModelManager; +import housekeeping.hub.model.UserPrefs; /** * Contains integration tests (interaction with the Model) and unit tests for ListCommand. diff --git a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java b/src/test/java/housekeeping/hub/logic/parser/AddCommandParserTest.java similarity index 69% rename from src/test/java/seedu/address/logic/parser/AddCommandParserTest.java rename to src/test/java/housekeeping/hub/logic/parser/AddCommandParserTest.java index 1b946a6adbc..8e92cf2c676 100644 --- a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java +++ b/src/test/java/housekeeping/hub/logic/parser/AddCommandParserTest.java @@ -1,49 +1,49 @@ -package seedu.address.logic.parser; - -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB; -import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB; -import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC; -import static seedu.address.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC; -import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC; -import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC; -import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC; -import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_BOB; -import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB; -import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY; -import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE; -import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND; -import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND; -import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; -import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS; -import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL; -import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME; -import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE; -import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure; -import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess; -import static seedu.address.testutil.TypicalPersons.AMY; +package housekeeping.hub.logic.parser; + +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static housekeeping.hub.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.EMAIL_DESC_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.EMAIL_DESC_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC; +import static housekeeping.hub.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC; +import static housekeeping.hub.logic.commands.CommandTestUtil.INVALID_NAME_DESC; +import static housekeeping.hub.logic.commands.CommandTestUtil.INVALID_PHONE_DESC; +import static housekeeping.hub.logic.commands.CommandTestUtil.INVALID_TAG_DESC; +import static housekeeping.hub.logic.commands.CommandTestUtil.NAME_DESC_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.NAME_DESC_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.PHONE_DESC_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.PHONE_DESC_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY; +import static housekeeping.hub.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE; +import static housekeeping.hub.logic.commands.CommandTestUtil.TAG_DESC_FRIEND; +import static housekeeping.hub.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_EMAIL_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_NAME_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_PHONE_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_TAG_FRIEND; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_ADDRESS; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_EMAIL; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_NAME; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_PHONE; +import static housekeeping.hub.logic.parser.CommandParserTestUtil.assertParseFailure; +import static housekeeping.hub.logic.parser.CommandParserTestUtil.assertParseSuccess; +import static housekeeping.hub.testutil.TypicalPersons.AMY; import org.junit.jupiter.api.Test; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.AddClientCommand; -import seedu.address.logic.commands.AddCommand; -import seedu.address.model.person.Address; -import seedu.address.model.person.Client; -import seedu.address.model.person.Email; -import seedu.address.model.person.Name; -import seedu.address.model.person.Phone; -import seedu.address.model.tag.Tag; -import seedu.address.testutil.ClientBuilder; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.commands.AddClientCommand; +import housekeeping.hub.logic.commands.AddCommand; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.tag.Tag; +import housekeeping.hub.testutil.ClientBuilder; public class AddCommandParserTest { private AddCommandParser parser = new AddCommandParser(); @@ -104,7 +104,7 @@ public void parse_repeatedNonTagValue_failure() { assertParseFailure(parser, INVALID_PHONE_DESC + validExpectedPersonString, Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE)); - // invalid address + // invalid hub assertParseFailure(parser, INVALID_ADDRESS_DESC + validExpectedPersonString, Messages.getErrorMessageForDuplicatePrefixes(PREFIX_ADDRESS)); @@ -122,7 +122,7 @@ public void parse_repeatedNonTagValue_failure() { assertParseFailure(parser, validExpectedPersonString + INVALID_PHONE_DESC, Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE)); - // invalid address + // invalid hub assertParseFailure(parser, validExpectedPersonString + INVALID_ADDRESS_DESC, Messages.getErrorMessageForDuplicatePrefixes(PREFIX_ADDRESS)); } @@ -151,7 +151,7 @@ public void parse_compulsoryFieldMissing_failure() { assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + VALID_EMAIL_BOB + ADDRESS_DESC_BOB, expectedMessage); - // missing address prefix + // missing hub prefix assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + VALID_ADDRESS_BOB, expectedMessage); @@ -174,7 +174,7 @@ public void parse_invalidValue_failure() { assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + INVALID_EMAIL_DESC + ADDRESS_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Email.MESSAGE_CONSTRAINTS); - // invalid address + // invalid hub assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + INVALID_ADDRESS_DESC + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Address.MESSAGE_CONSTRAINTS); diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/housekeeping/hub/logic/parser/AddressBookParserTest.java similarity index 77% rename from src/test/java/seedu/address/logic/parser/AddressBookParserTest.java rename to src/test/java/housekeeping/hub/logic/parser/AddressBookParserTest.java index 724e503bc4c..e940c38f481 100644 --- a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java +++ b/src/test/java/housekeeping/hub/logic/parser/AddressBookParserTest.java @@ -1,32 +1,32 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import static seedu.address.logic.Messages.MESSAGE_UNKNOWN_COMMAND; -import static seedu.address.logic.parser.CliSyntax.ALLOWED_PREAMBLES_TYPE; -import static seedu.address.testutil.Assert.assertThrows; -import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static housekeeping.hub.logic.Messages.MESSAGE_UNKNOWN_COMMAND; +import static housekeeping.hub.logic.parser.CliSyntax.ALLOWED_PREAMBLES_TYPE; +import static housekeeping.hub.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.TypicalIndexes.INDEX_FIRST_PERSON; import org.junit.jupiter.api.Test; -import seedu.address.logic.commands.AddClientCommand; -import seedu.address.logic.commands.ClearCommand; -import seedu.address.logic.commands.DeleteClientCommand; -import seedu.address.logic.commands.DeleteHousekeeperCommand; -import seedu.address.logic.commands.EditClientCommand; -import seedu.address.logic.commands.EditCommand.EditPersonDescriptor; -import seedu.address.logic.commands.EditHousekeeperCommand; -import seedu.address.logic.commands.ExitCommand; -import seedu.address.logic.commands.HelpCommand; -import seedu.address.logic.commands.ListCommand; -import seedu.address.logic.parser.exceptions.ParseException; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.testutil.ClientBuilder; -import seedu.address.testutil.EditPersonDescriptorBuilder; -import seedu.address.testutil.HousekeeperBuilder; -import seedu.address.testutil.PersonUtil; +import housekeeping.hub.logic.commands.AddClientCommand; +import housekeeping.hub.logic.commands.ClearCommand; +import housekeeping.hub.logic.commands.DeleteClientCommand; +import housekeeping.hub.logic.commands.DeleteHousekeeperCommand; +import housekeeping.hub.logic.commands.EditClientCommand; +import housekeeping.hub.logic.commands.EditCommand.EditPersonDescriptor; +import housekeeping.hub.logic.commands.EditHousekeeperCommand; +import housekeeping.hub.logic.commands.ExitCommand; +import housekeeping.hub.logic.commands.HelpCommand; +import housekeeping.hub.logic.commands.ListCommand; +import housekeeping.hub.logic.parser.exceptions.ParseException; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.testutil.ClientBuilder; +import housekeeping.hub.testutil.EditPersonDescriptorBuilder; +import housekeeping.hub.testutil.HousekeeperBuilder; +import housekeeping.hub.testutil.PersonUtil; public class AddressBookParserTest { @@ -86,7 +86,7 @@ public void parseCommand_exit() throws Exception { /*@Test public void parseCommand_find() throws Exception { List name = Arrays.asList("foo", "bar"); - List address = Arrays.asList("Clementi", "Jurong"); + List hub = Arrays.asList("Clementi", "Jurong"); List area = Arrays.asList("west", "east"); FindClientCommand findClientCommand = (FindClientCommand) parser.parseCommand( FindClientCommand.COMMAND_WORD + " client " diff --git a/src/test/java/seedu/address/logic/parser/ArgumentTokenizerTest.java b/src/test/java/housekeeping/hub/logic/parser/ArgumentTokenizerTest.java similarity index 99% rename from src/test/java/seedu/address/logic/parser/ArgumentTokenizerTest.java rename to src/test/java/housekeeping/hub/logic/parser/ArgumentTokenizerTest.java index c97308935f5..4d9735474ed 100644 --- a/src/test/java/seedu/address/logic/parser/ArgumentTokenizerTest.java +++ b/src/test/java/housekeeping/hub/logic/parser/ArgumentTokenizerTest.java @@ -1,4 +1,4 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/seedu/address/logic/parser/CommandParserTestUtil.java b/src/test/java/housekeeping/hub/logic/parser/CommandParserTestUtil.java similarity index 89% rename from src/test/java/seedu/address/logic/parser/CommandParserTestUtil.java rename to src/test/java/housekeeping/hub/logic/parser/CommandParserTestUtil.java index 9bf1ccf1cef..4dd1114033f 100644 --- a/src/test/java/seedu/address/logic/parser/CommandParserTestUtil.java +++ b/src/test/java/housekeeping/hub/logic/parser/CommandParserTestUtil.java @@ -1,9 +1,9 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; import static org.junit.jupiter.api.Assertions.assertEquals; -import seedu.address.logic.commands.Command; -import seedu.address.logic.parser.exceptions.ParseException; +import housekeeping.hub.logic.commands.Command; +import housekeeping.hub.logic.parser.exceptions.ParseException; /** * Contains helper methods for testing command parsers. diff --git a/src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java b/src/test/java/housekeeping/hub/logic/parser/DeleteCommandParserTest.java similarity index 64% rename from src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java rename to src/test/java/housekeeping/hub/logic/parser/DeleteCommandParserTest.java index 237b509e06a..97687541e19 100644 --- a/src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java +++ b/src/test/java/housekeeping/hub/logic/parser/DeleteCommandParserTest.java @@ -1,15 +1,13 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure; -import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess; -import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; +import static housekeeping.hub.logic.parser.CommandParserTestUtil.assertParseFailure; +import static housekeeping.hub.logic.parser.CommandParserTestUtil.assertParseSuccess; +import static housekeeping.hub.testutil.TypicalIndexes.INDEX_FIRST_PERSON; import org.junit.jupiter.api.Test; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.DeleteClientCommand; -import seedu.address.logic.commands.DeleteCommand; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.commands.DeleteClientCommand; /** * As we are only doing white-box testing, our test cases do not cover path variations diff --git a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java b/src/test/java/housekeeping/hub/logic/parser/EditCommandParserTest.java similarity index 72% rename from src/test/java/seedu/address/logic/parser/EditCommandParserTest.java rename to src/test/java/housekeeping/hub/logic/parser/EditCommandParserTest.java index 0d8337392fe..9decedc89ca 100644 --- a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java +++ b/src/test/java/housekeeping/hub/logic/parser/EditCommandParserTest.java @@ -1,50 +1,49 @@ -package seedu.address.logic.parser; - -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB; -import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB; -import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC; -import static seedu.address.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC; -import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC; -import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC; -import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC; -import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY; -import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB; -import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND; -import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND; -import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; -import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS; -import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL; -import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE; -import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; -import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure; -import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess; -import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; -import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON; -import static seedu.address.testutil.TypicalIndexes.INDEX_THIRD_PERSON; +package housekeeping.hub.logic.parser; + +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static housekeeping.hub.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.EMAIL_DESC_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.EMAIL_DESC_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC; +import static housekeeping.hub.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC; +import static housekeeping.hub.logic.commands.CommandTestUtil.INVALID_NAME_DESC; +import static housekeeping.hub.logic.commands.CommandTestUtil.INVALID_PHONE_DESC; +import static housekeeping.hub.logic.commands.CommandTestUtil.NAME_DESC_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.PHONE_DESC_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.PHONE_DESC_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.TAG_DESC_FRIEND; +import static housekeeping.hub.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_EMAIL_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_NAME_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_PHONE_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_PHONE_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_TAG_FRIEND; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_ADDRESS; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_EMAIL; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_PHONE; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_TAG; +import static housekeeping.hub.logic.parser.CommandParserTestUtil.assertParseFailure; +import static housekeeping.hub.logic.parser.CommandParserTestUtil.assertParseSuccess; +import static housekeeping.hub.testutil.TypicalIndexes.INDEX_FIRST_PERSON; +import static housekeeping.hub.testutil.TypicalIndexes.INDEX_SECOND_PERSON; +import static housekeeping.hub.testutil.TypicalIndexes.INDEX_THIRD_PERSON; import org.junit.jupiter.api.Test; -import seedu.address.commons.core.index.Index; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.EditClientCommand; -import seedu.address.logic.commands.EditCommand; -import seedu.address.logic.commands.EditCommand.EditPersonDescriptor; -import seedu.address.model.person.Address; -import seedu.address.model.person.Email; -import seedu.address.model.person.Name; -import seedu.address.model.person.Phone; -import seedu.address.model.tag.Tag; -import seedu.address.testutil.EditPersonDescriptorBuilder; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.logic.Messages; +import housekeeping.hub.logic.commands.EditClientCommand; +import housekeeping.hub.logic.commands.EditCommand; +import housekeeping.hub.logic.commands.EditCommand.EditPersonDescriptor; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.tag.Tag; +import housekeeping.hub.testutil.EditPersonDescriptorBuilder; public class EditCommandParserTest { @@ -89,7 +88,7 @@ public void parse_invalidValue_failure() { assertParseFailure(parser, typeclient + "1" + INVALID_NAME_DESC, Name.MESSAGE_CONSTRAINTS); // invalid name assertParseFailure(parser, typeclient + "1" + INVALID_PHONE_DESC, Phone.MESSAGE_CONSTRAINTS); // invalid phone assertParseFailure(parser, typeclient + "1" + INVALID_EMAIL_DESC, Email.MESSAGE_CONSTRAINTS); // invalid email - assertParseFailure(parser, typeclient + "1" + INVALID_ADDRESS_DESC, Address.MESSAGE_CONSTRAINTS); // invalid address + assertParseFailure(parser, typeclient + "1" + INVALID_ADDRESS_DESC, Address.MESSAGE_CONSTRAINTS); // invalid hub // invalid phone followed by valid email assertParseFailure(parser, typeclient + "1" + INVALID_PHONE_DESC + EMAIL_DESC_AMY, Phone.MESSAGE_CONSTRAINTS); @@ -152,7 +151,7 @@ public void parse_oneFieldSpecified_success() { expectedCommand = new EditClientCommand(targetIndex, descriptor); assertParseSuccess(parser, userInput, expectedCommand); - // address + // hub userInput = "client " + targetIndex.getOneBased() + ADDRESS_DESC_AMY; descriptor = new EditPersonDescriptorBuilder().withAddress(VALID_ADDRESS_AMY).build(); expectedCommand = new EditClientCommand(targetIndex, descriptor); diff --git a/src/test/java/seedu/address/logic/parser/FindCommandParserTest.java b/src/test/java/housekeeping/hub/logic/parser/FindCommandParserTest.java similarity index 65% rename from src/test/java/seedu/address/logic/parser/FindCommandParserTest.java rename to src/test/java/housekeeping/hub/logic/parser/FindCommandParserTest.java index 92f1347f771..348b17cac3c 100644 --- a/src/test/java/seedu/address/logic/parser/FindCommandParserTest.java +++ b/src/test/java/housekeeping/hub/logic/parser/FindCommandParserTest.java @@ -1,17 +1,16 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure; -import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess; +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static housekeeping.hub.logic.parser.CommandParserTestUtil.assertParseFailure; +import static housekeeping.hub.logic.parser.CommandParserTestUtil.assertParseSuccess; import java.util.Arrays; import org.junit.jupiter.api.Test; -import seedu.address.logic.commands.FindClientCommand; -import seedu.address.logic.commands.FindCommand; -import seedu.address.model.person.ContainsKeywordsPredicate; -import seedu.address.model.person.NameContainsKeywordsPredicate; +import housekeeping.hub.logic.commands.FindClientCommand; +import housekeeping.hub.logic.commands.FindCommand; +import housekeeping.hub.model.person.ContainsKeywordsPredicate; public class FindCommandParserTest { diff --git a/src/test/java/seedu/address/logic/parser/ListCommandParserTest.java b/src/test/java/housekeeping/hub/logic/parser/ListCommandParserTest.java similarity index 71% rename from src/test/java/seedu/address/logic/parser/ListCommandParserTest.java rename to src/test/java/housekeeping/hub/logic/parser/ListCommandParserTest.java index 0fdfd618d7a..82d8f0f47a2 100644 --- a/src/test/java/seedu/address/logic/parser/ListCommandParserTest.java +++ b/src/test/java/housekeeping/hub/logic/parser/ListCommandParserTest.java @@ -1,15 +1,14 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; -import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; -import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure; -import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess; +import static housekeeping.hub.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT; +import static housekeeping.hub.logic.parser.CommandParserTestUtil.assertParseFailure; +import static housekeeping.hub.logic.parser.CommandParserTestUtil.assertParseSuccess; import org.junit.jupiter.api.Test; -import seedu.address.logic.commands.ListClientCommand; -import seedu.address.logic.commands.ListCommand; -import seedu.address.logic.commands.ListHousekeeperCommand; -import seedu.address.model.person.TypePredicate; +import housekeeping.hub.logic.commands.ListClientCommand; +import housekeeping.hub.logic.commands.ListCommand; +import housekeeping.hub.logic.commands.ListHousekeeperCommand; public class ListCommandParserTest { diff --git a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java b/src/test/java/housekeeping/hub/logic/parser/ParserUtilTest.java similarity index 92% rename from src/test/java/seedu/address/logic/parser/ParserUtilTest.java rename to src/test/java/housekeeping/hub/logic/parser/ParserUtilTest.java index 4256788b1a7..4cadd47a399 100644 --- a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java +++ b/src/test/java/housekeeping/hub/logic/parser/ParserUtilTest.java @@ -1,10 +1,10 @@ -package seedu.address.logic.parser; +package housekeeping.hub.logic.parser; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.logic.parser.ParserUtil.MESSAGE_INVALID_INDEX; -import static seedu.address.testutil.Assert.assertThrows; -import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; +import static housekeeping.hub.logic.parser.ParserUtil.MESSAGE_INVALID_INDEX; +import static housekeeping.hub.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.TypicalIndexes.INDEX_FIRST_PERSON; import java.util.Arrays; import java.util.Collections; @@ -13,12 +13,12 @@ import org.junit.jupiter.api.Test; -import seedu.address.logic.parser.exceptions.ParseException; -import seedu.address.model.person.Address; -import seedu.address.model.person.Email; -import seedu.address.model.person.Name; -import seedu.address.model.person.Phone; -import seedu.address.model.tag.Tag; +import housekeeping.hub.logic.parser.exceptions.ParseException; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.tag.Tag; public class ParserUtilTest { private static final String INVALID_NAME = "R@chel"; diff --git a/src/test/java/seedu/address/model/AddressBookTest.java b/src/test/java/housekeeping/hub/model/AddressBookTest.java similarity index 87% rename from src/test/java/seedu/address/model/AddressBookTest.java rename to src/test/java/housekeeping/hub/model/AddressBookTest.java index e4ff05aea1e..3e7e5345222 100644 --- a/src/test/java/seedu/address/model/AddressBookTest.java +++ b/src/test/java/housekeeping/hub/model/AddressBookTest.java @@ -1,14 +1,14 @@ -package seedu.address.model; +package housekeeping.hub.model; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; -import static seedu.address.testutil.Assert.assertThrows; -import static seedu.address.testutil.TypicalPersons.ALICE; -import static seedu.address.testutil.TypicalPersons.BOB; -import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; +import static housekeeping.hub.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.TypicalPersons.ALICE; +import static housekeeping.hub.testutil.TypicalPersons.BOB; +import static housekeeping.hub.testutil.TypicalPersons.getTypicalAddressBook; import java.util.Arrays; import java.util.Collection; @@ -19,12 +19,11 @@ import javafx.collections.FXCollections; import javafx.collections.ObservableList; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; -import seedu.address.model.person.exceptions.DuplicatePersonException; -import seedu.address.testutil.ClientBuilder; -import seedu.address.testutil.HousekeeperBuilder; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.exceptions.DuplicatePersonException; +import housekeeping.hub.testutil.ClientBuilder; +import housekeeping.hub.testutil.HousekeeperBuilder; public class AddressBookTest { diff --git a/src/test/java/seedu/address/model/ModelManagerTest.java b/src/test/java/housekeeping/hub/model/ModelManagerTest.java similarity index 88% rename from src/test/java/seedu/address/model/ModelManagerTest.java rename to src/test/java/housekeeping/hub/model/ModelManagerTest.java index 83542c02869..451c7e750a7 100644 --- a/src/test/java/seedu/address/model/ModelManagerTest.java +++ b/src/test/java/housekeeping/hub/model/ModelManagerTest.java @@ -1,13 +1,13 @@ -package seedu.address.model; +package housekeeping.hub.model; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.model.Model.PREDICATE_SHOW_ALL_CLIENTS; -import static seedu.address.testutil.Assert.assertThrows; -import static seedu.address.testutil.TypicalPersons.ALICE; -import static seedu.address.testutil.TypicalPersons.BENSON; -import static seedu.address.testutil.TypicalPersons.BOB; +import static housekeeping.hub.model.Model.PREDICATE_SHOW_ALL_CLIENTS; +import static housekeeping.hub.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.TypicalPersons.ALICE; +import static housekeeping.hub.testutil.TypicalPersons.BENSON; +import static housekeeping.hub.testutil.TypicalPersons.BOB; import java.nio.file.Path; import java.nio.file.Paths; @@ -15,9 +15,9 @@ import org.junit.jupiter.api.Test; -import seedu.address.commons.core.GuiSettings; -import seedu.address.model.person.NameContainsKeywordsPredicate; -import seedu.address.testutil.AddressBookBuilder; +import housekeeping.hub.commons.core.GuiSettings; +import housekeeping.hub.model.person.NameContainsKeywordsPredicate; +import housekeeping.hub.testutil.AddressBookBuilder; public class ModelManagerTest { @@ -38,14 +38,14 @@ public void setUserPrefs_nullUserPrefs_throwsNullPointerException() { @Test public void setUserPrefs_validUserPrefs_copiesUserPrefs() { UserPrefs userPrefs = new UserPrefs(); - userPrefs.setAddressBookFilePath(Paths.get("address/book/file/path")); + userPrefs.setAddressBookFilePath(Paths.get("hub/book/file/path")); userPrefs.setGuiSettings(new GuiSettings(1, 2, 3, 4)); modelManager.setUserPrefs(userPrefs); assertEquals(userPrefs, modelManager.getUserPrefs()); // Modifying userPrefs should not modify modelManager's userPrefs UserPrefs oldUserPrefs = new UserPrefs(userPrefs); - userPrefs.setAddressBookFilePath(Paths.get("new/address/book/file/path")); + userPrefs.setAddressBookFilePath(Paths.get("new/hub/book/file/path")); assertEquals(oldUserPrefs, modelManager.getUserPrefs()); } @@ -68,7 +68,7 @@ public void setAddressBookFilePath_nullPath_throwsNullPointerException() { @Test public void setAddressBookFilePath_validPath_setsAddressBookFilePath() { - Path path = Paths.get("address/book/file/path"); + Path path = Paths.get("hub/book/file/path"); modelManager.setAddressBookFilePath(path); assertEquals(path, modelManager.getAddressBookFilePath()); } diff --git a/src/test/java/seedu/address/model/UserPrefsTest.java b/src/test/java/housekeeping/hub/model/UserPrefsTest.java similarity index 85% rename from src/test/java/seedu/address/model/UserPrefsTest.java rename to src/test/java/housekeeping/hub/model/UserPrefsTest.java index b1307a70d52..b6a3d678129 100644 --- a/src/test/java/seedu/address/model/UserPrefsTest.java +++ b/src/test/java/housekeeping/hub/model/UserPrefsTest.java @@ -1,6 +1,6 @@ -package seedu.address.model; +package housekeeping.hub.model; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import org.junit.jupiter.api.Test; diff --git a/src/test/java/seedu/address/model/person/AddressTest.java b/src/test/java/housekeeping/hub/model/person/AddressTest.java similarity index 90% rename from src/test/java/seedu/address/model/person/AddressTest.java rename to src/test/java/housekeeping/hub/model/person/AddressTest.java index 314885eca26..10e2dfad9fe 100644 --- a/src/test/java/seedu/address/model/person/AddressTest.java +++ b/src/test/java/housekeeping/hub/model/person/AddressTest.java @@ -1,8 +1,8 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import org.junit.jupiter.api.Test; @@ -21,7 +21,7 @@ public void constructor_invalidAddress_throwsIllegalArgumentException() { @Test public void isValidAddress() { - // null address + // null hub assertThrows(NullPointerException.class, () -> Address.isValidAddress(null)); // invalid addresses @@ -31,7 +31,7 @@ public void isValidAddress() { // valid addresses assertTrue(Address.isValidAddress("Blk 456, Den Road, #01-355")); assertTrue(Address.isValidAddress("-")); // one character - assertTrue(Address.isValidAddress("Leng Inc; 1234 Market St; San Francisco CA 2349879; USA")); // long address + assertTrue(Address.isValidAddress("Leng Inc; 1234 Market St; San Francisco CA 2349879; USA")); // long hub } @Test diff --git a/src/test/java/seedu/address/model/person/EmailTest.java b/src/test/java/housekeeping/hub/model/person/EmailTest.java similarity index 97% rename from src/test/java/seedu/address/model/person/EmailTest.java rename to src/test/java/housekeeping/hub/model/person/EmailTest.java index f08cdff0a64..b937908e55b 100644 --- a/src/test/java/seedu/address/model/person/EmailTest.java +++ b/src/test/java/housekeeping/hub/model/person/EmailTest.java @@ -1,8 +1,8 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import org.junit.jupiter.api.Test; diff --git a/src/test/java/seedu/address/model/person/HousekeeperTest.java b/src/test/java/housekeeping/hub/model/person/HousekeeperTest.java similarity index 67% rename from src/test/java/seedu/address/model/person/HousekeeperTest.java rename to src/test/java/housekeeping/hub/model/person/HousekeeperTest.java index e1f50e1df32..440e067c957 100644 --- a/src/test/java/seedu/address/model/person/HousekeeperTest.java +++ b/src/test/java/housekeeping/hub/model/person/HousekeeperTest.java @@ -1,32 +1,32 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_AREA_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_BOOKING_LIST_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; -import static seedu.address.testutil.Assert.assertThrows; -import static seedu.address.testutil.TypicalPersons.AMY; -import static seedu.address.testutil.TypicalPersons.BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_AREA_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_BOOKING_LIST_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_EMAIL_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_EMAIL_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_NAME_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_NAME_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_PHONE_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_PHONE_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_TAG_FRIEND; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; +import static housekeeping.hub.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.TypicalPersons.AMY; +import static housekeeping.hub.testutil.TypicalPersons.BOB; import java.util.ArrayList; import org.junit.jupiter.api.Test; -import seedu.address.logic.parser.ParserUtil; -import seedu.address.logic.parser.exceptions.ParseException; -import seedu.address.testutil.HousekeeperBuilder; -import seedu.address.testutil.PersonBuilder; +import housekeeping.hub.logic.parser.ParserUtil; +import housekeeping.hub.logic.parser.exceptions.ParseException; +import housekeeping.hub.testutil.HousekeeperBuilder; +import housekeeping.hub.testutil.PersonBuilder; public class HousekeeperTest { private static Housekeeper copyBob; @@ -87,7 +87,7 @@ public void equals() { editedCopyBob = new HousekeeperBuilder(BOB).withEmail(VALID_EMAIL_AMY).build(); assertFalse(copyBob.equals(editedCopyBob)); - // different address -> returns false + // different hub -> returns false editedCopyBob = new HousekeeperBuilder(BOB).withAddress(VALID_ADDRESS_AMY).build(); assertFalse(copyBob.equals(editedCopyBob)); diff --git a/src/test/java/seedu/address/model/person/LeadsFilterPredicateTest.java b/src/test/java/housekeeping/hub/model/person/LeadsFilterPredicateTest.java similarity index 98% rename from src/test/java/seedu/address/model/person/LeadsFilterPredicateTest.java rename to src/test/java/housekeeping/hub/model/person/LeadsFilterPredicateTest.java index e478b765c07..879ab1aff1b 100644 --- a/src/test/java/seedu/address/model/person/LeadsFilterPredicateTest.java +++ b/src/test/java/housekeeping/hub/model/person/LeadsFilterPredicateTest.java @@ -1,7 +1,7 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import org.junit.jupiter.api.Test; -import seedu.address.testutil.ClientBuilder; +import housekeeping.hub.testutil.ClientBuilder; import java.time.LocalDate; import java.time.Period; diff --git a/src/test/java/seedu/address/model/person/NameTest.java b/src/test/java/housekeeping/hub/model/person/NameTest.java similarity index 95% rename from src/test/java/seedu/address/model/person/NameTest.java rename to src/test/java/housekeeping/hub/model/person/NameTest.java index 94e3dd726bd..60ff8582a0d 100644 --- a/src/test/java/seedu/address/model/person/NameTest.java +++ b/src/test/java/housekeeping/hub/model/person/NameTest.java @@ -1,8 +1,8 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import org.junit.jupiter.api.Test; diff --git a/src/test/java/seedu/address/model/person/PhoneTest.java b/src/test/java/housekeeping/hub/model/person/PhoneTest.java similarity index 95% rename from src/test/java/seedu/address/model/person/PhoneTest.java rename to src/test/java/housekeeping/hub/model/person/PhoneTest.java index deaaa5ba190..cca839361ca 100644 --- a/src/test/java/seedu/address/model/person/PhoneTest.java +++ b/src/test/java/housekeeping/hub/model/person/PhoneTest.java @@ -1,8 +1,8 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import org.junit.jupiter.api.Test; diff --git a/src/test/java/seedu/address/model/person/TypePredicateTest.java b/src/test/java/housekeeping/hub/model/person/TypePredicateTest.java similarity index 82% rename from src/test/java/seedu/address/model/person/TypePredicateTest.java rename to src/test/java/housekeeping/hub/model/person/TypePredicateTest.java index bbcb32eda00..27956cb5f90 100644 --- a/src/test/java/seedu/address/model/person/TypePredicateTest.java +++ b/src/test/java/housekeeping/hub/model/person/TypePredicateTest.java @@ -1,8 +1,8 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.testutil.TypicalPersons.AMY; +import static housekeeping.hub.testutil.TypicalPersons.AMY; import org.junit.jupiter.api.Test; @@ -41,15 +41,15 @@ public void equalsTest() { @Test public void toStringTest() { // prints correct type (client) -> return true - assertTrue(TEST_PREDICATE_CLIENT.toString().equals("seedu.address.model.person.TypePredicate{type=client}")); + assertTrue(TEST_PREDICATE_CLIENT.toString().equals("housekeeping.hub.model.person.TypePredicate{type=client}")); // prints correct type (housekeeper) -> return true assertTrue(TEST_PREDICATE_HOUSEKEEPER.toString() - .equals("seedu.address.model.person.TypePredicate{type=housekeeper}")); + .equals("housekeeping.hub.model.person.TypePredicate{type=housekeeper}")); //prints wrong type -> return false assertFalse(TEST_PREDICATE_CLIENT_2.toString() - .equals("seedu.address.model.person.TypePredicate{type=housekeeper}")); + .equals("housekeeping.hub.model.person.TypePredicate{type=housekeeper}")); // prints wrong string -> return false assertFalse(TEST_PREDICATE_CLIENT.toString().equals("{type=client}")); diff --git a/src/test/java/seedu/address/model/person/UniquePersonListTest.java b/src/test/java/housekeeping/hub/model/person/UniquePersonListTest.java similarity index 91% rename from src/test/java/seedu/address/model/person/UniquePersonListTest.java rename to src/test/java/housekeeping/hub/model/person/UniquePersonListTest.java index b40b8e26da7..ee5b6aff8dd 100644 --- a/src/test/java/seedu/address/model/person/UniquePersonListTest.java +++ b/src/test/java/housekeeping/hub/model/person/UniquePersonListTest.java @@ -1,14 +1,13 @@ -package seedu.address.model.person; +package housekeeping.hub.model.person; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; -import static seedu.address.testutil.Assert.assertThrows; -import static seedu.address.testutil.TypicalPersons.ALICE; -import static seedu.address.testutil.TypicalPersons.BOB; -import static seedu.address.testutil.TypicalPersons.HOON; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; +import static housekeeping.hub.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.TypicalPersons.ALICE; +import static housekeeping.hub.testutil.TypicalPersons.HOON; import java.util.Arrays; import java.util.Collections; @@ -16,9 +15,9 @@ import org.junit.jupiter.api.Test; -import seedu.address.model.person.exceptions.DuplicatePersonException; -import seedu.address.model.person.exceptions.PersonNotFoundException; -import seedu.address.testutil.ClientBuilder; +import housekeeping.hub.model.person.exceptions.DuplicatePersonException; +import housekeeping.hub.model.person.exceptions.PersonNotFoundException; +import housekeeping.hub.testutil.ClientBuilder; public class UniquePersonListTest { diff --git a/src/test/java/seedu/address/model/tag/TagTest.java b/src/test/java/housekeeping/hub/model/tag/TagTest.java similarity index 85% rename from src/test/java/seedu/address/model/tag/TagTest.java rename to src/test/java/housekeeping/hub/model/tag/TagTest.java index 64d07d79ee2..919e62fe265 100644 --- a/src/test/java/seedu/address/model/tag/TagTest.java +++ b/src/test/java/housekeeping/hub/model/tag/TagTest.java @@ -1,6 +1,6 @@ -package seedu.address.model.tag; +package housekeeping.hub.model.tag; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import org.junit.jupiter.api.Test; diff --git a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java b/src/test/java/housekeeping/hub/storage/JsonAdaptedPersonTest.java similarity index 91% rename from src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java rename to src/test/java/housekeeping/hub/storage/JsonAdaptedPersonTest.java index ea32b6bb886..47e4e33c428 100644 --- a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java +++ b/src/test/java/housekeeping/hub/storage/JsonAdaptedPersonTest.java @@ -1,9 +1,9 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import static org.junit.jupiter.api.Assertions.assertEquals; -import static seedu.address.storage.JsonAdaptedPerson.MISSING_FIELD_MESSAGE_FORMAT; -import static seedu.address.testutil.Assert.assertThrows; -import static seedu.address.testutil.TypicalPersons.BENSON; +import static housekeeping.hub.storage.JsonAdaptedPerson.MISSING_FIELD_MESSAGE_FORMAT; +import static housekeeping.hub.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.TypicalPersons.BENSON; import java.util.ArrayList; import java.util.List; @@ -11,12 +11,12 @@ import org.junit.jupiter.api.Test; -import seedu.address.commons.exceptions.IllegalValueException; -import seedu.address.model.person.Address; -import seedu.address.model.person.Email; -import seedu.address.model.person.Name; -import seedu.address.model.person.Phone; -import seedu.address.model.person.Type; +import housekeeping.hub.commons.exceptions.IllegalValueException; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.person.Type; public class JsonAdaptedPersonTest { private static final String INVALID_NAME = "R@chel"; diff --git a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java b/src/test/java/housekeeping/hub/storage/JsonAddressBookStorageTest.java similarity index 88% rename from src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java rename to src/test/java/housekeeping/hub/storage/JsonAddressBookStorageTest.java index 348ae4d2591..758943a9143 100644 --- a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java +++ b/src/test/java/housekeeping/hub/storage/JsonAddressBookStorageTest.java @@ -1,12 +1,12 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static seedu.address.testutil.Assert.assertThrows; -import static seedu.address.testutil.TypicalPersons.ALICE; -import static seedu.address.testutil.TypicalPersons.HOON; -import static seedu.address.testutil.TypicalPersons.IDA; -import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook; +import static housekeeping.hub.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.TypicalPersons.ALICE; +import static housekeeping.hub.testutil.TypicalPersons.HOON; +import static housekeeping.hub.testutil.TypicalPersons.IDA; +import static housekeeping.hub.testutil.TypicalPersons.getTypicalAddressBook; import java.io.IOException; import java.nio.file.Path; @@ -15,9 +15,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import seedu.address.commons.exceptions.DataLoadingException; -import seedu.address.model.AddressBook; -import seedu.address.model.ReadOnlyAddressBook; +import housekeeping.hub.commons.exceptions.DataLoadingException; +import housekeeping.hub.model.AddressBook; +import housekeeping.hub.model.ReadOnlyAddressBook; public class JsonAddressBookStorageTest { private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonAddressBookStorageTest"); diff --git a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java b/src/test/java/housekeeping/hub/storage/JsonSerializableAddressBookTest.java similarity index 86% rename from src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java rename to src/test/java/housekeeping/hub/storage/JsonSerializableAddressBookTest.java index 188c9058d20..d9f9cf9a049 100644 --- a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java +++ b/src/test/java/housekeeping/hub/storage/JsonSerializableAddressBookTest.java @@ -1,17 +1,17 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import static org.junit.jupiter.api.Assertions.assertEquals; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import java.nio.file.Path; import java.nio.file.Paths; import org.junit.jupiter.api.Test; -import seedu.address.commons.exceptions.IllegalValueException; -import seedu.address.commons.util.JsonUtil; -import seedu.address.model.AddressBook; -import seedu.address.testutil.TypicalPersons; +import housekeeping.hub.commons.exceptions.IllegalValueException; +import housekeeping.hub.commons.util.JsonUtil; +import housekeeping.hub.model.AddressBook; +import housekeeping.hub.testutil.TypicalPersons; public class JsonSerializableAddressBookTest { diff --git a/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java b/src/test/java/housekeeping/hub/storage/JsonUserPrefsStorageTest.java similarity index 94% rename from src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java rename to src/test/java/housekeeping/hub/storage/JsonUserPrefsStorageTest.java index ed0a413526a..e8a92cc5411 100644 --- a/src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java +++ b/src/test/java/housekeeping/hub/storage/JsonUserPrefsStorageTest.java @@ -1,8 +1,8 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import java.io.IOException; import java.nio.file.Path; @@ -12,9 +12,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import seedu.address.commons.core.GuiSettings; -import seedu.address.commons.exceptions.DataLoadingException; -import seedu.address.model.UserPrefs; +import housekeeping.hub.commons.core.GuiSettings; +import housekeeping.hub.commons.exceptions.DataLoadingException; +import housekeeping.hub.model.UserPrefs; public class JsonUserPrefsStorageTest { diff --git a/src/test/java/seedu/address/storage/StorageManagerTest.java b/src/test/java/housekeeping/hub/storage/StorageManagerTest.java similarity index 88% rename from src/test/java/seedu/address/storage/StorageManagerTest.java rename to src/test/java/housekeeping/hub/storage/StorageManagerTest.java index 99a16548970..fa1ad349ea5 100644 --- a/src/test/java/seedu/address/storage/StorageManagerTest.java +++ b/src/test/java/housekeeping/hub/storage/StorageManagerTest.java @@ -1,8 +1,8 @@ -package seedu.address.storage; +package housekeeping.hub.storage; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook; +import static housekeeping.hub.testutil.TypicalPersons.getTypicalAddressBook; import java.nio.file.Path; @@ -10,10 +10,10 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import seedu.address.commons.core.GuiSettings; -import seedu.address.model.AddressBook; -import seedu.address.model.ReadOnlyAddressBook; -import seedu.address.model.UserPrefs; +import housekeeping.hub.commons.core.GuiSettings; +import housekeeping.hub.model.AddressBook; +import housekeeping.hub.model.ReadOnlyAddressBook; +import housekeeping.hub.model.UserPrefs; public class StorageManagerTest { diff --git a/src/test/java/seedu/address/testutil/AddressBookBuilder.java b/src/test/java/housekeeping/hub/testutil/AddressBookBuilder.java similarity index 82% rename from src/test/java/seedu/address/testutil/AddressBookBuilder.java rename to src/test/java/housekeeping/hub/testutil/AddressBookBuilder.java index 5fa7c279d32..a9bab8203f0 100644 --- a/src/test/java/seedu/address/testutil/AddressBookBuilder.java +++ b/src/test/java/housekeeping/hub/testutil/AddressBookBuilder.java @@ -1,9 +1,8 @@ -package seedu.address.testutil; +package housekeeping.hub.testutil; -import seedu.address.model.AddressBook; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; +import housekeeping.hub.model.AddressBook; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; /** * A utility class to help with building Addressbook objects. diff --git a/src/test/java/seedu/address/testutil/Assert.java b/src/test/java/housekeeping/hub/testutil/Assert.java similarity index 97% rename from src/test/java/seedu/address/testutil/Assert.java rename to src/test/java/housekeeping/hub/testutil/Assert.java index 9863093bd6e..ce379e956bd 100644 --- a/src/test/java/seedu/address/testutil/Assert.java +++ b/src/test/java/housekeeping/hub/testutil/Assert.java @@ -1,4 +1,4 @@ -package seedu.address.testutil; +package housekeeping.hub.testutil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.function.Executable; diff --git a/src/test/java/seedu/address/testutil/ClientBuilder.java b/src/test/java/housekeeping/hub/testutil/ClientBuilder.java similarity index 88% rename from src/test/java/seedu/address/testutil/ClientBuilder.java rename to src/test/java/housekeeping/hub/testutil/ClientBuilder.java index 98174838e74..2745d3ccebb 100644 --- a/src/test/java/seedu/address/testutil/ClientBuilder.java +++ b/src/test/java/housekeeping/hub/testutil/ClientBuilder.java @@ -1,19 +1,19 @@ -package seedu.address.testutil; +package housekeeping.hub.testutil; import java.time.LocalDate; import java.time.Period; import java.util.HashSet; import java.util.Set; -import seedu.address.model.person.Address; -import seedu.address.model.person.Area; -import seedu.address.model.person.Client; -import seedu.address.model.person.Email; -import seedu.address.model.person.HousekeepingDetails; -import seedu.address.model.person.Name; -import seedu.address.model.person.Phone; -import seedu.address.model.tag.Tag; -import seedu.address.model.util.SampleDataUtil; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.HousekeepingDetails; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.tag.Tag; +import housekeeping.hub.model.util.SampleDataUtil; /** * A utility class to help with building Client objects. diff --git a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java b/src/test/java/housekeeping/hub/testutil/EditPersonDescriptorBuilder.java similarity index 83% rename from src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java rename to src/test/java/housekeeping/hub/testutil/EditPersonDescriptorBuilder.java index 703316427a5..a665a59bebb 100644 --- a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java +++ b/src/test/java/housekeeping/hub/testutil/EditPersonDescriptorBuilder.java @@ -1,21 +1,21 @@ -package seedu.address.testutil; +package housekeeping.hub.testutil; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import seedu.address.logic.commands.EditCommand.EditPersonDescriptor; -import seedu.address.model.person.Address; -import seedu.address.model.person.Area; -import seedu.address.model.person.BookingList; -import seedu.address.model.person.Client; -import seedu.address.model.person.Email; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.HousekeepingDetails; -import seedu.address.model.person.Name; -import seedu.address.model.person.Person; -import seedu.address.model.person.Phone; -import seedu.address.model.tag.Tag; +import housekeeping.hub.logic.commands.EditCommand.EditPersonDescriptor; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.BookingList; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.HousekeepingDetails; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Person; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.tag.Tag; /** * A utility class to help with building EditPersonDescriptor objects. diff --git a/src/test/java/seedu/address/testutil/HousekeeperBuilder.java b/src/test/java/housekeeping/hub/testutil/HousekeeperBuilder.java similarity index 88% rename from src/test/java/seedu/address/testutil/HousekeeperBuilder.java rename to src/test/java/housekeeping/hub/testutil/HousekeeperBuilder.java index a146d2c84a1..cd4d935e503 100644 --- a/src/test/java/seedu/address/testutil/HousekeeperBuilder.java +++ b/src/test/java/housekeeping/hub/testutil/HousekeeperBuilder.java @@ -1,17 +1,17 @@ -package seedu.address.testutil; +package housekeeping.hub.testutil; import java.util.HashSet; import java.util.Set; -import seedu.address.model.person.Address; -import seedu.address.model.person.Area; -import seedu.address.model.person.BookingList; -import seedu.address.model.person.Email; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Name; -import seedu.address.model.person.Phone; -import seedu.address.model.tag.Tag; -import seedu.address.model.util.SampleDataUtil; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.BookingList; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.tag.Tag; +import housekeeping.hub.model.util.SampleDataUtil; /** * A utility class to help with building Housekeeper objects. diff --git a/src/test/java/seedu/address/testutil/PersonBuilder.java b/src/test/java/housekeeping/hub/testutil/PersonBuilder.java similarity index 85% rename from src/test/java/seedu/address/testutil/PersonBuilder.java rename to src/test/java/housekeeping/hub/testutil/PersonBuilder.java index 22a432c0f74..427c630d2a4 100644 --- a/src/test/java/seedu/address/testutil/PersonBuilder.java +++ b/src/test/java/housekeeping/hub/testutil/PersonBuilder.java @@ -1,21 +1,21 @@ -package seedu.address.testutil; +package housekeeping.hub.testutil; import java.util.HashSet; import java.util.Set; -import seedu.address.model.person.Address; -import seedu.address.model.person.Area; -import seedu.address.model.person.BookingList; -import seedu.address.model.person.Client; -import seedu.address.model.person.Email; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.HousekeepingDetails; -import seedu.address.model.person.Name; -import seedu.address.model.person.Person; -import seedu.address.model.person.Phone; -import seedu.address.model.person.Type; -import seedu.address.model.tag.Tag; -import seedu.address.model.util.SampleDataUtil; +import housekeeping.hub.model.person.Address; +import housekeeping.hub.model.person.Area; +import housekeeping.hub.model.person.BookingList; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Email; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.person.HousekeepingDetails; +import housekeeping.hub.model.person.Name; +import housekeeping.hub.model.person.Person; +import housekeeping.hub.model.person.Phone; +import housekeeping.hub.model.person.Type; +import housekeeping.hub.model.tag.Tag; +import housekeeping.hub.model.util.SampleDataUtil; /** * A utility class to help with building Person objects. diff --git a/src/test/java/seedu/address/testutil/PersonUtil.java b/src/test/java/housekeeping/hub/testutil/PersonUtil.java similarity index 78% rename from src/test/java/seedu/address/testutil/PersonUtil.java rename to src/test/java/housekeeping/hub/testutil/PersonUtil.java index d75f6b58ca1..b379c8385df 100644 --- a/src/test/java/seedu/address/testutil/PersonUtil.java +++ b/src/test/java/housekeeping/hub/testutil/PersonUtil.java @@ -1,23 +1,21 @@ -package seedu.address.testutil; +package housekeeping.hub.testutil; -import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS; -import static seedu.address.logic.parser.CliSyntax.PREFIX_AREA; -import static seedu.address.logic.parser.CliSyntax.PREFIX_DETAILS; -import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL; -import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME; -import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE; -import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_ADDRESS; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_AREA; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_DETAILS; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_EMAIL; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_NAME; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_PHONE; +import static housekeeping.hub.logic.parser.CliSyntax.PREFIX_TAG; import java.util.Set; -import seedu.address.logic.commands.AddClientCommand; -import seedu.address.logic.commands.AddCommand; -import seedu.address.logic.commands.AddHousekeeperCommand; -import seedu.address.logic.commands.EditCommand.EditPersonDescriptor; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; -import seedu.address.model.tag.Tag; +import housekeeping.hub.logic.commands.AddClientCommand; +import housekeeping.hub.logic.commands.AddHousekeeperCommand; +import housekeeping.hub.logic.commands.EditCommand.EditPersonDescriptor; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; +import housekeeping.hub.model.tag.Tag; /** * A utility class for Person. diff --git a/src/test/java/seedu/address/testutil/SerializableTestClass.java b/src/test/java/housekeeping/hub/testutil/SerializableTestClass.java similarity index 98% rename from src/test/java/seedu/address/testutil/SerializableTestClass.java rename to src/test/java/housekeeping/hub/testutil/SerializableTestClass.java index f5a66340489..81a6767950b 100644 --- a/src/test/java/seedu/address/testutil/SerializableTestClass.java +++ b/src/test/java/housekeeping/hub/testutil/SerializableTestClass.java @@ -1,4 +1,4 @@ -package seedu.address.testutil; +package housekeeping.hub.testutil; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/src/test/java/seedu/address/testutil/TestUtil.java b/src/test/java/housekeeping/hub/testutil/TestUtil.java similarity index 93% rename from src/test/java/seedu/address/testutil/TestUtil.java rename to src/test/java/housekeeping/hub/testutil/TestUtil.java index 739e9f94c95..40b4cfaaaad 100644 --- a/src/test/java/seedu/address/testutil/TestUtil.java +++ b/src/test/java/housekeeping/hub/testutil/TestUtil.java @@ -1,13 +1,13 @@ -package seedu.address.testutil; +package housekeeping.hub.testutil; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import seedu.address.commons.core.index.Index; -import seedu.address.model.Model; -import seedu.address.model.person.Person; +import housekeeping.hub.commons.core.index.Index; +import housekeeping.hub.model.Model; +import housekeeping.hub.model.person.Person; /** * A utility class for test cases. diff --git a/src/test/java/seedu/address/testutil/TypicalIndexes.java b/src/test/java/housekeeping/hub/testutil/TypicalIndexes.java similarity index 80% rename from src/test/java/seedu/address/testutil/TypicalIndexes.java rename to src/test/java/housekeeping/hub/testutil/TypicalIndexes.java index 1e613937657..74954681298 100644 --- a/src/test/java/seedu/address/testutil/TypicalIndexes.java +++ b/src/test/java/housekeeping/hub/testutil/TypicalIndexes.java @@ -1,6 +1,6 @@ -package seedu.address.testutil; +package housekeeping.hub.testutil; -import seedu.address.commons.core.index.Index; +import housekeeping.hub.commons.core.index.Index; /** * A utility class containing a list of {@code Index} objects to be used in tests. diff --git a/src/test/java/seedu/address/testutil/TypicalPersons.java b/src/test/java/housekeeping/hub/testutil/TypicalPersons.java similarity index 76% rename from src/test/java/seedu/address/testutil/TypicalPersons.java rename to src/test/java/housekeeping/hub/testutil/TypicalPersons.java index 4da8df5161d..6dbbed77a8c 100644 --- a/src/test/java/seedu/address/testutil/TypicalPersons.java +++ b/src/test/java/housekeeping/hub/testutil/TypicalPersons.java @@ -1,26 +1,25 @@ -package seedu.address.testutil; +package housekeeping.hub.testutil; -import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_AREA_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_AREA_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND; -import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_AREA_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_AREA_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_EMAIL_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_EMAIL_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_NAME_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_NAME_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_PHONE_AMY; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_PHONE_BOB; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_TAG_FRIEND; +import static housekeeping.hub.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import seedu.address.model.AddressBook; -import seedu.address.model.person.Client; -import seedu.address.model.person.Housekeeper; -import seedu.address.model.person.Person; +import housekeeping.hub.model.AddressBook; +import housekeeping.hub.model.person.Client; +import housekeeping.hub.model.person.Housekeeper; /** * A utility class containing a list of {@code Person} objects to be used in tests. diff --git a/src/test/java/seedu/address/ui/TestFxmlObject.java b/src/test/java/housekeeping/hub/ui/TestFxmlObject.java similarity index 97% rename from src/test/java/seedu/address/ui/TestFxmlObject.java rename to src/test/java/housekeeping/hub/ui/TestFxmlObject.java index 93f40f1276a..3eeb6253f01 100644 --- a/src/test/java/seedu/address/ui/TestFxmlObject.java +++ b/src/test/java/housekeeping/hub/ui/TestFxmlObject.java @@ -1,4 +1,4 @@ -package seedu.address.ui; +package housekeeping.hub.ui; import java.util.Objects; diff --git a/src/test/java/seedu/address/ui/UiPartTest.java b/src/test/java/housekeeping/hub/ui/UiPartTest.java similarity index 97% rename from src/test/java/seedu/address/ui/UiPartTest.java rename to src/test/java/housekeeping/hub/ui/UiPartTest.java index 33d82d911b8..b3eb5b9f1bc 100644 --- a/src/test/java/seedu/address/ui/UiPartTest.java +++ b/src/test/java/housekeeping/hub/ui/UiPartTest.java @@ -1,8 +1,8 @@ -package seedu.address.ui; +package housekeeping.hub.ui; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static seedu.address.testutil.Assert.assertThrows; +import static housekeeping.hub.testutil.Assert.assertThrows; import java.net.URL; import java.nio.file.Path; @@ -11,7 +11,7 @@ import org.junit.jupiter.api.io.TempDir; import javafx.fxml.FXML; -import seedu.address.MainApp; +import housekeeping.hub.MainApp; public class UiPartTest { diff --git a/src/test/resources/view/UiPartTest/validFile.fxml b/src/test/resources/view/UiPartTest/validFile.fxml index bab836af0db..127b4dca8db 100644 --- a/src/test/resources/view/UiPartTest/validFile.fxml +++ b/src/test/resources/view/UiPartTest/validFile.fxml @@ -1,4 +1,4 @@ - + Hello World! diff --git a/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml b/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml index 1a8b2c9e4d3..9868f62fd08 100644 --- a/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml +++ b/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml @@ -1,6 +1,6 @@ - + Hello World!