Morph UI and Integrate Anakin components

src/main/java/seedu/address/MainApp.java

@@ -18,20 +18,20 @@
 import seedu.address.commons.exceptions.DataConversionException;
 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.logic.AnakinLogic;
+import seedu.address.logic.AnakinLogicManager;
+import seedu.address.model.Anakin;
+import seedu.address.model.AnakinModel;
+import seedu.address.model.AnakinModelManager;
+import seedu.address.model.AnakinReadOnlyAnakin;
 import seedu.address.model.UserPrefs;
-import seedu.address.model.util.SampleDataUtil;
-import seedu.address.storage.AddressBookStorage;
+import seedu.address.model.util.AnakinSampleDataUtil;
+import seedu.address.storage.AnakinAnakinStorage;
+import seedu.address.storage.AnakinStorage;
+import seedu.address.storage.AnakinStorageManager;
+import seedu.address.storage.AnakinXmlAnakinStorage;
 import seedu.address.storage.JsonUserPrefsStorage;
-import seedu.address.storage.Storage;
-import seedu.address.storage.StorageManager;
 import seedu.address.storage.UserPrefsStorage;
-import seedu.address.storage.XmlAddressBookStorage;
 import seedu.address.ui.Ui;
 import seedu.address.ui.UiManager;
 
@@ -45,60 +45,61 @@ public class MainApp extends Application {
     private static final Logger logger = LogsCenter.getLogger(MainApp.class);
 
     protected Ui ui;
-    protected Logic logic;
-    protected Storage storage;
-    protected Model model;
     protected Config config;
     protected UserPrefs userPrefs;
+    protected AnakinLogic logic;
+    protected AnakinModel model;
+    protected AnakinStorage storage;
 
 
     @Override
     public void init() throws Exception {
-        logger.info("=============================[ Initializing AddressBook ]===========================");
+        logger.info("=============================[ Initializing Anakin ]===========================");
         super.init();
 
         AppParameters appParameters = AppParameters.parse(getParameters());
         config = initConfig(appParameters.getConfigPath());
 
         UserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(config.getUserPrefsFilePath());
         userPrefs = initPrefs(userPrefsStorage);
-        AddressBookStorage addressBookStorage = new XmlAddressBookStorage(userPrefs.getAddressBookFilePath());
-        storage = new StorageManager(addressBookStorage, userPrefsStorage);
+
+        AnakinAnakinStorage anakinStorage = new AnakinXmlAnakinStorage(userPrefs.getAnakinFilePath());
+        storage = new AnakinStorageManager(anakinStorage, userPrefsStorage);
 
         initLogging(config);
 
         model = initModelManager(storage, userPrefs);
 
-        logic = new LogicManager(model);
+        logic = new AnakinLogicManager(model);
 
         ui = new UiManager(logic, config, userPrefs);
 
         initEventsCenter();
     }
 
     /**
-     * Returns a {@code ModelManager} with the data from {@code storage}'s address book and {@code userPrefs}. <br>
-     * 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 anakin and {@code userPrefs}. <br>
+     * The data from the sample anakin will be used instead if {@code storage}'s anakin is not found,
+     * or an empty anakin will be used instead if errors occur when reading {@code storage}'s anakin.
      */
-    private Model initModelManager(Storage storage, UserPrefs userPrefs) {
-        Optional<ReadOnlyAddressBook> addressBookOptional;
-        ReadOnlyAddressBook initialData;
+    private AnakinModel initModelManager(AnakinStorage storage, UserPrefs userPrefs) {
+        Optional<AnakinReadOnlyAnakin> anakinOptional;
+        AnakinReadOnlyAnakin initialData;
         try {
-            addressBookOptional = storage.readAddressBook();
-            if (!addressBookOptional.isPresent()) {
-                logger.info("Data file not found. Will be starting with a sample AddressBook");
+            anakinOptional = storage.readAnakin();
+            if (!anakinOptional.isPresent()) {
+                logger.info("Data file not found. Will be starting with a sample Anakin");
             }
-            initialData = addressBookOptional.orElseGet(SampleDataUtil::getSampleAddressBook);
+            initialData = anakinOptional.orElseGet(AnakinSampleDataUtil::getSampleAnakin);
         } catch (DataConversionException e) {
-            logger.warning("Data file not in the correct format. Will be starting with an empty AddressBook");
-            initialData = new AddressBook();
+            logger.warning("Data file not in the correct format. Will be starting with an empty Anakin");
+            initialData = new Anakin();
         } catch (IOException e) {
-            logger.warning("Problem while reading from the file. Will be starting with an empty AddressBook");
-            initialData = new AddressBook();
+            logger.warning("Problem while reading from the file. Will be starting with an empty Anakin");
+            initialData = new Anakin();
         }
 
-        return new ModelManager(initialData, userPrefs);
+        return new AnakinModelManager(initialData, userPrefs);
     }
 
     private void initLogging(Config config) {
@@ -159,7 +160,7 @@ protected UserPrefs initPrefs(UserPrefsStorage storage) {
                     + "Using default user prefs");
             initializedPrefs = new UserPrefs();
         } catch (IOException e) {
-            logger.warning("Problem while reading from the file. Will be starting with an empty AddressBook");
+            logger.warning("Problem while reading from the file. Will be starting with an empty Anakin");
             initializedPrefs = new UserPrefs();
         }
 
@@ -179,13 +180,13 @@ private void initEventsCenter() {
 
     @Override
     public void start(Stage primaryStage) {
-        logger.info("Starting AddressBook " + MainApp.VERSION);
+        logger.info("Starting Anakin " + MainApp.VERSION);
         ui.start(primaryStage);
     }
 
     @Override
     public void stop() {
-        logger.info("============================ [ Stopping Address Book ] =============================");
+        logger.info("============================ [ Stopping Anakin ] =============================");
         ui.stop();
         try {
             storage.saveUserPrefs(userPrefs);

src/main/java/seedu/address/commons/core/Config.java

@@ -13,7 +13,7 @@ public class Config {
     public static final Path DEFAULT_CONFIG_FILE = Paths.get("config.json");
 
     // Config values customizable through config file
-    private String appTitle = "Address App";
+    private String appTitle = "Anakin";
     private Level logLevel = Level.INFO;
     private Path userPrefsFilePath = Paths.get("preferences.json");
 

src/main/java/seedu/address/commons/events/ui/CardPanelSelectionChangedEvent.java

@@ -0,0 +1,26 @@
+package seedu.address.commons.events.ui;
+
+import seedu.address.commons.events.BaseEvent;
+import seedu.address.model.anakindeck.AnakinCard;
+
+/**
+ * Represents a selection change in the Card List Panel
+ */
+public class CardPanelSelectionChangedEvent extends BaseEvent {
+
+
+    private final AnakinCard newSelection;
+
+    public CardPanelSelectionChangedEvent(AnakinCard newSelection) {
+        this.newSelection = newSelection;
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName();
+    }
+
+    public AnakinCard getNewSelection() {
+        return newSelection;
+    }
+}

src/main/java/seedu/address/commons/events/ui/DeckPanelSelectionChangedEvent.java

@@ -0,0 +1,26 @@
+package seedu.address.commons.events.ui;
+
+import seedu.address.commons.events.BaseEvent;
+import seedu.address.model.anakindeck.AnakinDeck;
+
+/**
+ * Represents a selection change in the Deck List Panel
+ */
+public class DeckPanelSelectionChangedEvent extends BaseEvent {
+
+
+    private final AnakinDeck newSelection;
+
+    public DeckPanelSelectionChangedEvent(AnakinDeck newSelection) {
+        this.newSelection = newSelection;
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName();
+    }
+
+    public AnakinDeck getNewSelection() {
+        return newSelection;
+    }
+}

src/main/java/seedu/address/logic/AnakinLogic.java

@@ -4,6 +4,7 @@
 import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.anakindeck.AnakinCard;
 import seedu.address.model.anakindeck.AnakinDeck;
 
 /**
@@ -19,9 +20,12 @@ public interface AnakinLogic {
      */
     CommandResult execute(String commandText) throws CommandException, ParseException;
 
-    /** Returns an unmodifiable view of the filtered list of persons */
+    /** Returns an unmodifiable view of the filtered list of decks */
     ObservableList<AnakinDeck> getFilteredDeckList();
 
+    /** Returns an unmodifiable view of the filtered list of cards */
+    ObservableList<AnakinCard> getFilteredCardList();
+
     /** Returns the list of input entered by the user, encapsulated in a {@code ListElementPointer} object */
     ListElementPointer getHistorySnapshot();
 }

src/main/java/seedu/address/logic/AnakinLogicManager.java

@@ -3,7 +3,6 @@
 import java.util.logging.Logger;
 
 import javafx.collections.ObservableList;
-
 import seedu.address.commons.core.ComponentManager;
 import seedu.address.commons.core.LogsCenter;
 import seedu.address.logic.anakincommands.AnakinCommand;
@@ -12,6 +11,7 @@
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.AnakinModel;
+import seedu.address.model.anakindeck.AnakinCard;
 import seedu.address.model.anakindeck.AnakinDeck;
 
 /**
@@ -46,6 +46,11 @@ public ObservableList<AnakinDeck> getFilteredDeckList() {
         return model.getFilteredDeckList();
     }
 
+    @Override
+    public ObservableList<AnakinCard> getFilteredCardList() {
+        return model.getFilteredCardList();
+    }
+
     @Override
     public ListElementPointer getHistorySnapshot() {
         return new ListElementPointer(history.getHistory());

src/main/java/seedu/address/logic/anakinparser/AnakinNewDeckCommandParser.java → src/main/java/seedu/address/logic/AnakinParser/AnakinNewDeckCommandParser.java

@@ -1,16 +1,11 @@
 package seedu.address.logic.anakinparser;
 
 import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ANSWER;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_DECK;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_FILEPATH;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_QUESTION;
 
 import java.util.stream.Stream;
 
 import seedu.address.logic.anakincommands.AnakinNewDeckCommand;
-import seedu.address.logic.commands.AddCommand;
 import seedu.address.logic.parser.ArgumentMultimap;
 import seedu.address.logic.parser.ArgumentTokenizer;
 import seedu.address.logic.parser.Prefix;
@@ -31,25 +26,16 @@ public class AnakinNewDeckCommandParser implements AnakinParserInterface<AnakinN
      */
     public AnakinNewDeckCommand parse(String args) throws ParseException {
         ArgumentMultimap argMultimap =
-                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_DECK,
-                        PREFIX_ANSWER, PREFIX_QUESTION, PREFIX_FILEPATH);
+                ArgumentTokenizer.tokenize(args, PREFIX_NAME);
 
-        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_DECK,
-                PREFIX_ANSWER, PREFIX_QUESTION, PREFIX_FILEPATH)
+        if (!arePrefixesPresent(argMultimap, PREFIX_NAME)
                 || !argMultimap.getPreamble().isEmpty()) {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
-                    AddCommand.MESSAGE_USAGE));
+                    AnakinNewDeckCommand.MESSAGE_USAGE));
         }
 
-        /*
-        Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
-        Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
-        Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
-        Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
-        Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
-        */
-
-        AnakinDeck deck = new AnakinDeck(new Name("Deck1")); //TO DO
+        Name name = AnakinParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
+        AnakinDeck deck = new AnakinDeck(name);
 
         return new AnakinNewDeckCommand(deck);
     }

src/main/java/seedu/address/model/Anakin.java

@@ -23,6 +23,9 @@ public class Anakin implements AnakinReadOnlyAnakin {
     // Represent the current list of cards (when user get into a deck)
     private AnakinUniqueCardList cards;
 
+    // Represents the list of cards displayed on the UI
+    private AnakinUniqueCardList displayedCards;
+
     /*
      * The 'unusual' code block below is an non-static initialization block, sometimes used to avoid duplication
      * between constructors. See https://docs.oracle.com/javase/tutorial/java/javaOO/initial.html
@@ -32,6 +35,8 @@ public class Anakin implements AnakinReadOnlyAnakin {
      */
     {
         decks = new AnakinUniqueDeckList();
+        cards = new AnakinUniqueCardList();
+        displayedCards = new AnakinUniqueCardList();
     }
 
     public Anakin() { }
@@ -54,13 +59,22 @@ public void setDecks(List<AnakinDeck> decks) {
         this.decks.setDecks(decks);
     }
 
+    /**
+     * Replaces the contents of the card list with {@code cards}.
+     * {@code cards} must not contain duplicate cards.
+     */
+    public void setCards(List<AnakinCard> cards) {
+        this.cards.setCards(cards);
+    }
+
     /**
      * Resets the existing data of this {@code Anakin} with {@code newData}.
      */
     public void resetData(AnakinReadOnlyAnakin newData) {
         requireNonNull(newData);
 
         setDecks(newData.getDeckList());
+        setCards(newData.getCardList());
     }
 
     //// navigating operations
@@ -72,6 +86,7 @@ public void getIntoDeck(AnakinDeck deck) {
         requireNonNull(deck);
         isInsideDeck = true;
         cards = deck.getCards();
+        displayedCards.setCards(deck.getCards());
     }
 
     /**
@@ -82,7 +97,8 @@ public void getOutOfDeck() {
             throw new DeckNotFoundException();
         }
         isInsideDeck = false;
-        cards = null;
+        cards = new AnakinUniqueCardList();
+        displayedCards.clear();
     }
 
     /**
@@ -151,6 +167,7 @@ public void addCard(AnakinCard c) {
             throw new DeckNotFoundException();
         }
         cards.add(c);
+        displayedCards.setCards(cards);
     }
 
     /**
@@ -164,6 +181,7 @@ public void updateCard(AnakinCard target, AnakinCard editedCard) {
             throw new DeckNotFoundException();
         }
         cards.setCard(target, editedCard);
+        displayedCards.setCards(cards);
     }
 
     /**
@@ -175,6 +193,7 @@ public void removeCard(AnakinCard key) {
             throw new DeckNotFoundException();
         }
         cards.remove(key);
+        displayedCards.setCards(cards);
     }
 
     //// util methods
@@ -192,10 +211,7 @@ public ObservableList<AnakinDeck> getDeckList() {
 
     @Override
     public ObservableList<AnakinCard> getCardList() {
-        if (!isInsideDeck()) {
-            throw new DeckNotFoundException();
-        }
-        return cards.asUnmodifiableObservableList();
+        return displayedCards.asUnmodifiableObservableList();
     }
 
     @Override