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

[T13-3] JxMusic #116

Open
wants to merge 411 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
411 commits
Select commit Hold shift + click to select a range
86ef7d9
Merge pull request #58 from CS2103-AY1819S1-T13-3/gongjie
davidchoo12 Oct 24, 2018
dd1fc0c
Fix LibraryParser to take command phrase
davidchoo12 Oct 24, 2018
71cb96e
Merge branch 'v1.3' of https://github.com/CS2103-AY1819S1-T13-3/main …
davidchoo12 Oct 24, 2018
fe64ac3
Add space for PlaylistList and TrackList commands
davidchoo12 Oct 24, 2018
61e270e
Refactor JxMusicPlayer to PlayerManager
davidchoo12 Oct 24, 2018
bbb7a35
Refactor PlayPlaylistCommand to PlayCommand
davidchoo12 Oct 24, 2018
058da33
update StorageClassDiagram.png
Gongjie663746 Oct 24, 2018
c0b4140
update issue tracker link
NancyQuris Oct 25, 2018
6c4e818
Merge branch 'v1.3' into ui
NancyQuris Oct 26, 2018
fd18009
Add TrackAddCommand
handshou Oct 26, 2018
4af8b52
Merge branch 'v1.3' into UI
NancyQuris Oct 26, 2018
8dd6ef7
Merge remote-tracking branch 'origin/v1.3' into hayden
HaydenPhillips Oct 26, 2018
d7cc4d3
Add stacktrace flag for debugging
HaydenPhillips Oct 26, 2018
c118351
update ObservableTrackList to match UI component
NancyQuris Oct 26, 2018
61732b8
Fix build styling errors
HaydenPhillips Oct 26, 2018
e86c10c
add tracksearchcommand
Gongjie663746 Oct 26, 2018
f808cbd
Merge branch 'UI' into tracksearch
Gongjie663746 Oct 26, 2018
1f5e0ea
Correct for checkstyle
handshou Oct 26, 2018
6abb628
add tracksearchcommand
Gongjie663746 Oct 26, 2018
9b9e5de
Correct for checkstyle
handshou Oct 26, 2018
02fe094
Correct for checkstyle
handshou Oct 26, 2018
336ad13
Add PlaylistSearchCommandTest
HaydenPhillips Oct 26, 2018
96eb0cb
Add PlaylistSearchCommand
HaydenPhillips Oct 26, 2018
b05c716
Update CheckStyle
HaydenPhillips Oct 26, 2018
06a777f
fix UI null pointer exception
NancyQuris Oct 26, 2018
35ca0f9
fix TrackListPanel.java and TrackCard.fxml error
NancyQuris Oct 26, 2018
d8b323c
Minor strings fix for PlaylistNewCommand and Playlist
davidchoo12 Oct 26, 2018
1f4cc8a
Refactor PlayerManager to be a singleton
davidchoo12 Oct 26, 2018
dfb34d7
Implement PlayCommand
davidchoo12 Oct 26, 2018
0135438
Remove album art from unplayable mp3 files
davidchoo12 Oct 26, 2018
3a840d5
Fix command history not showing
davidchoo12 Oct 26, 2018
ae420c9
Fix failing tests
davidchoo12 Oct 26, 2018
6347f81
Merge pull request #63 from CS2103-AY1819S1-T13-3/david
NancyQuris Oct 27, 2018
87c1db1
Merge branch 'v1.3' into UI
NancyQuris Oct 27, 2018
bb5ed93
fix coding style error
NancyQuris Oct 27, 2018
cadf45b
fix coding style error
NancyQuris Oct 27, 2018
3be068e
Update CheckStyle
HaydenPhillips Oct 28, 2018
b5069a8
update checkstyle 3.0 ffs
HaydenPhillips Oct 29, 2018
4e290d5
update checkstyle 4.0
HaydenPhillips Oct 29, 2018
de782d2
refactor TypicalPlaylists to TypicalPlaylistList; add test file for T…
NancyQuris Oct 29, 2018
f1f8023
update tracksearch feature
Gongjie663746 Oct 30, 2018
54dedf7
Merge branch 'UI' into tracksearch
Gongjie663746 Oct 30, 2018
f10f8ca
remove BrowserPanel relevant features in test files
NancyQuris Oct 30, 2018
3d63441
revise coding style
NancyQuris Oct 30, 2018
84de2ca
Add TrackAddCommand tests
handshou Oct 31, 2018
ff4b720
Merge branch 'v1.3' of github.com:CS2103-AY1819S1-T13-3/main into hansel
handshou Oct 31, 2018
79f57ac
fix a part of errors existed
NancyQuris Oct 31, 2018
ca70d1a
fix error in variable declaration, with the help from @David
NancyQuris Oct 31, 2018
9506438
fix error in variable declaration, with the help from @hidingmode
NancyQuris Oct 31, 2018
1b4855b
Merge branch 'UI' of https://github.com/CS2103-AY1819S1-T13-3/main in…
NancyQuris Oct 31, 2018
22199dd
Implement TrackAddCommand, tests and modified TypicalPlaylists to mod…
handshou Oct 31, 2018
16f0481
Add .project and .classpath configurations to .gitignore
handshou Oct 31, 2018
2afd542
Cleanup comments in TrackAddCommand and ParserUtil
handshou Oct 31, 2018
0ed5668
Remove .classpath and .project files generated from Visual Studio Code
handshou Oct 31, 2018
774cb26
Fix TrackAddCommand message usage string
handshou Oct 31, 2018
0fdc2ec
Update TrackAddCommand success message
handshou Oct 31, 2018
5970249
Fix TrackAddCommand message usage
handshou Oct 31, 2018
91d8bb2
fix the track search command
Gongjie663746 Oct 31, 2018
5513670
update userguide for track search
Gongjie663746 Oct 31, 2018
cfebfd4
fix test errors, with the help from @hidingmode
NancyQuris Oct 31, 2018
5cc23cb
revise coding style
NancyQuris Oct 31, 2018
e38c1b2
comment openWindow test and will fix the error in v1.4
NancyQuris Oct 31, 2018
ced9ebc
revise coding style
NancyQuris Oct 31, 2018
66e812b
create the frame of SeekCommand, SeekCommandParser and add seek comma…
NancyQuris Oct 31, 2018
4aeeaf0
Merge pull request #64 from CS2103-AY1819S1-T13-3/UI
davidchoo12 Oct 31, 2018
db17f04
update UserGuide to explain how new mp3 files can be added
NancyQuris Oct 31, 2018
a9afd2f
update UserGuide.adoc
NancyQuris Oct 31, 2018
d756b89
Update architecture diagram
davidchoo12 Oct 24, 2018
d2f2398
update some commands' format
NancyQuris Oct 31, 2018
b13d79c
Add player component into docs
davidchoo12 Oct 31, 2018
1b97c65
add library folder to resources
Gongjie663746 Oct 31, 2018
ec255de
Merge branch 'UI' into tracksearch
Gongjie663746 Oct 31, 2018
1b7f4c7
Merge branch 'david' of https://github.com/CS2103-AY1819S1-T13-3/main…
HaydenPhillips Oct 31, 2018
51e4d47
update trackscanner so that it can copy tracks from resouces folder t…
Gongjie663746 Oct 31, 2018
1077e8f
update sequential diagram of "event-driven nature of design" part in …
NancyQuris Oct 31, 2018
9e6397f
Merge branch 'master' of https://github.com/CS2103-AY1819S1-T13-3/main
NancyQuris Oct 31, 2018
59447b7
update tracksearch in userguide doc
Gongjie663746 Oct 31, 2018
35b204e
Add PlaylistDelCommandParserTest
HaydenPhillips Oct 31, 2018
0a12703
Merge pull request #65 from CS2103-AY1819S1-T13-3/tracksearch
davidchoo12 Oct 31, 2018
aa91b31
update UI image
NancyQuris Oct 31, 2018
190c221
Merge remote-tracking branch 'origin/v1.3' into hayden
HaydenPhillips Oct 31, 2018
b9189ab
Fix PlaylistSearchCommand usage message
HaydenPhillips Oct 31, 2018
f42f292
Merge pull request #61 from CS2103-AY1819S1-T13-3/hayden
davidchoo12 Oct 31, 2018
e9da940
Update Logic component diagrams in dev guide
HaydenPhillips Oct 31, 2018
88f5fb7
Fix TrackList to use predicate
davidchoo12 Oct 31, 2018
a5f73aa
Ensure /library exists on startup (fix issue #67)
davidchoo12 Oct 31, 2018
25603c0
Bump to v1.3.0
davidchoo12 Oct 31, 2018
28fa43f
Fix log file name
davidchoo12 Oct 31, 2018
5df7c68
Merge branch 'master' into v1.3
davidchoo12 Oct 31, 2018
ae455ee
Implement TrackDeleteCommand, TrackDeleteCommandParser, TrackDeleteCo…
handshou Oct 31, 2018
901037d
Merge branch 'v1.3' of github.com:CS2103-AY1819S1-T13-3/main into hansel
handshou Oct 31, 2018
9f76886
Fix spaces in usage messages and examples
handshou Oct 31, 2018
bd5053d
Merge pull request #60 from CS2103-AY1819S1-T13-3/hansel
davidchoo12 Nov 1, 2018
a7a1959
Update model diagram and developerguide.adoc
handshou Nov 1, 2018
ccdbe2c
Update and fix user guide
davidchoo12 Nov 1, 2018
18f4503
Fix PlaylistDelCommand command phrase
davidchoo12 Nov 1, 2018
917d61a
Make search commands work with substrings
davidchoo12 Nov 1, 2018
8246dea
Merge pull request #62 from CS2103-AY1819S1-T13-3/v1.3
davidchoo12 Nov 1, 2018
974186f
update theme color of UI to green, add captain on the top of trackLis…
NancyQuris Nov 2, 2018
ac25e86
update UI image
NancyQuris Nov 2, 2018
d6911a8
Merge tag 'v1.3' into gongjie
Gongjie663746 Nov 2, 2018
f5076c2
Merge branch 'master' into yingnan
NancyQuris Nov 2, 2018
8417f52
change the structure of the building of filteredTrackList
NancyQuris Nov 2, 2018
99670a1
update ReadOnlyLibrary interface to match the implementation
NancyQuris Nov 2, 2018
3e13984
Fix track add and track delete commands
handshou Nov 2, 2018
3813bd7
Implement add multiple tracks support to Track Add Command, add empty…
handshou Nov 2, 2018
967b9ab
Add size attribute and isEmpty() to Playlist
handshou Nov 2, 2018
d3ac3f8
Rework track add, track del and tweak tests. Rename getTypicalLibrary…
handshou Nov 2, 2018
00a103f
Attempt to fix failing track add test
handshou Nov 2, 2018
7f6b1ef
Fix checkstyle: unused import
handshou Nov 2, 2018
f99d181
update Codacy and Coveralls report
NancyQuris Nov 4, 2018
335b870
Update README.adoc
NancyQuris Nov 4, 2018
8443809
update code quality link
NancyQuris Nov 4, 2018
3cf32fe
update Coverage Status
NancyQuris Nov 4, 2018
f6f8a21
update Codacy Badge's image
NancyQuris Nov 4, 2018
d95626a
add tests for tracklist command and tracksearch command
Gongjie663746 Nov 4, 2018
1fdbb49
configure codacy to exclude the checking of test files
NancyQuris Nov 4, 2018
6ef62a0
Update .codacy.yml
NancyQuris Nov 4, 2018
0cc74ea
Update .codacy.yml
NancyQuris Nov 4, 2018
a024433
Update .codacy.yml
NancyQuris Nov 4, 2018
f5848d1
Update .codacy.yml
NancyQuris Nov 4, 2018
251d205
Add status for Player and Playable
davidchoo12 Nov 4, 2018
18d8548
Add validation checks for Play, Pause, Stop
davidchoo12 Nov 4, 2018
82c1cda
Add PlayCommandTest
davidchoo12 Nov 4, 2018
3198fe6
implement seek command parser and seek command
NancyQuris Nov 4, 2018
9da38ff
Merge branch 'v1.4' into david
davidchoo12 Nov 4, 2018
95a4269
Attempt fix failing travis build
davidchoo12 Nov 4, 2018
127e462
Merge branch 'david' into yingnan
NancyQuris Nov 5, 2018
beaebd0
implement seek command
NancyQuris Nov 5, 2018
959a347
Merge branch 'UI' into yingnan
NancyQuris Nov 5, 2018
ff286d8
correct exception handling, add track duration to UI
NancyQuris Nov 5, 2018
c498933
Implement load tracks in TestApp, fix TrackAddCommand tests, add requ…
handshou Nov 7, 2018
5ca4459
fix getDuration problem
NancyQuris Nov 7, 2018
a4c5170
Fix failing travis and appveyor builds
davidchoo12 Nov 4, 2018
a7d2d6f
Add PlayerManagerTest
davidchoo12 Nov 7, 2018
4977345
fix some of the bugs in seek command
NancyQuris Nov 7, 2018
a96b429
Improve TrackAddCommand, TrackDeleteCommand tests, add new TEST Playl…
handshou Nov 7, 2018
a6fce27
Fix for codacy
handshou Nov 7, 2018
e660cf5
Merge pull request #101 from CS2103-AY1819S1-T13-3/david
davidchoo12 Nov 8, 2018
bdbe4a9
Merge pull request #68 from CS2103-AY1819S1-T13-3/UI
davidchoo12 Nov 8, 2018
0b322f7
Merge pull request #70 from CS2103-AY1819S1-T13-3/hansel
davidchoo12 Nov 8, 2018
2a8294c
Merge pull request #100 from CS2103-AY1819S1-T13-3/gongjie
davidchoo12 Nov 8, 2018
99fdf64
add nancyquirs.adoc
NancyQuris Nov 8, 2018
eb3e455
update nancyquris.adoc
NancyQuris Nov 8, 2018
8e2f14c
Merge branch 'v1.4' into hansel
handshou Nov 8, 2018
0b1bc37
Merge pull request #105 from CS2103-AY1819S1-T13-3/hansel
handshou Nov 8, 2018
93ae50b
Make trackset sortable by using TreeSet
davidchoo12 Nov 8, 2018
287cf2a
Rename Ui latest.png to Ui.png (close #103)
davidchoo12 Nov 8, 2018
3f71d9e
Use equalsIgnoreCase() over equals-toLowerCase()
handshou Nov 8, 2018
66b1a3d
Add missing message string by including PREFIX_INDEX
handshou Nov 8, 2018
a9840f7
Revert "update nancyquris.adoc"
NancyQuris Nov 8, 2018
6ec6972
fix problem with seek command
NancyQuris Nov 8, 2018
ba00d78
comment test file
NancyQuris Nov 8, 2018
177a956
comment test file
NancyQuris Nov 8, 2018
1ac6e86
Merge branch 'v1.4' into yingnan
NancyQuris Nov 8, 2018
402df69
fix coding style
NancyQuris Nov 8, 2018
c8d48c1
Add capability of TrackAdd using indexes
handshou Nov 9, 2018
ae0a81b
Add InputType enum for TrackAddCommand constructor
handshou Nov 9, 2018
53b71b6
fix initialisation problem
NancyQuris Nov 9, 2018
1dbb56b
Update user guide
davidchoo12 Nov 9, 2018
37f9b1f
implement some test cases, comment them to focus later
NancyQuris Nov 9, 2018
2aeb0f5
Fix more user guide
davidchoo12 Nov 9, 2018
358ada4
Remove all "System.out.println"
davidchoo12 Nov 9, 2018
ee3f60e
Remove storage main classes for testing
davidchoo12 Nov 9, 2018
fc1335e
enable seek function on paused tracks
NancyQuris Nov 9, 2018
a7c6aa8
Refactor TrackAddCommand and tests
handshou Nov 9, 2018
a8b701e
Change implementation of PREFIX_INDEX and TrackAddCommand
handshou Nov 9, 2018
c50c78c
Merge branch 'v1.4' into yingnan
NancyQuris Nov 9, 2018
be2e70a
Delete and reimplement some tests
davidchoo12 Nov 9, 2018
c2af4fa
Fix failing PlayCommandTest
davidchoo12 Nov 9, 2018
e49cda3
Add tests for adding tracks using PREFIX_INDEX
handshou Nov 9, 2018
17dcd72
Merge branch 'v1.4' into hansel
handshou Nov 9, 2018
62b2f3f
Fix indentation of ExitCommandTest and HelpCommandTest
davidchoo12 Nov 9, 2018
55497fd
Add more TrackAddCommand tests for PREFIX_INDEX
handshou Nov 9, 2018
bb29488
Merge branch 'hansel' of github.com:CS2103-AY1819S1-T13-3/main into h…
handshou Nov 9, 2018
14ce5f8
Merge branch 'v1.4' of github.com:CS2103-AY1819S1-T13-3/main into hansel
handshou Nov 9, 2018
4773b18
add seek command test and seek command parser test
NancyQuris Nov 9, 2018
74e1afb
Merge branch 'v1.4' into yingnan
NancyQuris Nov 9, 2018
d491e04
attempt to fix failing test
NancyQuris Nov 9, 2018
bc04906
fix coding style erorr
NancyQuris Nov 9, 2018
d93f050
fix coding style
NancyQuris Nov 9, 2018
d1779ef
update sequential diagram for playlist del command
NancyQuris Nov 10, 2018
713eb32
change the implementation of duration to pass the tests
NancyQuris Nov 10, 2018
9d9dafd
fix coding style error
NancyQuris Nov 10, 2018
0a366ba
add specification to seek command
NancyQuris Nov 10, 2018
8cb61d9
Delete findCommand
HaydenPhillips Nov 10, 2018
653e50b
Update developerDocs
HaydenPhillips Nov 10, 2018
bd0e7eb
Add DurationCommand
davidchoo12 Nov 10, 2018
a82f17f
Merge branch 'v1.4' into yingnan
davidchoo12 Nov 10, 2018
c3e1d80
Change trackSet to use TreeSet
davidchoo12 Nov 10, 2018
3797f15
Format duration string
davidchoo12 Nov 10, 2018
b3f2314
Fix codacy failing build
davidchoo12 Nov 10, 2018
4c1efe6
Merge pull request #106 from CS2103-AY1819S1-T13-3/yingnan
NancyQuris Nov 10, 2018
c54fe35
update Ui.png
NancyQuris Nov 10, 2018
238725f
Update adoc: Section 3 - Implementation
HaydenPhillips Nov 10, 2018
527f2db
Merge branch 'v1.4' of https://github.com/CS2103-AY1819S1-T13-3/main …
HaydenPhillips Nov 10, 2018
cd532e0
Update dev guide
Gongjie663746 Nov 11, 2018
5925143
update user guide; add images needed for developer guide
NancyQuris Nov 11, 2018
5b7e7db
Update dev guide with Player component and Play command
davidchoo12 Nov 11, 2018
4feb2cd
Merge pull request #107 from CS2103-AY1819S1-T13-3/hansel
davidchoo12 Nov 11, 2018
a010d14
update developer guide
NancyQuris Nov 11, 2018
a159b73
Fix failing build from draw io xml
davidchoo12 Nov 11, 2018
7878582
Update UserGuide Introduction
HaydenPhillips Nov 11, 2018
03e0359
Delete unused systemtests
HaydenPhillips Nov 11, 2018
28ee327
update PPP
Gongjie663746 Nov 11, 2018
f7c5cd2
Merge branch 'v1.4' of github.com:CS2103-AY1819S1-T13-3/main into v1.4
Gongjie663746 Nov 11, 2018
19c1c6c
update ppp
Gongjie663746 Nov 11, 2018
dab359b
Remove addressbook-related appendix
handshou Nov 11, 2018
b689d5b
update PPP
NancyQuris Nov 11, 2018
261b119
Update nancyquris.adoc
NancyQuris Nov 11, 2018
cba5062
add link to yingnan's portfolio
NancyQuris Nov 11, 2018
ca1fbdb
update PPP and about us
Gongjie663746 Nov 11, 2018
6d47e15
update about us
Gongjie663746 Nov 11, 2018
194d366
update PPP
Gongjie663746 Nov 12, 2018
dd33dcb
delete commented lines
Gongjie663746 Nov 12, 2018
d624970
Add instructions for manual testing in dev guide
davidchoo12 Nov 12, 2018
5b500e2
Merge branch 'master' into v1.4
davidchoo12 Nov 12, 2018
cbfe018
remove irrelevant codes
NancyQuris Nov 12, 2018
41201f8
delete unused test data files
NancyQuris Nov 12, 2018
0e1add8
fix the userguide
Gongjie663746 Nov 12, 2018
4110e2e
fix errors of tags appeared in PPP
NancyQuris Nov 12, 2018
bd94b2c
revise the usage of track del command
NancyQuris Nov 12, 2018
58bdca6
correct indentation level
NancyQuris Nov 12, 2018
73246d0
update PPP
NancyQuris Nov 12, 2018
92f9783
Update README.adoc
NancyQuris Nov 12, 2018
a82f716
Update UserGuide.adoc
NancyQuris Nov 12, 2018
8c510bd
update the name of the project
NancyQuris Nov 12, 2018
e2f6888
Add handshou.adoc, add track add remove feature
handshou Nov 12, 2018
bc2c73f
DevGuide: remove one type of delete tracks command
handshou Nov 12, 2018
5d861af
Add Hayden's PPP
HaydenPhillips Nov 12, 2018
a5dc63b
Edit PPP adoc name
HaydenPhillips Nov 12, 2018
1926fd9
Add david's PPP
davidchoo12 Nov 12, 2018
206730b
edit hayden ppp
HaydenPhillips Nov 12, 2018
eb896e0
Update personal adoc and devguide
handshou Nov 12, 2018
7e6c098
PPP touch-ups Hayden
HaydenPhillips Nov 12, 2018
a08f70a
PPP final Hayden
HaydenPhillips Nov 12, 2018
a9a8ae4
PPP final Hayden
HaydenPhillips Nov 12, 2018
a781066
update PPP
NancyQuris Nov 12, 2018
a0ccdb8
update PPP
NancyQuris Nov 12, 2018
bbb1a99
update PPP's tag
NancyQuris Nov 12, 2018
c585526
Update david's PPP
davidchoo12 Nov 12, 2018
c0afe92
Remove conflict markers in user guide
davidchoo12 Nov 12, 2018
91d14cd
Bump to v1.4
davidchoo12 Nov 12, 2018
1884c2b
Update AboutUs on david's part
davidchoo12 Nov 12, 2018
28cb7cc
Update personal adoc, tags in dev and user guide
handshou Nov 12, 2018
b6c1ffa
Fix checkstyle
handshou Nov 12, 2018
eae05a9
small mistake fix
handshou Nov 12, 2018
ace19ec
Merge pull request #104 from CS2103-AY1819S1-T13-3/v1.4
davidchoo12 Nov 12, 2018
f93d04d
Fix user guide missing new line
davidchoo12 Nov 12, 2018
09743f1
Removing id
handshou Mar 9, 2019
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 .codacy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
exclude_paths:
- 'src/test/**/*'
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ build/
.checkstyle
.settings/
.idea/
.project
.classpath
.vscode/
lib/*
*.iml
*.log
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ matrix:

script: >-
./config/travis/run-checks.sh &&
travis_retry ./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor copyDummySearchPage
travis_retry ./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor copyDummySearchPage --stacktrace

deploy:
skip_cleanup: true
Expand Down
22 changes: 9 additions & 13 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
= Address Book (Level 4)
= JxMusic
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&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/CS2103-AY1819S1-T13-3/main[image:https://travis-ci.org/CS2103-AY1819S1-T13-3/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/docsautopublisher/main/branch/master[image:https://ci.appveyor.com/api/projects/status/7dk5fcmu2eb6vugq/branch/master?svg=true[Build status]]
https://coveralls.io/github/CS2103-AY1819S1-T13-3/main?branch=master[image:https://coveralls.io/repos/github/CS2103-AY1819S1-T13-3/main/badge.svg?branch=master[Coverage Status]]
image:https://api.codacy.com/project/badge/Grade/f91a3abe2719423cbbd035544c121ab3["Codacy code quality", link="https://www.codacy.com/app/NancyQuris/CS2103-AY1819S1-T13-3?utm_source=github.com&utm_medium=referral&utm_content=CS2103-AY1819S1-T13-3/main&utm_campaign=Badge_Grade"]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,13 +14,9 @@ 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.
* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
** A more sophisticated GUI that includes a list panel and an in-built Browser.
** More test cases, including automated GUI testing.
** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
* This is a desktop music player application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java application intended for users that want to listen to music on their computers.
* It is *written in OOP fashion*.

== Site Map

Expand All @@ -33,6 +28,7 @@ endif::[]

== Acknowledgements

* This project is built upon https://github.com/se-edu/addressbook-level4.
* 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://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]
Expand Down
31 changes: 31 additions & 0 deletions _reposense/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"formats": ["adoc", "cs", "css", "fxml", "gradle", "html", "java", "js", "json", "jsp", "md", "py", "tag", "xml"],
"authors":
[
{
"githubId": "Gongjie663746",
"displayName": "QI GO...NGJIE",
"authorNames": ["Gongjie", "Gongjie663746"]
},
{
"githubId": "NancyQuris",
"displayName": "LIU Y...NGNAN",
"authorNames": ["Liu Yingnan", "NancyQuris"]
},
{
"githubId": "hidingmode",
"displayName": "DAVID... CHOO",
"authorNames": ["hidingmode", "David Ch", "David Choo"]
},
{
"githubId": "HaydenPhillips",
"displayName": "PHILL...N ROY",
"authorNames": ["HaydenPhillips", "Hayden Phillips"]
},
{
"githubId": "handshou",
"displayName": "HANSE...YOUNG",
"authorNames": ["handshou"]
}
]
}
Binary file added addressbook.jar
Binary file not shown.
17 changes: 9 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if (JavaVersion.current() == JavaVersion.VERSION_1_10
}

// Specifies the entry point of the application
mainClassName = 'seedu.address.MainApp'
mainClassName = 'seedu.jxmusic.MainApp'

sourceCompatibility = JavaVersion.VERSION_1_9
targetCompatibility = JavaVersion.VERSION_1_9
Expand Down Expand Up @@ -58,6 +58,7 @@ dependencies {
String testFxVersion = '4.0.12-alpha'
String jUnitVersion = '5.1.0'

implementation 'com.google.code.gson:gson:2.8.5'
implementation group: 'org.controlsfx', name: 'controlsfx', version: '8.40.11'
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'
Expand All @@ -82,7 +83,7 @@ dependencies {
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'jxmusic.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -134,6 +135,7 @@ test {

testLogging {
events TestLogEvent.FAILED, TestLogEvent.SKIPPED
exceptionFormat 'full'

// Prints the currently running test's name in the CI's build log,
// so that we can check if tests are being silently skipped or
Expand All @@ -157,16 +159,16 @@ test {
}

if (runNonGuiTests) {
test.include 'seedu/address/**'
test.include 'seedu/jxmusic/**'
}

if (runGuiTests) {
test.include 'systemtests/**'
test.include 'seedu/address/ui/**'
test.include 'seedu/jxmusic/ui/**'
}

if (!runGuiTests) {
test.exclude 'seedu/address/ui/**'
test.exclude 'seedu/jxmusic/ui/**'
}
}
}
Expand Down Expand Up @@ -207,9 +209,8 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level4',
'site-githuburl': 'https://github.com/se-edu/addressbook-level4',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
'site-name': 'JxMusic',
'site-githuburl': 'https://github.com/CS2103-AY1819S1-T13-3/main',
]

options['template_dirs'].each {
Expand Down
52 changes: 26 additions & 26 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,53 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 4 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.}_ +
JxMusic was developed by the CS2103-AY1819S1-T13-3 https://github.com/orgs/CS2103-AY1819S1-T13-3/teams/developers[developers 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>>]
=== David Choo
image::hidingmode.png[width="130", align="left"]
{empty}[http://github.com/hidingmode[Github]] [<<hidingmode#, Portfolio>>]

Role: Project Advisor
Roles: Project lead, developer +
Responsibilities: Player and command implementation, refactoring coordinator

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Hansel
image::damithc.jpg[width="150", align="left"]
{empty}[http://github.com/handshou[Github]] [<<handshou#, Portfolio>>]

Role: Team Lead +
Responsibilities: UI
Roles: Refining lead, developer +
Responsibilities: Model and command implementation

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Liu Yingnan
image::nancyquris.png[width="150", align="left"]
{empty}[http://github.com/NancyQuris[Github]] [<<nancyquris#, Portfolio>>]

Role: Developer +
Responsibilities: Data
Roles: Design lead, developer +
Responsibilities: UI and command implementation

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Hayden Phillips
image::haydenphillips.png[width="150", align="left"]
{empty}[http://github.com/HaydenPhillips[Github]] [<<haydenphillips#, Portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Roles: Keynote lead, developer +
Responsibilities: Logic refactoring and command implementation

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Qi Gongjie
image::gongjie663746.png[width="150", align="left"]
{empty}[http://github.com/Gongjie663746[Github]] [<<gongjie663746#, Portfolio>>]

Role: Developer +
Responsibilities: UI
Roles: Welfare lead, developer +
Responsibilities: Storage and command implementation

'''
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-level4/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/CS2103-AY1819S1-T13-3/main/issues[issuer 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`
Loading