diff --git a/src/main/java/seedu/address/logic/LogicManager.java b/src/main/java/seedu/address/logic/LogicManager.java index a68ecca60b7..f926387dfb9 100644 --- a/src/main/java/seedu/address/logic/LogicManager.java +++ b/src/main/java/seedu/address/logic/LogicManager.java @@ -19,8 +19,9 @@ import seedu.address.model.analytics.DashboardData; import seedu.address.model.person.Loan; import seedu.address.model.person.Person; -import seedu.address.storage.Storage; import seedu.address.model.tabindicator.TabIndicator; +import seedu.address.storage.Storage; + /** * The main LogicManager of the app. diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java index 4fdbb5f0189..41252360041 100644 --- a/src/main/java/seedu/address/model/Model.java +++ b/src/main/java/seedu/address/model/Model.java @@ -172,11 +172,6 @@ public interface Model { */ void setIsAnalyticsTab(Boolean isAnalyticsTab); - /** - * Sets the tab to the person tab. - * - * @param isPersonTab - */ void setToPersonTab(); void markLoan(Loan loanToMark); diff --git a/src/main/java/seedu/address/model/tabindicator/TabIndicator.java b/src/main/java/seedu/address/model/tabindicator/TabIndicator.java index 7fb21e6224a..b19e6c3db65 100644 --- a/src/main/java/seedu/address/model/tabindicator/TabIndicator.java +++ b/src/main/java/seedu/address/model/tabindicator/TabIndicator.java @@ -47,9 +47,11 @@ public boolean getIsAnalyticsTab() { public TabIndicator setIsAnalyticsTab(boolean newIsAnalyticsTab) { if (newIsAnalyticsTab) { - return new TabIndicator(false, newIsAnalyticsTab, false, this.isShowAllLoans, this.isShowLoaneeInfo); + return new TabIndicator(false, newIsAnalyticsTab, false, + this.isShowAllLoans, this.isShowLoaneeInfo); } - return new TabIndicator(this.isLoansTab, newIsAnalyticsTab, this.isPersonTab, this.isShowAllLoans, this.isShowLoaneeInfo); + return new TabIndicator(this.isLoansTab, newIsAnalyticsTab, this.isPersonTab, + this.isShowAllLoans, this.isShowLoaneeInfo); } public boolean getIsPersonTab() { @@ -58,9 +60,11 @@ public boolean getIsPersonTab() { public TabIndicator setIsPersonTab(boolean newIsPersonTab) { if (newIsPersonTab) { - return new TabIndicator(false, false, newIsPersonTab, this.isShowAllLoans, this.isShowLoaneeInfo); + return new TabIndicator(false, false, newIsPersonTab, + this.isShowAllLoans, this.isShowLoaneeInfo); } - return new TabIndicator(this.isLoansTab, this.isAnalyticsTab, newIsPersonTab, this.isShowAllLoans, this.isShowLoaneeInfo); + return new TabIndicator(this.isLoansTab, this.isAnalyticsTab, newIsPersonTab, + this.isShowAllLoans, this.isShowLoaneeInfo); } public boolean getIsShowAllLoans() { diff --git a/src/test/java/seedu/address/logic/commands/AddCommandTest.java b/src/test/java/seedu/address/logic/commands/AddCommandTest.java index db1aff4e0f8..1133bd16283 100644 --- a/src/test/java/seedu/address/logic/commands/AddCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/AddCommandTest.java @@ -10,12 +10,10 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import java.util.function.Predicate; import org.junit.jupiter.api.Test; -import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; import javafx.collections.ObservableList; import seedu.address.commons.core.GuiSettings; @@ -29,6 +27,7 @@ import seedu.address.model.person.Analytics; import seedu.address.model.person.Loan; import seedu.address.model.person.Person; +import seedu.address.model.tabindicator.TabIndicator; import seedu.address.testutil.PersonBuilder; public class AddCommandTest { @@ -169,12 +168,6 @@ public void updateFilteredPersonList(Predicate predicate) { throw new AssertionError("This method should not be called."); } - - @Override - public void setLoanList(List loanList) { - throw new AssertionError("This method should not be called."); - } - @Override public ObservableList getSortedLoanList() { throw new AssertionError("This method should not be called."); @@ -190,11 +183,6 @@ public void updateFilteredLoanList(Predicate predicate, boolean isShowAllL throw new AssertionError("This method should not be called."); } - @Override - public BooleanProperty getIsLoansTab() { - throw new AssertionError("This method should not be called."); - } - @Override public void setIsLoansTab(Boolean isLoansTab) { throw new AssertionError("This method should not be called."); @@ -215,28 +203,18 @@ public ObjectProperty getDashboardData() { throw new AssertionError("This method should not be called."); } - @Override - public BooleanProperty getIsPersonTab() { - throw new AssertionError("This method should not be called."); - } - - @Override - public void setIsPersonTab(Boolean isPersonTab) { - throw new AssertionError("This method should not be called."); - } - @Override public void setDualPanel() { throw new AssertionError("This method should not be called."); } @Override - public BooleanProperty getIsShowLoaneeInfo() { + public void setIsShowLoaneeInfo(Boolean isShowLoaneeInfo) { throw new AssertionError("This method should not be called."); } @Override - public void setIsShowLoaneeInfo(Boolean isShowLoaneeInfo) { + public ObjectProperty getTabIndicator() { throw new AssertionError("This method should not be called."); } @@ -260,11 +238,6 @@ public void setIsAnalyticsTab(Boolean isAnalyticsTab) { throw new AssertionError("This method should not be called."); } - @Override - public BooleanProperty getIsAnalyticsTab() { - throw new AssertionError("This method should not be called."); - } - @Override public void setToPersonTab() { throw new AssertionError("This method should not be called.");