diff --git a/preferences.json b/preferences.json index 8ff124029ecf..298b60d8bdb6 100644 --- a/preferences.json +++ b/preferences.json @@ -1,10 +1,10 @@ { "guiSettings" : { - "windowWidth" : 1440.0, - "windowHeight" : 839.0, + "windowWidth" : 1547.199951171875, + "windowHeight" : 828.7999877929688, "windowCoordinates" : { - "x" : 0, - "y" : 23 + "x" : -4, + "y" : 0 } }, "addressBookFilePath" : "data\\addressbook.xml", diff --git a/src/main/java/seedu/address/logic/commands/admin/UpdatePasswordCommand.java b/src/main/java/seedu/address/logic/commands/admin/UpdatePasswordCommand.java index 2eeaa74d15a3..eee4d4800a45 100644 --- a/src/main/java/seedu/address/logic/commands/admin/UpdatePasswordCommand.java +++ b/src/main/java/seedu/address/logic/commands/admin/UpdatePasswordCommand.java @@ -81,7 +81,7 @@ public CommandResult execute(Model model, CommandHistory history) throws Command model.updateAdmin(toUpdate, updatedAdmin); - model.commitAddressBook(); //TODO: not sure what this does; + model.commitAddressBook(); return new CommandResult(MESSAGE_SUCCESS); } diff --git a/src/main/java/seedu/address/logic/commands/job/ManageJobCommand.java b/src/main/java/seedu/address/logic/commands/job/ManageJobCommand.java index a35b4cbee441..b9ac953fb151 100644 --- a/src/main/java/seedu/address/logic/commands/job/ManageJobCommand.java +++ b/src/main/java/seedu/address/logic/commands/job/ManageJobCommand.java @@ -193,42 +193,6 @@ public CommandResult execute(Model model, CommandHistory history) throws Command throw new CommandException(MESSAGE_NO_SUCH_OPTION); } - // TODO: 11/5/2018 REMOVE IF CASE SWITCH WORKS - /* - if (option.equals(OPTION_START)) { - if (!model.isTopJob(name)) { - throw new CommandException(MESSAGE_ONLY_TOP_JOB_STARTABLE); - } - model.startJob(name); - model.commitAddressBook(); - model.updateFilteredMachineList(PREDICATE_SHOW_ALL_MACHINES); - return new CommandResult(MESSAGE_STARTED_JOB); - } else if (option.equals(OPTION_RESTART)) { - if (!model.isTopJob(name)) { - throw new CommandException(MESSAGE_ONLY_TOP_JOB_STARTABLE); - } - model.restartJob(name); - model.commitAddressBook(); - model.updateFilteredMachineList(PREDICATE_SHOW_ALL_MACHINES); - return new CommandResult(MESSAGE_RESTARTED_JOB); - } else if (option.equals(OPTION_CANCEL)) { - model.cancelJob(name); - model.commitAddressBook(); - model.updateFilteredMachineList(PREDICATE_SHOW_ALL_MACHINES); - return new CommandResult(MESSAGE_CANCELLED_JOB); - } else if (option.equals(OPTION_DELETE)) { - if (!model.isLoggedIn()) { - throw new CommandException(MESSAGE_ACCESS_DENIED); - } - model.deleteJob(name); - model.commitAddressBook(); - model.updateFilteredMachineList(PREDICATE_SHOW_ALL_MACHINES); - return new CommandResult(MESSAGE_DELETED_JOB); - - } else { - return new CommandResult(MESSAGE_NO_SUCH_OPTION); - } - */ } @Override diff --git a/src/main/java/seedu/address/model/AddressBook.java b/src/main/java/seedu/address/model/AddressBook.java index 4a432b18af1e..d81319853633 100644 --- a/src/main/java/seedu/address/model/AddressBook.java +++ b/src/main/java/seedu/address/model/AddressBook.java @@ -572,34 +572,6 @@ public String toString() { // TODO: refine later } - - /** - * list all the current's version data for addressbook - */ - /* - public void listCurrentVersionData() { - logger.info("Listing current version data"); - logger.info("-----------------------Machine data---------------------"); - for (Machine m : machines.asUnmodifiableObservableList()) { - logger.info(m.getName().fullName); - } - - logger.info("-----------------------Jobs data-----------------------"); - for (Job j : jobs.asUnmodifiableObservableList()) { - logger.info(j.getJobName().fullName); - } - - logger.info("----------------------Admins data----------------------"); - for (Admin a : admins.asUnmodifiableObservableList()) { - logger.info(a.getUsername().toString()); - } - - logger.info("-----------------------Persons data---------------------"); - for (Person p : persons.asUnmodifiableObservableList()) { - logger.info(p.getName().fullName); - } - } - */ } diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java index a7f7472a2525..b1988fd4ef25 100644 --- a/src/main/java/seedu/address/model/ModelManager.java +++ b/src/main/java/seedu/address/model/ModelManager.java @@ -18,7 +18,6 @@ import seedu.address.commons.core.LogsCenter; import seedu.address.commons.events.model.AddressBookChangedEvent; import seedu.address.commons.events.model.AdminListChangedEvent; -import seedu.address.commons.events.model.JobListChangedEvent; import seedu.address.commons.events.model.MachineListChangedEvent; import seedu.address.logic.commands.exceptions.CommandException; import seedu.address.model.admin.Admin; @@ -61,7 +60,21 @@ public ModelManager(ReadOnlyAddressBook addressBook, UserPrefs userPrefs) { filteredMachines = new FilteredList<>(versionedAddressBook.getMachineList()); filteredAdmins = new FilteredList<>(versionedAddressBook.getAdminList()); + Timer refreshTimer = refreshUiTimer(); + + } + + public ModelManager() { + this(new AddressBook(), new UserPrefs()); + } + + /** + * Helps refresh the Ui and show changes instantaneously + * @return + */ + private Timer refreshUiTimer() { // Timer for auto print cleanup + // credit: https://dzone.com/articles/how-schedule-task-run-interval TimerTask task = new TimerTask() { @Override @@ -85,10 +98,7 @@ public void run() { long intervalPeriod = 1000; timer.scheduleAtFixedRate(task, delay, intervalPeriod); - } - - public ModelManager() { - this(new AddressBook(), new UserPrefs()); + return timer; } @Override @@ -123,19 +133,6 @@ private void indicateMachineListChanged() { raise(new MachineListChangedEvent(versionedAddressBook)); } - // TODO: 11/3/2018 REMOVE UNUSED METHOD - - /** - * Raises an event to indicate the model has changed - */ - private void indicateJobListChanged() { - raise(new JobListChangedEvent(versionedAddressBook)); - /** - * Since when job changes, it implicitly implies that machine list will change too - */ - raise(new MachineListChangedEvent(versionedAddressBook)); - } - // ============================== Person methods ======================================= // @Override public boolean hasPerson(Person person) { diff --git a/src/main/java/seedu/address/storage/admin/XmlAdaptedAdmin.java b/src/main/java/seedu/address/storage/admin/XmlAdaptedAdmin.java index 2d92f61f185f..f9b7f1d1a5ae 100644 --- a/src/main/java/seedu/address/storage/admin/XmlAdaptedAdmin.java +++ b/src/main/java/seedu/address/storage/admin/XmlAdaptedAdmin.java @@ -57,13 +57,6 @@ public Admin toModelType() throws IllegalValueException { Username.class.getSimpleName())); } - //TODO: don't forget this - /* - if (!Name.isValidName(name)) { - throw new IllegalValueException(Name.MESSAGE_NAME_CONSTRAINTS); - } - */ - final Username modelUsername = new Username(username); if (password == null) { @@ -71,13 +64,6 @@ public Admin toModelType() throws IllegalValueException { Password.class.getSimpleName())); } - //TODO: Don't forget this - /* - if (!Phone.isValidPhone(phone)) { - throw new IllegalValueException(Phone.MESSAGE_PHONE_CONSTRAINTS); - } - */ - final Password modelPassword = new Password(password); return new Admin(modelUsername, modelPassword); diff --git a/src/main/java/seedu/address/storage/admin/XmlSerializableMakerManagerAdmins.java b/src/main/java/seedu/address/storage/admin/XmlSerializableMakerManagerAdmins.java index d11feeff7973..d12a35c41b63 100644 --- a/src/main/java/seedu/address/storage/admin/XmlSerializableMakerManagerAdmins.java +++ b/src/main/java/seedu/address/storage/admin/XmlSerializableMakerManagerAdmins.java @@ -27,7 +27,6 @@ public class XmlSerializableMakerManagerAdmins { /** * Creates an empty XmlSerializableMakerManagerAdmins. * This empty constructor is required for marshalling. - * TODO: What is marshalling? */ public XmlSerializableMakerManagerAdmins() { admins = new ArrayList<>(); diff --git a/src/test/java/seedu/address/logic/commands/admin/AddAdminCommandTest.java b/src/test/java/seedu/address/logic/commands/admin/AddAdminCommandTest.java index 912b05009a3e..6a3c103aeddf 100644 --- a/src/test/java/seedu/address/logic/commands/admin/AddAdminCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/admin/AddAdminCommandTest.java @@ -114,8 +114,6 @@ public void execute_addAdmin_success() throws Exception { assertEquals(modelStub.adminList, Arrays.asList(adminToAdd)); } - //TODO: equals not tested - /** * A default model stub that has some methods failing */ diff --git a/src/test/java/seedu/address/logic/commands/admin/LoginCommandTest.java b/src/test/java/seedu/address/logic/commands/admin/LoginCommandTest.java index 646d0148574e..79a246b7579b 100644 --- a/src/test/java/seedu/address/logic/commands/admin/LoginCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/admin/LoginCommandTest.java @@ -47,7 +47,6 @@ public void execute_alreadyLoggedIn_throwsCommandException() throws Exception { ModelStub modelStub = new ModelStub(); Admin admin = new Admin(new Username("Notice how this is never made idiot proof"), new Password("oldPW")); modelStub.setLogin(admin); - //TODO: make modelManager.setLogin idiotProof thrown.expect(CommandException.class); thrown.expectMessage(LoginCommand.MESSAGE_ALREADY_LOGGED_IN); @@ -64,9 +63,6 @@ public void execute_wrongUsername_throwsCommandException() throws Exception { loginCommand.execute(modelStub, commandHistory); } - //TODO: test successful login by bypassing jBCrypt - //TODO: equals Method not tested - /** * A default model stub that has some methods failing */ diff --git a/src/test/java/seedu/address/logic/commands/admin/LogoutCommandTest.java b/src/test/java/seedu/address/logic/commands/admin/LogoutCommandTest.java index e42f13c8b424..408e4ecd951f 100644 --- a/src/test/java/seedu/address/logic/commands/admin/LogoutCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/admin/LogoutCommandTest.java @@ -53,8 +53,6 @@ public void execute_logout_successful() throws Exception { assertEquals(modelStub.isLoggedIn(), false); } - //TODO: did not test equals - /** * A default model stub that have some methods */ diff --git a/src/test/java/seedu/address/logic/commands/admin/RemoveAdminCommandTest.java b/src/test/java/seedu/address/logic/commands/admin/RemoveAdminCommandTest.java index ea6f047b5f22..183aca8c273e 100644 --- a/src/test/java/seedu/address/logic/commands/admin/RemoveAdminCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/admin/RemoveAdminCommandTest.java @@ -103,8 +103,6 @@ public void execute_removeLoggedIn_success() throws Exception { assertEquals(modelStub.isLoggedIn(), false); } - //TODO: equals not tested - /** * A default model stub that has some methods failing */