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