Skip to content

Commit

Permalink
Merge b7c6071 into 04be11d
Browse files Browse the repository at this point in the history
  • Loading branch information
racheltanxueqi committed Mar 15, 2019
2 parents 04be11d + b7c6071 commit e14f537
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 24 deletions.
8 changes: 0 additions & 8 deletions docs/UserGuide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,6 @@ Example:
* `filter /region north /type HDB /status spoiled`
* `filter /year 1987-2018 /status in-use`

=== Updating equipment details: `update-e`
Update details of a equipment.
Format: `update equipment [equipment id] /[fieldname to be updated] [value to be updated to]`

Example:

* `Update equipment 68912 /status spoiled`

=== Autocomplete: kbd:[tab]
If you have forgotten how to type a command, do not worry! By typing in the first letter of the command in the command and pressing the kbd:[tab] key, it will display the full format of the command.

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/seedu/address/logic/commands/AddCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class AddCommand extends Command {

public static final String COMMAND_WORD = "add-e";

public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds an equipment to the address book. "
public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds an equipment to the Equipment Manager. "
+ "Parameters: "
+ CliSyntax.PREFIX_NAME + "NAME "
+ CliSyntax.PREFIX_PHONE + "PHONE "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
public class ClearCommand extends Command {

public static final String COMMAND_WORD = "clear";
public static final String MESSAGE_SUCCESS = "Address book has been cleared!";
public static final String MESSAGE_SUCCESS = "Equipment Manager has been cleared!";


@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/seedu/address/logic/commands/DeleteCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
import seedu.address.model.equipment.Equipment;

/**
* Deletes a equipment identified using it's displayed index from the address book.
* Deletes an equipment identified using it's displayed index from the Equipment Manager.
*/
public class DeleteCommand extends Command {

public static final String COMMAND_WORD = "delete";
public static final String COMMAND_WORD = "delete-e";

public static final String MESSAGE_USAGE = COMMAND_WORD
+ ": Deletes the equipment identified by the index number used in the displayed equipment list.\n"
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/seedu/address/logic/commands/EditCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
import seedu.address.model.tag.Tag;

/**
* Edits the details of an existing equipment in the address book.
* Edits the details of an existing equipment in the equipment manager.
*/
public class EditCommand extends Command {

public static final String COMMAND_WORD = "edit";
public static final String COMMAND_WORD = "edit-e";

public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the equipment identified "
+ "by the index number used in the displayed equipment list. "
Expand All @@ -47,7 +47,7 @@ public class EditCommand extends Command {

public static final String MESSAGE_EDIT_PERSON_SUCCESS = "Edited Equipment: %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 equipment already exists in the address book.";
public static final String MESSAGE_DUPLICATE_PERSON = "This equipment already exists in the Equipment Manager.";

private final Index index;
private final EditPersonDescriptor editPersonDescriptor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class ExitCommand extends Command {

public static final String COMMAND_WORD = "exit";

public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Address Book as requested ...";
public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Equipment Manager as requested ...";

@Override
public CommandResult execute(Model model, CommandHistory history) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/seedu/address/logic/commands/ListCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
import seedu.address.model.Model;

/**
* Lists all persons in the address book to the user.
* Lists all equipments in the equipment manager to the user.
*/
public class ListCommand extends Command {

public static final String COMMAND_WORD = "list";
public static final String COMMAND_WORD = "list-e";

public static final String MESSAGE_SUCCESS = "Listed all persons";
public static final String MESSAGE_SUCCESS = "Listed all equipment";


@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import seedu.address.model.Model;

/**
* Reverts the {@code model}'s address book to its previously undone state.
* Reverts the {@code model}'s equipment manager to its previously undone state.
*/
public class RedoCommand extends Command {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import seedu.address.model.Model;

/**
* Lists all persons in the address book to the user.
* Lists all equipment in the equipment manager to the user.
*/
public class SortCommand extends Command {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import seedu.address.model.Model;

/**
* Reverts the {@code model}'s address book to its previous state.
* Reverts the {@code model}'s equipment manager to its previous state.
*/
public class UndoCommand extends Command {

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/seedu/address/logic/LogicManagerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void execute_invalidCommandFormat_throwsParseException() {

@Test
public void execute_commandExecutionError_throwsCommandException() {
String deleteCommand = "delete 9";
String deleteCommand = "delete-e 9";
assertCommandException(deleteCommand, MESSAGE_INVALID_EQUIPMENT_DISPLAYED_INDEX);
assertHistoryCorrect(deleteCommand);
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/seedu/address/ui/CommandBoxTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void handleKeyPress_startingWithUp() {

// insert command in the middle of retrieving previous commands
guiRobot.push(KeyCode.UP);
String thirdCommand = "list";
String thirdCommand = "list-e";
commandBoxHandle.run(thirdCommand);
assertInputHistory(KeyCode.UP, thirdCommand);
assertInputHistory(KeyCode.UP, COMMAND_THAT_FAILS);
Expand Down

0 comments on commit e14f537

Please sign in to comment.