diff --git a/GourmetGrid User Guide.pdf b/GourmetGrid User Guide.pdf deleted file mode 100644 index 05ce12d3b38..00000000000 Binary files a/GourmetGrid User Guide.pdf and /dev/null differ diff --git a/docs/UserGuide.md b/docs/UserGuide.md index cfade0b8b63..5f8b8233399 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -424,7 +424,7 @@ GourmetGrid data are saved in the hard disk automatically after any command that ### Editing the data file -GourmetGrid data are saved automatically as a JSON file `[JAR file location]/data/addressbook.json`. Advanced users are welcome to update data directly by editing that data file. +GourmetGrid data are saved automatically as a JSON file `[JAR file location]/data/gourmetgrid.json`. Advanced users are welcome to update data directly by editing that data file. @@ -438,7 +438,7 @@ Furthermore, certain edits can cause GourmetGrid to behave in unexpected ways (e ## FAQ **Q**: How do I transfer my data to another Computer?
-**A**: Install the app in the other computer and overwrite the empty data file `[JAR file location]/data/addressbook.json` it creates with the file that contains the data of your previous GourmetGrid home folder. +**A**: Install the app in the other computer and overwrite the empty data file `[JAR file location]/data/gourmetgrid.json` it creates with the file that contains the data of your previous GourmetGrid home folder. -------------------------------------------------------------------------------------------------------------------- diff --git a/docs/images/Ui.png b/docs/images/Ui.png index b6fe281f43f..425dc424545 100644 Binary files a/docs/images/Ui.png and b/docs/images/Ui.png differ diff --git a/src/main/java/seedu/address/MainApp.java b/src/main/java/seedu/address/MainApp.java index 3d6bd06d5af..34a694d2c10 100644 --- a/src/main/java/seedu/address/MainApp.java +++ b/src/main/java/seedu/address/MainApp.java @@ -48,7 +48,7 @@ public class MainApp extends Application { @Override public void init() throws Exception { - logger.info("=============================[ Initializing AddressBook ]==========================="); + logger.info("=============================[ Initializing GourmetGrid ]==========================="); super.init(); AppParameters appParameters = AppParameters.parse(getParameters()); @@ -81,12 +81,12 @@ private Model initModelManager(Storage storage, ReadOnlyUserPrefs userPrefs) { addressBookOptional = storage.readAddressBook(); if (!addressBookOptional.isPresent()) { logger.info("Creating a new data file " + storage.getAddressBookFilePath() - + " populated with a sample AddressBook."); + + " populated with a sample version of GourmetGrid."); } initialData = addressBookOptional.orElseGet(SampleDataUtil::getSampleAddressBook); } catch (DataLoadingException e) { logger.warning("Data file at " + storage.getAddressBookFilePath() + " could not be loaded." - + " Will be starting with an empty AddressBook."); + + " Will be starting with an empty version of GourmetGrid."); initialData = new AddressBook(); } @@ -170,13 +170,13 @@ protected UserPrefs initPrefs(UserPrefsStorage storage) { @Override public void start(Stage primaryStage) { - logger.info("Starting AddressBook " + MainApp.VERSION); + logger.info("Starting GourmetGrid " + MainApp.VERSION); ui.start(primaryStage); } @Override public void stop() { - logger.info("============================ [ Stopping Address Book ] ============================="); + logger.info("============================ [ Stopping GourmetGrid ] ============================="); try { storage.saveUserPrefs(model.getUserPrefs()); } catch (IOException e) { diff --git a/src/main/java/seedu/address/commons/core/LogsCenter.java b/src/main/java/seedu/address/commons/core/LogsCenter.java index 8cf8e15a0f0..25ce2eb6bc3 100644 --- a/src/main/java/seedu/address/commons/core/LogsCenter.java +++ b/src/main/java/seedu/address/commons/core/LogsCenter.java @@ -20,7 +20,7 @@ public class LogsCenter { private static final int MAX_FILE_COUNT = 5; private static final int MAX_FILE_SIZE_IN_BYTES = (int) (Math.pow(2, 20) * 5); // 5MB - private static final String LOG_FILE = "addressbook.log"; + private static final String LOG_FILE = "gourmetgrid.log"; private static final Logger logger; // logger for this class private static Logger baseLogger; // to be used as the parent of all other loggers created by this class. private static Level currentLogLevel = Level.INFO; diff --git a/src/main/java/seedu/address/model/UserPrefs.java b/src/main/java/seedu/address/model/UserPrefs.java index 6be655fb4c7..c0947942e11 100644 --- a/src/main/java/seedu/address/model/UserPrefs.java +++ b/src/main/java/seedu/address/model/UserPrefs.java @@ -14,7 +14,7 @@ public class UserPrefs implements ReadOnlyUserPrefs { private GuiSettings guiSettings = new GuiSettings(); - private Path addressBookFilePath = Paths.get("data" , "addressbook.json"); + private Path addressBookFilePath = Paths.get("data" , "gourmetgrid.json"); /** * Creates a {@code UserPrefs} with default values. diff --git a/src/main/java/seedu/address/model/util/SampleDataUtil.java b/src/main/java/seedu/address/model/util/SampleDataUtil.java index 080347ad849..3ae6301e67f 100644 --- a/src/main/java/seedu/address/model/util/SampleDataUtil.java +++ b/src/main/java/seedu/address/model/util/SampleDataUtil.java @@ -21,20 +21,20 @@ public class SampleDataUtil { public static Person[] getSamplePersons() { return new Person[] { new Person(new Name("Alex Yeoh"), new Phone("87438807"), new Email("alexyeoh@example.com"), - new Address("Blk 30 Geylang Street 29, #06-40"), new Company("Alex Catering"), + new Address("Blk 30 Geylang Street 29, #01-40"), new Company("Alex Catering"), getTagSet("catering")), new Person(new Name("Bernice Yu"), new Phone("99272758"), new Email("berniceyu@example.com"), - new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"), new Company("Big Porks"), + new Address("Blk 30 Lorong 3 Serangoon Gardens Market, #01-18"), new Company("Big Porks"), getTagSet("fresh", "pork")), new Person(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("charlotte@example.com"), - new Address("Blk 11 Ang Mo Kio Street 74, #11-04"), new Company("Oliveiro Olives"), + new Address("Blk 11 Ang Mo Kio Street 74, #01-04"), new Company("Oliveiro Olives"), getTagSet("olives")), new Person(new Name("David Li"), new Phone("91031282"), new Email("lidavid@example.com"), - new Address("Blk 436 Serangoon Gardens Street 26, #16-43"), new Company("Chicken and Egg"), + new Address("Blk 436 Serangoon Gardens Street 26, #01-43"), new Company("Chicken and Egg"), getTagSet("eggs", "chicken")), new Person(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("irfan@example.com"), - new Address("Blk 47 Tampines Street 20, #17-35"), new Company("Fresh Frozen"), - getTagSet("frozen", "unfresh")) + new Address("Blk 47 Tampines Street 20, #01-35"), new Company("Fresh Frozen"), + getTagSet("frozen", "fresh")) }; }