diff --git a/src/main/java/seedu/weme/logic/parser/ParserUtil.java b/src/main/java/seedu/weme/logic/parser/ParserUtil.java index 4354e3a17d2..fc7e820d63c 100644 --- a/src/main/java/seedu/weme/logic/parser/ParserUtil.java +++ b/src/main/java/seedu/weme/logic/parser/ParserUtil.java @@ -1,7 +1,6 @@ package seedu.weme.logic.parser; import static java.util.Objects.requireNonNull; -import static seedu.weme.model.ModelContext.CONTEXT_ARCHIVE; import static seedu.weme.model.ModelContext.CONTEXT_EXPORT; import static seedu.weme.model.ModelContext.CONTEXT_IMPORT; import static seedu.weme.model.ModelContext.CONTEXT_MEMES; @@ -49,7 +48,6 @@ public static WemeParser forContext(ModelContext modelContext) { case CONTEXT_EXPORT: return EXPORT_PARSER; case CONTEXT_TEMPLATES: - case CONTEXT_ARCHIVE: case CONTEXT_STATISTICS: // TODO: This is a temporary placeholder until all tabs have been implemented return new WemeParser() { @@ -70,8 +68,6 @@ public static ModelContext parseContext(String context) throws ParseException { return CONTEXT_MEMES; } else if (trimmedContext.equals(CONTEXT_TEMPLATES.getContextName())) { return CONTEXT_TEMPLATES; - } else if (trimmedContext.equals(CONTEXT_ARCHIVE.getContextName())) { - return CONTEXT_ARCHIVE; } else if (trimmedContext.equals(CONTEXT_STATISTICS.getContextName())) { return CONTEXT_STATISTICS; } else if (trimmedContext.equals(CONTEXT_EXPORT.getContextName())) { diff --git a/src/main/java/seedu/weme/model/ModelContext.java b/src/main/java/seedu/weme/model/ModelContext.java index be4a9c31711..e06db42abca 100644 --- a/src/main/java/seedu/weme/model/ModelContext.java +++ b/src/main/java/seedu/weme/model/ModelContext.java @@ -7,7 +7,6 @@ public enum ModelContext { // List of all contexts in the application. CONTEXT_MEMES("memes"), CONTEXT_TEMPLATES("templates"), - CONTEXT_ARCHIVE("archive"), CONTEXT_STATISTICS("statistics"), CONTEXT_EXPORT("export"), CONTEXT_IMPORT("import"); diff --git a/src/main/java/seedu/weme/ui/MainWindow.java b/src/main/java/seedu/weme/ui/MainWindow.java index 708bf204248..3e8865bb1e6 100644 --- a/src/main/java/seedu/weme/ui/MainWindow.java +++ b/src/main/java/seedu/weme/ui/MainWindow.java @@ -40,7 +40,6 @@ public class MainWindow extends UiPart { // App content for different tabs private StackPane memesPanel; private StackPane templatesPanel; - private StackPane archivePanel; private StackPane statisticsPanel; private StackPane exportPanel; private StackPane importPanel; @@ -148,7 +147,6 @@ private void fillPeripherals() { private void fillAppContent() { memesPanel = new StackPane(); templatesPanel = new StackPane(); - archivePanel = new StackPane(); statisticsPanel = new StackPane(); exportPanel = new StackPane(); importPanel = new StackPane(); @@ -193,9 +191,6 @@ private void setAppContent(ModelContext context) { case CONTEXT_TEMPLATES: appContentPlaceholder.getChildren().add(templatesPanel); break; - case CONTEXT_ARCHIVE: - appContentPlaceholder.getChildren().add(archivePanel); - break; case CONTEXT_STATISTICS: appContentPlaceholder.getChildren().add(statisticsPanel); break; diff --git a/src/main/java/seedu/weme/ui/TabBar.java b/src/main/java/seedu/weme/ui/TabBar.java index 6dcf91f0570..142f06b453c 100644 --- a/src/main/java/seedu/weme/ui/TabBar.java +++ b/src/main/java/seedu/weme/ui/TabBar.java @@ -24,8 +24,6 @@ public class TabBar extends UiPart { @FXML private VBox templatesTab; @FXML - private VBox archiveTab; - @FXML private VBox statisticsTab; @FXML private VBox exportTab; @@ -58,8 +56,6 @@ private VBox getContextTab(ModelContext context) { return memesTab; case CONTEXT_TEMPLATES: return templatesTab; - case CONTEXT_ARCHIVE: - return archiveTab; case CONTEXT_STATISTICS: return statisticsTab; case CONTEXT_EXPORT: diff --git a/src/main/resources/images/archive_tab.png b/src/main/resources/images/archive_tab.png deleted file mode 100644 index 108f28870e1..00000000000 Binary files a/src/main/resources/images/archive_tab.png and /dev/null differ diff --git a/src/main/resources/view/TabBar.fxml b/src/main/resources/view/TabBar.fxml index 69dbd98d45b..be075837517 100644 --- a/src/main/resources/view/TabBar.fxml +++ b/src/main/resources/view/TabBar.fxml @@ -37,19 +37,6 @@ - - - - - - - - - - - -