Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CS2103T-T17-1] My Projects #125

Open
wants to merge 195 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
195 commits
Select commit Hold shift + click to select a range
c539bca
Add remarkCommand without test
ccyccyccy Sep 25, 2019
f52be31
Merge pull request #1 from ccyccyccy/TP-Tutorial
ccyccyccy Sep 25, 2019
10ad2ef
Add product screenshot
ccyccyccy Sep 30, 2019
210fd20
Merge pull request #2 from ccyccyccy/ui-screenshot
ccyccyccy Sep 30, 2019
fb493ee
Edit team info (#5)
ccyccyccy Oct 2, 2019
70edc2b
Travis test
ccyccyccy Oct 2, 2019
d6742ac
Modify build status, fix checkstyle errors
ccyccyccy Oct 2, 2019
87768a3
Update UserGuide.adoc
ccyccyccy Oct 2, 2019
4f409de
Update AboutUs.adoc
philipalexanderb Oct 2, 2019
a27aab4
Update AboutUs.adoc
philipalexanderb Oct 2, 2019
8813681
Update AboutUs.adoc
philipalexanderb Oct 2, 2019
3acce65
Update AboutUs.adoc
jerryk1997 Oct 2, 2019
9b6d0c3
Add files via upload
R-D-D-D Oct 2, 2019
0539fdd
Update AboutUs.adoc
R-D-D-D Oct 2, 2019
dc42645
Update AboutUs.adoc
ccyccyccy Oct 2, 2019
49a0cb3
Add files via upload
ccyccyccy Oct 2, 2019
b78ffa2
Update AboutUs.adoc
ccyccyccy Oct 3, 2019
ca42554
Add files via upload
jerryk1997 Oct 9, 2019
7e60fb6
Update AboutUs.adoc
jerryk1997 Oct 9, 2019
f2df73d
Add files via upload
fadisng Oct 9, 2019
2819010
Update AboutUs.adoc
fadisng Oct 9, 2019
11fd146
Add project model (#13)
R-D-D-D Oct 9, 2019
54f3f08
Add files via upload
fadisng Oct 10, 2019
5749218
Add files via upload
fadisng Oct 10, 2019
735b9b7
Updated DG
Oct 10, 2019
acf6647
Update AboutUs.adoc
fadisng Oct 10, 2019
35d5c2d
Update AboutUs.adoc
fadisng Oct 10, 2019
c38bc5b
Updated DG
Oct 10, 2019
190f6b8
updated use case
R-D-D-D Oct 10, 2019
b3c00a6
Update DeveloperGuide.adoc
jerryk1997 Oct 10, 2019
080ec0a
Merge remote-tracking branch 'upstream/master'
Oct 10, 2019
679cca6
no message
Oct 10, 2019
6242e6e
Updated style for use cases
R-D-D-D Oct 10, 2019
d6cbf44
Delete Ui.png
R-D-D-D Oct 10, 2019
ac0d36c
Upload Ui.png
R-D-D-D Oct 10, 2019
fd1e2d0
Delete Ui.png
R-D-D-D Oct 10, 2019
5a548f3
Add Ui.png
R-D-D-D Oct 10, 2019
8fb42c5
Update DeveloperGuide.adoc
fadisng Oct 11, 2019
c7f0dd0
Update DeveloperGuide.adoc
fadisng Oct 11, 2019
977d5b9
Update README.adoc
fadisng Oct 11, 2019
2875674
Fix merge conflicts (#17)
ccyccyccy Oct 11, 2019
6361ec7
no message
Oct 12, 2019
e7f333f
Commented out all the test cases (#29)
ccyccyccy Oct 13, 2019
7818989
Fix build (#30)
ccyccyccy Oct 13, 2019
2aa4a77
Auto publish test
ccyccyccy Oct 13, 2019
0ef3130
Added addMemberCommand and addMemberCommandParse.
Oct 13, 2019
bbee666
GUI: Added formatting to flowpane of members for projectlistcard
Oct 14, 2019
c88255d
Added removeMember and parser
Oct 15, 2019
21c9ccf
Added removeMember and parser
Oct 15, 2019
e6e3d35
Added meeting class.
philipalexanderb Oct 16, 2019
dc82af6
Merge pull request #31 from philipalexanderb/Add-Meeting-Class
philipalexanderb Oct 16, 2019
65914d9
ChechStyle corrected for meeting implementation
philipalexanderb Oct 16, 2019
8bf568c
Merge pull request #32 from philipalexanderb/Add-Meeting-Class
philipalexanderb Oct 16, 2019
6f78914
add-task-class
fadisng Oct 16, 2019
49f71c3
add-task-class
fadisng Oct 16, 2019
994b8a4
Merge pull request #33 from fadisng/add-task-class
fadisng Oct 16, 2019
2a594bb
no message
Oct 16, 2019
0336011
Added and integrated Member into project
Oct 16, 2019
3c2441b
no message
Oct 16, 2019
363d8f7
Merge pull request #1 from jerryk1997/member
jerryk1997 Oct 16, 2019
080074c
Timetable feature (#36)
ccyccyccy Oct 16, 2019
db36df3
Add finance tracker (#37)
R-D-D-D Oct 16, 2019
1a78724
Add profile image
R-D-D-D Oct 17, 2019
c2848c1
Fixed nvr merge
Oct 17, 2019
7382b52
Merge pull request #42 from jerryk1997/master
jerryk1997 Oct 17, 2019
a93a4f5
no message
Oct 17, 2019
297fb70
Fix build (#44)
ccyccyccy Oct 18, 2019
dd8a9c8
no message
Oct 18, 2019
089c31e
Merge branch 'master' into master
jerryk1997 Oct 18, 2019
a82bbdc
Merge pull request #43 from jerryk1997/master
jerryk1997 Oct 18, 2019
fbcaedd
update Storage and Model diagrams
fadisng Oct 24, 2019
04ea561
Merge pull request #51 from fadisng/master
fadisng Oct 24, 2019
da4a1f1
update dg images
fadisng Oct 25, 2019
05fc6cb
Merge pull request #52 from fadisng/master
fadisng Oct 25, 2019
8578465
EditTask
fadisng Oct 25, 2019
4a92477
Changed Constructor of Project
Oct 25, 2019
a1c37da
no message
Oct 25, 2019
091325c
Delete gradlew.bat
jerryk1997 Oct 25, 2019
6341862
no message
Oct 25, 2019
b2bd33d
no message
Oct 25, 2019
f110ec7
no message
Oct 25, 2019
20a848e
no message
Oct 25, 2019
757b5fe
Merge pull request #53 from jerryk1997/GUI-changes(switching)
jerryk1997 Oct 26, 2019
071d2c7
Update DG for timetable implementation (#54)
ccyccyccy Oct 26, 2019
7214aca
added sorting for tasks
fadisng Oct 27, 2019
d78b872
added editTask and sortTask commands
fadisng Oct 27, 2019
3a3d58e
Merge pull request #57 from fadisng/master
fadisng Oct 27, 2019
1a05bc8
update UG (#58)
fadisng Oct 27, 2019
e9d3931
Add ability to read data from formatted text file, and read and write…
ccyccyccy Oct 27, 2019
39f095c
Adding email feature (#59)
philipalexanderb Oct 28, 2019
5f90290
Adding email feature (#60)
philipalexanderb Oct 28, 2019
b2d4172
Add profile picture (#56)
jerryk1997 Oct 28, 2019
b149e54
Fixed Profile picture layout (#61)
jerryk1997 Oct 28, 2019
09092fa
NUSMods integration done (#62)
ccyccyccy Oct 28, 2019
73161a0
Update UserGuide.adoc (#64)
philipalexanderb Oct 28, 2019
7b651ba
Update UserGuide.adoc (#66)
philipalexanderb Oct 28, 2019
45d19b1
Advanced finance features (#67)
R-D-D-D Oct 28, 2019
5f22452
Add error checking to generate timeslot (#65)
ccyccyccy Oct 28, 2019
96a0a83
Edit UG (#68)
ccyccyccy Oct 28, 2019
70b0a1b
Updated UG (#69)
jerryk1997 Oct 29, 2019
fed3b31
Back feature (#70)
R-D-D-D Oct 29, 2019
1d55411
Updated UG (#71)
jerryk1997 Oct 29, 2019
39b457e
Updated on finance UG (#72)
R-D-D-D Oct 29, 2019
66ee41e
added sortSpending (#73)
fadisng Oct 29, 2019
19db8ad
Fixed Back feature (#74)
R-D-D-D Oct 30, 2019
719ead8
Fixed meetings display (#75)
philipalexanderb Oct 30, 2019
6b6c24a
edited some errors (#76)
fadisng Oct 30, 2019
28d46e8
Delete meeting command (#77)
philipalexanderb Oct 30, 2019
ddbbdfc
Update UserGuide.adoc (#78)
philipalexanderb Oct 30, 2019
3e8e7e4
Check for checkedout (#80)
R-D-D-D Oct 30, 2019
fde4565
Refactor TImeSlotGenerator class (#84)
ccyccyccy Oct 31, 2019
076138e
Update UG (#85)
ccyccyccy Oct 31, 2019
04e73a7
Timetable visualization (#83)
ccyccyccy Oct 31, 2019
3e7c93b
Edit developer guide (#86)
ccyccyccy Oct 31, 2019
38f260a
Updated GUI (#145)
jerryk1997 Nov 4, 2019
1753e6b
edited bugs from PE (#147)
fadisng Nov 4, 2019
52bf674
Add more test cases, remove guava dependency (#149)
ccyccyccy Nov 4, 2019
1c4ed6a
Add timetable visualization for generate, rename TimeTable to Timetab…
ccyccyccy Nov 4, 2019
d8a1344
Improve code-quality of timetable feature (#153)
ccyccyccy Nov 6, 2019
ff5a5aa
Performance tracking (#154)
jerryk1997 Nov 7, 2019
6a7af8f
Corrected Time validation and error message for wrong input (#155)
philipalexanderb Nov 7, 2019
11e1ff8
Implemented sendReminder Command using email (#157)
philipalexanderb Nov 7, 2019
1abd7e0
Update UserGuide.adoc (#158)
philipalexanderb Nov 7, 2019
47e1220
Update UserGuide.adoc (#159)
philipalexanderb Nov 7, 2019
b83951e
Update UserGuide.adoc (#160)
R-D-D-D Nov 8, 2019
df5dbf3
Bug fixes (#161)
jerryk1997 Nov 8, 2019
dcd4e0f
Fix generate command format prompt (#163)
ccyccyccy Nov 8, 2019
53e63ca
ug formatting (#164)
fadisng Nov 8, 2019
8ddb9b6
COrrected JsonAdaptedMEeting (#165)
philipalexanderb Nov 8, 2019
93b7fee
Update UG (#166)
ccyccyccy Nov 8, 2019
c883995
Add step-by-step for generate (#167)
ccyccyccy Nov 8, 2019
ae867ff
Update UserGuide.adoc (#168)
philipalexanderb Nov 8, 2019
861c921
Update ug dg (#169)
R-D-D-D Nov 8, 2019
4c0f5a5
Update README, Add Coveralls (#170)
ccyccyccy Nov 8, 2019
f030cd0
added MeetingClassDiagram (#173)
philipalexanderb Nov 8, 2019
7133e64
Update DeveloperGuide.adoc (#174)
philipalexanderb Nov 8, 2019
ac448cc
ug (#172)
fadisng Nov 8, 2019
306dc9d
ug format (#176)
fadisng Nov 8, 2019
0f442b1
Added Sequence Diagram for SendReminder (#177)
philipalexanderb Nov 8, 2019
8694b66
Update DeveloperGuide.adoc (#179)
philipalexanderb Nov 8, 2019
d4460f3
SendReminder Activity Diagram and Sequence Diagram (#178)
philipalexanderb Nov 8, 2019
e2d1722
Fixed bugs for sendReminder (#180)
philipalexanderb Nov 8, 2019
dcefb90
Change UI.png (#181)
ccyccyccy Nov 9, 2019
1cf3bbe
added sort meeting and updated ug (#182)
fadisng Nov 9, 2019
e85bc50
Update UG, DG, PPP (#183)
ccyccyccy Nov 9, 2019
ebc2a83
Fixed some bugs (#184)
jerryk1997 Nov 9, 2019
253975f
Finalize DG (#185)
ccyccyccy Nov 9, 2019
163b5d6
Fix bugs (#186)
R-D-D-D Nov 9, 2019
c8a55e1
removed clear command and added ppp (#187)
fadisng Nov 9, 2019
8a35d40
Fixes (#188)
jerryk1997 Nov 9, 2019
f7ac69b
Updated UG and DG (#189)
philipalexanderb Nov 9, 2019
f7227d8
Update AboutUs.adoc (#190)
philipalexanderb Nov 9, 2019
4ebc417
Update AboutUs.adoc (#191)
philipalexanderb Nov 9, 2019
bf37ce6
Documentation Update (#192)
philipalexanderb Nov 9, 2019
c2794c8
Update documentation (#193)
philipalexanderb Nov 9, 2019
4abcb0e
ug/dg (#196)
fadisng Nov 10, 2019
e3e2aea
Implement excel (#194)
R-D-D-D Nov 10, 2019
05564e6
Fix ui navigation (#199)
R-D-D-D Nov 10, 2019
c4ecb0f
added tests (#200)
fadisng Nov 10, 2019
e19ffb1
Documentation (#197)
philipalexanderb Nov 10, 2019
6ebb6b0
Added and updated test cases and Updated UG DG (#201)
philipalexanderb Nov 10, 2019
7561360
Update UG DG and PPP (#202)
jerryk1997 Nov 11, 2019
06df02b
added logging and edited ppp (#203)
fadisng Nov 11, 2019
642231e
Travis check (#204)
philipalexanderb Nov 11, 2019
8fd2a7c
Documentation update (#205)
philipalexanderb Nov 11, 2019
daa69f0
Rename addTimetable to setTimetable, edit UG DG PPP (#206)
ccyccyccy Nov 11, 2019
bb94bd2
Touchup dg (#207)
R-D-D-D Nov 11, 2019
8a382fc
Fixed setMeetingList bugs (#210)
philipalexanderb Nov 11, 2019
f14924a
Update AboutUs.adoc (#222)
philipalexanderb Nov 11, 2019
b28740a
Update AboutUs.adoc (#224)
philipalexanderb Nov 11, 2019
c10e1f3
edited some bugs (#225)
fadisng Nov 11, 2019
15be751
Fixed addProjectMeeting command error handling (#214)
philipalexanderb Nov 11, 2019
681e36e
Include DG in PPP (#211)
ccyccyccy Nov 11, 2019
fccbb4d
Updated PPP (#229)
jerryk1997 Nov 11, 2019
1054001
Update Documentation (#231)
philipalexanderb Nov 11, 2019
58e5f34
Final PPP (#230)
ccyccyccy Nov 11, 2019
36a0034
Make change from feedback, delete unused tests (#232)
ccyccyccy Nov 11, 2019
ec0e0db
Edit ABOUT-US (#233)
ccyccyccy Nov 11, 2019
ab25c6d
final edits (#234)
fadisng Nov 11, 2019
782ee8d
Update DeveloperGuide.adoc (#235)
fadisng Nov 11, 2019
d474aac
Change links to addressbook to MyProject (#236)
ccyccyccy Nov 11, 2019
6f1c535
Fixed markAttendance command (#237)
jerryk1997 Nov 11, 2019
89509c9
Update DeveloperGuide.adoc (#238)
fadisng Nov 11, 2019
a36e67a
Documentation update (#240)
philipalexanderb Nov 11, 2019
3b20bbd
Final bug fix (#241)
R-D-D-D Nov 11, 2019
eb55679
Fixed assign and unassign task and added manual testing writing for a…
jerryk1997 Nov 11, 2019
1f4e062
Fixed editCommand (doubling of meetings and unassigning of project) (…
jerryk1997 Nov 11, 2019
70321ab
Add files via upload (#243)
fadisng Nov 11, 2019
ed726fe
Update UserGuide.adoc (#244)
jerryk1997 Nov 11, 2019
5d7d541
Documentation Update LAST BROOOOOOOOOOOOO (#246)
philipalexanderb Nov 11, 2019
0b0aa7a
Add deleteBudget (#247)
R-D-D-D Nov 11, 2019
cf17f75
Dg appendix (#245)
ccyccyccy Nov 11, 2019
3b0a54b
Add files via upload (#248)
fadisng Nov 11, 2019
5309661
Add functional code to ppp (#250)
R-D-D-D Nov 14, 2019
2af7a0f
Fix issue where modules with only sem2 lessons are interpreted as err…
ccyccyccy Jan 20, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ src/main/resources/docs/
/preferences.json
/*.log.*

budgets/budgets.xls

# Test sandbox files
src/test/data/sandbox/

Expand Down
16 changes: 7 additions & 9 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
= Address Book (Level 3)
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/se-edu/addressbook-level3.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level3?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level3/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level3?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level3&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]
https://travis-ci.org/AY1920S1-CS2103T-T17-1/main[image:https://travis-ci.org/AY1920S1-CS2103T-T17-1/main.svg?branch=master[Build Status]]
https://coveralls.io/github/AY1920S1-CS2103T-T17-1/main?branch=master[image:https://coveralls.io/repos/github/AY1920S1-CS2103T-T17-1/main/badge.svg?branch=master[Coverage Status]]

Too overwhelmed by the amount of group projects? Don't worry! MyProject is here to help. With our vast array of functionality, you would soon be managing your projects with ease.

MyProject is a desktop Project Management application. It has a GUI to display various useful information but most of the user interactions happen using a CLI (Command Line Interface).

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,15 +16,11 @@ ifndef::env-github[]
image::images/Ui.png[width="600"]
endif::[]

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.

== Site Map

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>

Expand All @@ -32,5 +29,6 @@ endif::[]
* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
* Original source code of AddressBook-Level3 project created by SE-EDU initiative at https://se-education.org

== Licence : link:LICENSE[MIT]
6 changes: 6 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,19 @@ dependencies {
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
implementation("commons-io:commons-io:2.6")

implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'

testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion

testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion

compile fileTree(include: ['*.jar'], dir: 'lib')
compile files('lib/javax.activation.jar')
compile group: 'org.apache.poi', name: 'poi', version: '3.9'

}

shadowJar {
Expand Down
105 changes: 0 additions & 105 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,6 @@
<property name="checkFormat" value="$1"/>
</module>

<!--
IMPORT CHECKS
-->

<!-- Checks the ordering of import statements follow the rules that the default Eclipse formatter uses.
The order rule "STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE" consists of:
1. STATIC: static imports
2. STANDARD_JAVA_PACKAGE: standard java/javax imports
3. SPECIAL_IMPORTS: defined as org imports
4. THIRD_PARTY_PACKAGE: defined as com imports
-->
<module name="CustomImportOrder">
<property name="customImportOrderRules"
value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
<property name="specialImportsRegExp" value="^org\."/>
<property name="thirdPartyPackageRegExp" value="^com\."/>
<property name="sortImportsInGroupAlphabetically" value="true"/>
</module>

<!-- Checks for redundant import statements.
An import statement is redundant if:
* It is a duplicate of another import. This is, when a class is imported more than once.
Expand All @@ -76,8 +57,6 @@
-->
<module name="UnusedImports"/>

<module name="AvoidStarImport"/>

<!--
NAMING CHECKS
-->
Expand Down Expand Up @@ -158,11 +137,6 @@
<!-- Checks if a catch block is empty and does not contain any comments. -->
<module name="EmptyCatchBlock"/>

<module name="LineLength">
<!-- Checks if a line is too long. -->
<property name="max" value="120"/>
</module>

<module name="LeftCurly">
<!-- Checks for placement of the left curly brace ('{'). -->
<property name="severity" value="warning"/>
Expand Down Expand Up @@ -232,33 +206,6 @@
<property name="ignoreAnnotationCanonicalNames" value="RegisterExtension, TempDir"/>
</module>

<!--
ORDER CHECKS
-->

<!-- Checks that the order of at-clauses follows the tagOrder default property value order.
@author, @version, @param, @return, @throws, @exception, @see, @since, @serial, @serialField, @serialData, @deprecated
-->
<module name="AtclauseOrder"/>

<!-- Checks if the Class and Interface declarations is organized in this order
1. Class (static) variables. Order: public, protected, package level (no access modifier), private.
2. Instance variables. Order: public, protected, package level (no access modifier), private.
3. Constructors
4. Methods
-->
<module name ="DeclarationOrder"/>

<module name="ModifierOrder">
<!-- Warn if modifier order is inconsistent with JLS3 8.1.1, 8.3.1, and
8.4.3. The prescribed order is:
public, protected, private, abstract, static, final, transient, volatile,
synchronized, native, strictfp
-->
</module>

<module name="OverloadMethodsDeclarationOrder"/>

<!--
WHITESPACE CHECKS
-->
Expand Down Expand Up @@ -302,13 +249,6 @@
<property name="allowLineBreaks" value="true"/>
</module>

<!-- No trailing whitespace -->
<module name="Regexp">
<property name="format" value="[ \t]+$"/>
<property name="illegalPattern" value="true"/>
<property name="message" value="Trailing whitespace"/>
</module>

<module name="OperatorWrap">
<!-- Checks that the non-assignment type operator is at the next line in a line wrap.
This includes "?", ":", "==", "!=", "/", "+", "-", "*", "%", ">>", ">>>",
Expand Down Expand Up @@ -375,50 +315,5 @@
-->
<property name="validateComments" value="true"/>
</module>

<!--
JAVADOC CHECKS
-->

<!-- Checks that every class, enumeration and interface have a header comment. -->
<module name="JavadocType">
<property name="allowMissingParamTags" value="true"/>
</module>

<!-- Checks that every public method (excluding getters, setters and constructors) has a header comment. -->
<module name="JavadocMethod">
<!-- Checks public methods that have more than 1 line of code.
Single line of code methods are often due to refactor for readability.
-->
<property name="minLineCount" value="1"/>
<property name="allowedAnnotations" value="Override, Test, BeforeAll, BeforeEach, AfterAll, AfterEach, Subscribe"/>
<property name="scope" value="public"/>
<property name="allowUndeclaredRTE" value="true"/>
<property name="allowThrowsTagsForSubclasses" value="true"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingThrowsTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="allowMissingPropertyJavadoc" value="true"/>
<property name="ignoreMethodNamesRegex" value="(set.*|get.*)"/>
<property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/>
</module>
<!-- Checks that every non-trivial private method (excluding getters, setters and constructors) has a header comment. -->
<module name="JavadocMethod">
<!-- Checks private methods that have more than 3 lines of code.
We define methods that have more than 3 lines of code as non-trivial.
-->
<property name="minLineCount" value="3"/>
<property name="allowedAnnotations" value="Override, Test, BeforeAll, BeforeEach, AfterAll, AfterEach, Subscribe"/>
<property name="scope" value="private"/>
<property name="allowUndeclaredRTE" value="true"/>
<property name="allowThrowsTagsForSubclasses" value="true"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingThrowsTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="allowMissingPropertyJavadoc" value="true"/>
<property name="ignoreMethodNamesRegex" value="(set.*|get.*)"/>
<property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/>
</module>

</module>
</module>
26 changes: 0 additions & 26 deletions config/travis/check-trailing-whitespace.sh

This file was deleted.

54 changes: 26 additions & 28 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,51 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 3 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
*_MyProject_* was built on top of AddressBook - Level 3, which was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
{empty} +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

== Project Team

=== John Doe
image::damithc.jpg[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
=== Chong Chee Yuan
image::ccyccyccy.png[width="150", align="left"]
{empty}[http://chongcheeyuan.me/[homepage]] [https://github.com/ccyccyccy[github]]
{empty}[https://github.com/AY1920S1-CS2103T-T17-1/main/blob/master/docs/team/ccyccyccy.adoc[portforlio]]

Role: Project Advisor
Role: Member

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Philip Alexander Boediman
image::philipalexanderb.png[width="150", align="left"]
{empty}[https://github.com/philipalexanderb[github]]
{empty}[https://github.com/AY1920S1-CS2103T-T17-1/main/blob/master/docs/team/philipalexanderb.adoc[portfolio]]

Role: Team Lead +
Responsibilities: UI
Role: Member

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Kwong Chung Yue Jerry
image::jerryk1997.png[width="150", align="left"]
{empty}[https://github.com/jerryk1997[github]]
{empty}[https://github.com/AY1920S1-CS2103T-T17-1/main/blob/master/docs/team/jerryk1997.adoc[portfolio]]

Role: Developer +
Responsibilities: Data
Role: Member

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Wang Runding
image::R-D-D-D.png[width="150", align="left"]
{empty}[https://github.com/r-d-d-d[github]]
{empty}[https://github.com/AY1920S1-CS2103T-T17-1/main/blob/master/docs/team/r-d-d-d.adoc[portfolio]]

Role: Developer +
Responsibilities: Dev Ops + Threading
Role: Member

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Sng Jia Ming Fadi Faris
image::fadisng.png[width="150", align="left"]
{empty}[https://github.com/fadisng[github]]
{empty}[https://github.com/AY1920S1-CS2103T-T17-1/main/blob/master/docs/team/fadisng.adoc[portfolio]]

Role: Developer +
Responsibilities: UI

'''
Role: Member
43 changes: 43 additions & 0 deletions docs/ChangeUiDisplayActivityDiagram.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
@startuml
start
:User executes a command;

if () then ([is help command])
:MainWindow executes\nhandleHelp method;

else ([is not help command])

if () then ([is exit command])
:MainWindow executes\nhandleExit method;

else ([is not exit command])

if () then ([is back command])
:handleBack;

if () then ([current state is PROJECT_LIST])
:Throw CommandException\ncan't go back any further;

else([current state is not PROJECT_LIST])
:get previous UiEvent from the stack;
:changeUiDisplay method is called\nto go back to the UiEvent's state;
:remove working project if the\nprevious state does not have one;
endif

else([is not back command])

if () then ([change in Ui display needed])
:get the next state base on the command;
:generate an UiEvent with the param\nnext state and the current working project;
:changeUiDisplay method is called to go to next state;

else ([change in Ui display is not needed])
:changeUiDisplay method is called\nto refresh the current state;
endif
endif
endif
endif


stop
@enduml
3 changes: 1 addition & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
:site-section: ContactUs
:stylesDir: stylesheets

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S1-CS2103T-T17-1/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
2 changes: 1 addition & 1 deletion docs/DevOps.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ifdef::env-github[]
:note-caption: :information_source:
:warning-caption: :warning:
endif::[]
:repoURL: https://github.com/se-edu/addressbook-level3/tree/master
:repoURL: https://github.com/AY1920S1-CS2103T-T17-1/main/tree/master

== Build Automation

Expand Down
Loading