Merge pull request #156 from AY1920S2-CS2103T-F10-3/branch-merge

Merge branch-merge to master

Author: BryanYap972

build.gradle

@@ -15,7 +15,7 @@ plugins {
 }
 
 // Specifies the entry point of the application
-mainClassName = 'seedu.address.Main'
+mainClassName = 'seedu.nova.Main'
 
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
@@ -67,7 +67,7 @@ dependencies {
 }
 
 shadowJar {
-    archiveName = 'addressbook.jar'
+    archiveName = 'nova.jar'
 
     destinationDir = file("${buildDir}/jar/")
 }
@@ -133,7 +133,7 @@ asciidoctor {
         idprefix: '',  // for compatibility with GitHub preview
         idseparator: '-',
         'site-root': "${sourceDir}",  // must be the same as sourceDir, do not modify
-        'site-name': 'NOVA',
+        'site-name': 'nova',
         'site-githuburl': 'https://github.com/AY1920S2-CS2103T-F10-3/main',
         'site-seedu': true,  // delete this line if your project is not a fork (not a SE-EDU project)
     ]

docs/DeveloperGuide.adoc

@@ -98,7 +98,7 @@ The `UI` component,
 image::LogicClassDiagram.png[]
 
 *API* :
-link:{repoURL}/src/main/java/seedu/address/logic/Logic.java[`Logic.java`]
+link:{repoURL}/src/main/java/seedu/nova/logic/Logic.java[`Logic.java`]
 
 .  `Logic` uses the `AddressBookParser` class to parse the user command.
 .  This results in a `Command` object which is executed by the `LogicManager`.
@@ -119,7 +119,7 @@ NOTE: The lifeline for `DeleteCommandParser` should end at the destroy marker (X
 .Structure of the Model Component
 image::ModelClassDiagram.png[]
 
-*API* : link:{repoURL}/src/main/java/seedu/address/model/Model.java[`Model.java`]
+*API* : link:{repoURL}/src/main/java/seedu/nova/model/Model.java[`Model.java`]
 
 The `Model`,
 
@@ -139,7 +139,7 @@ image:BetterModelClassDiagram.png[]
 .Structure of the Storage Component
 image::StorageClassDiagram.png[]
 
-*API* : link:{repoURL}/src/main/java/seedu/address/storage/Storage.java[`Storage.java`]
+*API* : link:{repoURL}/src/main/java/seedu/nova/storage/Storage.java[`Storage.java`]
 
 The `Storage` component,
 
@@ -149,7 +149,7 @@ The `Storage` component,
 [[Design-Commons]]
 === Common classes
 
-Classes used by multiple components are in the `seedu.addressbook.commons` package.
+Classes used by multiple components are in the `seedu.nova.commons` package.
 
 == Implementation
 
@@ -365,7 +365,7 @@ _{More to be added}_
 [appendix]
 == Use Cases
 
-(For all use cases below, the *System* is the `NOVA` and the *Actor* is the `student`, unless specified otherwise)
+(For all use cases below, the *System* is the `nova` and the *Actor* is the `student`, unless specified otherwise)
 
 [discrete]
 === Use case 1: Delete a contact

docs/Testing.adoc

@@ -35,11 +35,11 @@ See <<UsingGradle#, UsingGradle.adoc>> for more info on how to run tests using G
 We have three types of tests:
 
 .  _Unit tests_ targeting the lowest level methods/classes. +
-e.g. `seedu.address.commons.StringUtilTest`
+e.g. `seedu.NOVA.commons.StringUtilTest`
 .  _Integration tests_ that are checking the integration of multiple code units (those code units are assumed to be working). +
-e.g. `seedu.address.storage.StorageManagerTest`
+e.g. `seedu.NOVA.storage.StorageManagerTest`
 .  Hybrids of unit and integration tests. These test are checking multiple code units as well as how the are connected together. +
-e.g. `seedu.address.logic.LogicManagerTest`
+e.g. `seedu.NOVA.logic.LogicManagerTest`
 
 
 == Troubleshooting Testing

docs/templates/helpers.rb

@@ -45,7 +45,7 @@ module Slim::Helpers
 
   ##
   # Creates an HTML tag with the given name and optionally attributes. Can take
-  # a block that will run between the opening and closing tags.
+  # a block that will run between the opening and closing categories.
   #
   # @param name [#to_s] the name of the tag.
   # @param attributes [Hash]
@@ -207,11 +207,11 @@ def html_meta_if(name, content)
     %(<meta name="#{name}" content="#{content}">) if content
   end
 
-  # Returns formatted style/link and script tags for header.
+  # Returns formatted style/link and script categories for header.
   def styles_and_scripts
     scripts = []
     styles = []
-    tags = []
+    categories = []
 
     stylesheet = attr :stylesheet
     stylesdir = attr :stylesdir, ''
@@ -280,21 +280,21 @@ def styles_and_scripts
 
     styles.each do |item|
       if item.key?(:text)
-        tags << html_tag(:style, {}, item[:text])
+        categories << html_tag(:style, {}, item[:text])
       else
-        tags << html_tag(:link, rel: 'stylesheet', href: urlize(*item[:href]))
+        categories << html_tag(:link, rel: 'stylesheet', href: urlize(*item[:href]))
       end
     end
 
     scripts.each do |item|
       if item.key? :text
-        tags << html_tag(:script, {type: item[:type]}, item[:text])
+        categories << html_tag(:script, {type: item[:type]}, item[:text])
       else
-        tags << html_tag(:script, type: item[:type], src: urlize(*item[:src]))
+        categories << html_tag(:script, type: item[:type], src: urlize(*item[:src]))
       end
     end
 
-    tags.join "\n"
+    categories.join "\n"
   end
 
 end

docs/tutorials/AddRemark.adoc

@@ -34,11 +34,11 @@ For now, let's keep `RemarkCommand` as simple as possible and print some output.
 We accomplish that by returning a `CommandResult` with an accompanying message.
 
 .RemarkCommand.java
-[source, java]
+[source,java]
 ----
-package seedu.address.logic.commands;
+package seedu.nova.logic.commands;
 
-import seedu.address.model.Model;
+import seedu.nova.model.Model;
 
 /**
  * Changes the remark of an existing person in the address book.
@@ -108,9 +108,9 @@ We start by modifying the constructor of `RemarkCommand` to accept an `Index` an
 While we are at it, let's change the error message to echo the values.
 While this is not a replacement for tests, it is an obvious way to tell if our code is functioning as intended.
 
-[source, java]
+[source,java]
 ----
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.nova.commons.util.CollectionUtil.requireAllNonNull;
 //...
 public class RemarkCommand extends Command {
     //...
@@ -273,7 +273,7 @@ Simply add
 private Label remark;
 ```
 
-to link:https://github.com/nus-cs2103-AY1920S1/addressbook-level3/commit/2758455583f0101ed918a318fc75679270843a0d#diff-0c6b6abcfac8c205e075294f25e851fe[`seedu.address.ui.PersonCard`].
+to link:https://github.com/nus-cs2103-AY1920S1/addressbook-level3/commit/2758455583f0101ed918a318fc75679270843a0d#diff-0c6b6abcfac8c205e075294f25e851fe[`seedu.nova.ui.PersonCard`].
 `@FXML` is an annotation that marks a private or protected field and makes it accessible to FXML.
 It might sound like Greek to you right now, don't worry -- we will get back to it later.
 

docs/tutorials/RemovingFields.adoc

@@ -16,15 +16,15 @@ Perfection is achieved, not when there is nothing more to add, but when there is
 When working on Address Book, you will most likely find that some features and fields that are no longer necessary.
 In scenarios like this, you can consider refactoring the existing `Person` model to suit your use case.
 
-In this tutorial, we'll do exactly just that and remove the `address` field from `Person`.
+In this tutorial, we'll do exactly just that and remove the `nova` field from `Person`.
 
 == Safely deleting `Address`
 
 Fortunately, the IntelliJ IDEA provides a robust refactoring tool that can identify _most_ usages.
 Let's try to use it as much as we can.
 
 === Assisted refactoring
-The `address` field in `Person` is actually an instance of the `seedu.address.model.person.Address` class.
+The `nova` field in `Person` is actually an instance of the `seedu.address.model.person.Address` class.
 Since removing the `Address` class will break the application, we start by identifying ``Address``'s usages.
 This allows us to see code that depends on `Address` to function properly and edit them on a case-by-case basis.
 Right-click the `Address` class and select `Refactor` > `Safe Delete` through the menu.
@@ -45,14 +45,14 @@ Other usages like in `EditPersonDescriptor` may require more careful inspection.
 
 Let's try removing references to `Address` in `EditPersonDescriptor`.
 
-. Safe delete the field `address` in `EditPersonDescriptor`
+. Safe delete the field `nova` in `EditPersonDescriptor`
 . Select `Yes` when prompted to remove getters and setters
 . Select `View Usages` again image:UnsafeDeleteOnField.png[width=1145px, height=583px]
-. Remove the usages of `address` and select `Do refactor` when you are done.
+. Remove the usages of `nova` and select `Do refactor` when you are done.
 +
 TIP: Removing usages may result in errors.
 Exercise discretion and fix them.
-For example, removing the `address` field from the `Person` class will require you to modify its constructor.
+For example, removing the `nova` field from the `Person` class will require you to modify its constructor.
 
 . Repeat the steps for the remaining usages of `Address`
 
@@ -61,7 +61,7 @@ After you are done, verify that the application still works by compiling and run
 === Manual refactoring
 
 Unfortunately, there are usages of `Address` that IntelliJ IDEA cannot identify.
-You can find them by searching for instances of the word `address` in your code (`Edit` > `Find` > `Find in path`).
+You can find them by searching for instances of the word `nova` in your code (`Edit` > `Find` > `Find in path`).
 
 Places of interest to look out for would be resources used by the application.
 `main/resources` contains images and `fxml` files used by the application and `test/resources` contains test data.