-
Notifications
You must be signed in to change notification settings - Fork 483
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
[Song Bingxi] iP #581
Open
Propene-Dan
wants to merge
155
commits into
nus-cs2103-AY2324S1:master
Choose a base branch
from
Propene-Dan: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
[Song Bingxi] iP #581
Changes from 116 commits
Commits
Show all changes
155 commits
Select commit
Hold shift + click to select a range
28ad2b8
Add Gradle support
ed6d4d2
Bump gradle and lib version
Eclipse-Dominator d70a89c
add level-0
Propene-Dan fb563f9
added Level 1
Propene-Dan 73ab967
add MyList.java
Propene-Dan 6fabf95
added level 2
Propene-Dan ab634e9
add Task.java
Propene-Dan 0443851
changing MyList to a Task List
Propene-Dan 03e576d
added level 3
Propene-Dan 2dddc56
add Deadline.java
Propene-Dan da7ab38
add Event.java
Propene-Dan 0d3fb8f
add toDo.java
Propene-Dan 71a526c
add some comments to Task.java
Propene-Dan 32d61ff
modified MyList.java
Propene-Dan c2dd4b6
added level 4
Propene-Dan 7bb853f
bug fixed
Propene-Dan 946a420
added DanException
Propene-Dan f3c38a1
add level 5
Propene-Dan af19be1
added level 6
Propene-Dan 6e02da2
used enums
Propene-Dan 83987f8
bug fixed after using enums
Propene-Dan 6940826
input.txt modified
Propene-Dan fe6a5b7
updated deadline.java with functions
Propene-Dan 9de4371
updated event.java with funcs
Propene-Dan 610f3fe
updated task.java with funcs
Propene-Dan 31194bf
updated todo.java with functions
Propene-Dan 12dd515
updated test-ui-test
Propene-Dan 886b3f9
add level 7
Propene-Dan a2d3388
Merge branch 'branch-Level-7'
Propene-Dan 41fec5f
change field deadline into type "LocalDate"
Propene-Dan 5e9ba09
change field "start", "end" into type "LocalDate"
Propene-Dan 9f6fd76
added level-8
Propene-Dan cf1d3ca
bugs fixed
Propene-Dan 27ad786
updated input.txt
Propene-Dan 1006fc6
Merge branch 'branch-Level-8'
Propene-Dan d31bda6
added AddCommand.java
Propene-Dan 7758e65
renamed MyTask.java -> TaskList.java
Propene-Dan f898eca
added ListCommand
Propene-Dan 4cb7eeb
added ExitCommand
Propene-Dan 39bad21
added Command.java as abstract class
Propene-Dan e244086
make package dan/task
Propene-Dan 4b37e32
mk package dan.exception
Propene-Dan 972ffc3
added toString() to AddCommand
Propene-Dan a0857e9
added toString to DeleteCommand
Propene-Dan 353e7fa
added MarkCommand.java
Propene-Dan 2df0253
fixed bugs after packaging DanException
Propene-Dan 61f1ef8
added Storage.java
Propene-Dan 491f621
replaced DanException.java
Propene-Dan e76b225
added Ui.java
Propene-Dan 7bc4e60
added Parser.java
Propene-Dan e13c035
added A-OOP
Propene-Dan 1036641
created DanOperateException
Propene-Dan 6a3d9e0
created DanStorageException
Propene-Dan 3eca81e
Fixed Bugs after adding more Exceptions
Propene-Dan 40de3b0
fixed bugs in task.java after added more Exceptions
Propene-Dan a75bed8
modified showError()
Propene-Dan a8b6457
fixed bugs in Add command
Propene-Dan 43420cb
added A-OOP
Propene-Dan e49cf6a
Merge tag 'A-MoreOOP'
Propene-Dan 67e4213
added A-Packages
Propene-Dan 86da9bb
Merge tag 'A-Packages'
Propene-Dan 959ecd6
Added Parser.java
Propene-Dan 4910fd1
apply parser in ui
Propene-Dan d146702
modified AddCommand to apply Parser
Propene-Dan 5675ef8
modified Command
Propene-Dan fedbd57
modified Delete
Propene-Dan 8abb331
modified Exit
Propene-Dan cd198b9
Modified List
Propene-Dan 467d521
Modified Mark
Propene-Dan 22c6628
added to package
Propene-Dan 4311adb
bugs fixed After added packages
Propene-Dan b38037f
Merge commit 'ed6d4d25bd4e34461919ffe785a6f10f4c087552'
Propene-Dan 89fb8e7
renamed to Veneto
Propene-Dan c57515b
Further renamed to Veneto
Propene-Dan 8e017d7
change showError static
Propene-Dan e86be9c
added ToDOTest
Propene-Dan ee5e6c4
Added EventTest
Propene-Dan 6de1fc4
added UiTest
Propene-Dan 6b974b9
Added AddCommandTest(Will be filled later)
Propene-Dan c7aa0b6
Added MarkCommandTest(Will be filled later)
Propene-Dan ffc71e8
Added VenetoTest(Will be filled later)
Propene-Dan 34a9d61
Merge tag 'A-JUnit'
Propene-Dan d4ddaba
put Veneto.java to package veneto
Propene-Dan c89265c
rename constants to ALL_CAPITAL
Propene-Dan e220b59
Merge tag 'A-Jar'
Propene-Dan 327b91a
renamed DanException to VenetoException
Propene-Dan b49ec01
add JavaDoc to Veneto.java
Propene-Dan b3cbbe2
add JavaDoc to AddCommand
Propene-Dan 58e2c30
add JavaDoc to Command
Propene-Dan 8275eb4
add JavaDoc to DeleteCommand
Propene-Dan ff53235
add JavaDoc to ExitCommand
Propene-Dan 0e728ce
add JavaDoc to ListCommand
Propene-Dan 70b6d00
add JavaDoc to MarkCommand
Propene-Dan f97962d
add JavaDoc to Parser
Propene-Dan 528051b
add JavaDoc to Storage
Propene-Dan 235bcb6
add JavaDoc to Deadline
Propene-Dan 2788070
add JavaDoc to Event
Propene-Dan 7ba81c4
add JavaDoc to Task
Propene-Dan 2028dcc
add JavaDoc to TaskList
Propene-Dan 211d3cc
add JavaDoc to ToDo
Propene-Dan 7a7758e
add JavaDoc to Ui
Propene-Dan 39eb73a
Modified UiTest
Propene-Dan 1de9d95
fixed bugs after renameing DanExceptions to VenetoExceptions
Propene-Dan 17deebc
added FindCommand
Propene-Dan a961434
modified Task to support FindCommand
Propene-Dan b423a97
modified Parser to support FindCommand
Propene-Dan f3d5e2c
modified Ui to support FindCommand
Propene-Dan 45c937e
added test file(will be filled later)
Propene-Dan 83c7fc7
changed naming
Propene-Dan c73b593
Merge branch 'branch-A-JavaDoc'
Propene-Dan 320f1cc
Merge branch 'A-CodingStandard'
Propene-Dan 51de6f6
Merge tag 'level-9'
Propene-Dan e9ab221
further resolved merge conflicts
Propene-Dan 194213f
add Constants to avoid magic numbers
Propene-Dan 838daa4
make getType() non-static
Propene-Dan 81d83fc
modified Ui
Propene-Dan 157b849
added tests
Propene-Dan 7481b12
added JavaFX dependencies
Propene-Dan 358f337
added Launcher.java
Propene-Dan 9dfde0e
replace storage file
Propene-Dan c0d5fa0
added MainWindow.fxml
Propene-Dan 0b9286a
added DialogBox.fxml
Propene-Dan be95480
added MainWindow.java
Propene-Dan e205416
added DialogBox.java
Propene-Dan e040f5c
added images
Propene-Dan 52a9a05
added Main.java
Propene-Dan 2e83549
added Launcher
Propene-Dan 0805e76
changed Veneto: chat() -> getResponse()
Propene-Dan 4ae78e2
modified Ui
Propene-Dan 3768770
Merge branch 'level-10'
Propene-Dan 6e0c6ee
added a new jar file
Propene-Dan 78e06a8
Renaming fields to improve code quality.
Propene-Dan effae22
removed redundant try-catch to improve readability
Propene-Dan 85b5fe1
modified mark() in Task.java
Propene-Dan d632419
added constants to avoid magic numbers
Propene-Dan e9d938d
fixed bugs in MainWindow.java
Propene-Dan d0b01b6
Merge pull request #2 from Propene-Dan/A-CodeQuality
Propene-Dan b3d12f6
enable assertions
Propene-Dan 7c31503
added constants STORAGE_DIR and STORAGE_PATH in Storage.java
Propene-Dan f5ceeda
added assertion for invariants in Parser
Propene-Dan a3a41f8
added assertion for invariants in Storage
Propene-Dan 45a6206
added assertion for invariants in Ui
Propene-Dan a5029d5
Merge branch 'A-Assertions'
Propene-Dan f0d90f6
modified type of VenetoStorageException when no storage found
Propene-Dan abbd6f3
added isDuplicated() to check duplicate task when adding newTask to T…
Propene-Dan 3cbd8d8
added javaDoc to AddCommand.java
Propene-Dan 7d35804
added equals() to Task.java
Propene-Dan 75c053e
added equals() to ToDo.java
Propene-Dan 84f331d
added equals() and detect DateTimeParseException to Deadline.java
Propene-Dan f4321f0
added equals() and detect DateTimeParseException to Event.java
Propene-Dan 8b9f254
catch DateTimeParseException in Parser.java
Propene-Dan b31387c
add response when found duplicates
Propene-Dan 82e28de
Merge branch 'C-DetectDuplicates'
Propene-Dan 0ad66b8
Add files via upload
Propene-Dan e0e610e
Update README.md
Propene-Dan 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
plugins { | ||
id 'java' | ||
id 'application' | ||
id 'com.github.johnrengelman.shadow' version '7.1.2' | ||
} | ||
|
||
repositories { | ||
mavenCentral() | ||
} | ||
|
||
dependencies { | ||
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0' | ||
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0' | ||
} | ||
|
||
test { | ||
useJUnitPlatform() | ||
|
||
testLogging { | ||
events "passed", "skipped", "failed" | ||
|
||
showExceptions true | ||
exceptionFormat "full" | ||
showCauses true | ||
showStackTraces true | ||
showStandardStreams = false | ||
} | ||
} | ||
|
||
application { | ||
mainClass.set("veneto.Veneto") | ||
} | ||
|
||
shadowJar { | ||
archiveBaseName = "veneto" | ||
archiveClassifier = null | ||
dependsOn("distZip", "distTar") | ||
//archiveFileName = 'veneto-v1.0.0.jar' | ||
} | ||
|
||
|
||
run{ | ||
standardInput = System.in | ||
} |
Binary file not shown.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip | ||
networkTimeout=10000 | ||
validateDistributionUrl=true | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,248 @@ | ||
#!/bin/sh | ||
|
||
# | ||
# Copyright © 2015-2021 the original authors. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# https://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
|
||
############################################################################## | ||
# | ||
# Gradle start up script for POSIX generated by Gradle. | ||
# | ||
# Important for running: | ||
# | ||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is | ||
# noncompliant, but you have some other compliant shell such as ksh or | ||
# bash, then to run this script, type that shell name before the whole | ||
# command line, like: | ||
# | ||
# ksh Gradle | ||
# | ||
# Busybox and similar reduced shells will NOT work, because this script | ||
# requires all of these POSIX shell features: | ||
# * functions; | ||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», | ||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»; | ||
# * compound commands having a testable exit status, especially «case»; | ||
# * various built-in commands including «command», «set», and «ulimit». | ||
# | ||
# Important for patching: | ||
# | ||
# (2) This script targets any POSIX shell, so it avoids extensions provided | ||
# by Bash, Ksh, etc; in particular arrays are avoided. | ||
# | ||
# The "traditional" practice of packing multiple parameters into a | ||
# space-separated string is a well documented source of bugs and security | ||
# problems, so this is (mostly) avoided, by progressively accumulating | ||
# options in "$@", and eventually passing that to Java. | ||
# | ||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, | ||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; | ||
# see the in-line comments for details. | ||
# | ||
# There are tweaks for specific operating systems such as AIX, CygWin, | ||
# Darwin, MinGW, and NonStop. | ||
# | ||
# (3) This script is generated from the Groovy template | ||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt | ||
# within the Gradle project. | ||
# | ||
# You can find Gradle at https://github.com/gradle/gradle/. | ||
# | ||
############################################################################## | ||
|
||
# Attempt to set APP_HOME | ||
|
||
# Resolve links: $0 may be a link | ||
app_path=$0 | ||
|
||
# Need this for daisy-chained symlinks. | ||
while | ||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path | ||
[ -h "$app_path" ] | ||
do | ||
ls=$( ls -ld "$app_path" ) | ||
link=${ls#*' -> '} | ||
case $link in #( | ||
/*) app_path=$link ;; #( | ||
*) app_path=$APP_HOME$link ;; | ||
esac | ||
done | ||
|
||
# This is normally unused | ||
# shellcheck disable=SC2034 | ||
APP_BASE_NAME=${0##*/} | ||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit | ||
|
||
# Use the maximum available, or set MAX_FD != -1 to use that value. | ||
MAX_FD=maximum | ||
|
||
warn () { | ||
echo "$*" | ||
} >&2 | ||
|
||
die () { | ||
echo | ||
echo "$*" | ||
echo | ||
exit 1 | ||
} >&2 | ||
|
||
# OS specific support (must be 'true' or 'false'). | ||
cygwin=false | ||
msys=false | ||
darwin=false | ||
nonstop=false | ||
case "$( uname )" in #( | ||
CYGWIN* ) cygwin=true ;; #( | ||
Darwin* ) darwin=true ;; #( | ||
MSYS* | MINGW* ) msys=true ;; #( | ||
NONSTOP* ) nonstop=true ;; | ||
esac | ||
|
||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar | ||
|
||
|
||
# Determine the Java command to use to start the JVM. | ||
if [ -n "$JAVA_HOME" ] ; then | ||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then | ||
# IBM's JDK on AIX uses strange locations for the executables | ||
JAVACMD=$JAVA_HOME/jre/sh/java | ||
else | ||
JAVACMD=$JAVA_HOME/bin/java | ||
fi | ||
if [ ! -x "$JAVACMD" ] ; then | ||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME | ||
Please set the JAVA_HOME variable in your environment to match the | ||
location of your Java installation." | ||
fi | ||
else | ||
JAVACMD=java | ||
if ! command -v java >/dev/null 2>&1 | ||
then | ||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | ||
Please set the JAVA_HOME variable in your environment to match the | ||
location of your Java installation." | ||
fi | ||
fi | ||
|
||
# Increase the maximum file descriptors if we can. | ||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then | ||
case $MAX_FD in #( | ||
max*) | ||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. | ||
# shellcheck disable=SC3045 | ||
MAX_FD=$( ulimit -H -n ) || | ||
warn "Could not query maximum file descriptor limit" | ||
esac | ||
case $MAX_FD in #( | ||
'' | soft) :;; #( | ||
*) | ||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. | ||
# shellcheck disable=SC3045 | ||
ulimit -n "$MAX_FD" || | ||
warn "Could not set maximum file descriptor limit to $MAX_FD" | ||
esac | ||
fi | ||
|
||
# Collect all arguments for the java command, stacking in reverse order: | ||
# * args from the command line | ||
# * the main class name | ||
# * -classpath | ||
# * -D...appname settings | ||
# * --module-path (only if needed) | ||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. | ||
|
||
# For Cygwin or MSYS, switch paths to Windows format before running java | ||
if "$cygwin" || "$msys" ; then | ||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) | ||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) | ||
|
||
JAVACMD=$( cygpath --unix "$JAVACMD" ) | ||
|
||
# Now convert the arguments - kludge to limit ourselves to /bin/sh | ||
for arg do | ||
if | ||
case $arg in #( | ||
-*) false ;; # don't mess with options #( | ||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath | ||
[ -e "$t" ] ;; #( | ||
*) false ;; | ||
esac | ||
then | ||
arg=$( cygpath --path --ignore --mixed "$arg" ) | ||
fi | ||
# Roll the args list around exactly as many times as the number of | ||
# args, so each arg winds up back in the position where it started, but | ||
# possibly modified. | ||
# | ||
# NB: a `for` loop captures its iteration list before it begins, so | ||
# changing the positional parameters here affects neither the number of | ||
# iterations, nor the values presented in `arg`. | ||
shift # remove old arg | ||
set -- "$@" "$arg" # push replacement arg | ||
done | ||
fi | ||
|
||
|
||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. | ||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' | ||
|
||
# Collect all arguments for the java command; | ||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of | ||
# shell script including quotes and variable substitutions, so put them in | ||
# double quotes to make sure that they get re-expanded; and | ||
# * put everything else in single quotes, so that it's not re-expanded. | ||
|
||
set -- \ | ||
"-Dorg.gradle.appname=$APP_BASE_NAME" \ | ||
-classpath "$CLASSPATH" \ | ||
org.gradle.wrapper.GradleWrapperMain \ | ||
"$@" | ||
|
||
# Stop when "xargs" is not available. | ||
if ! command -v xargs >/dev/null 2>&1 | ||
then | ||
die "xargs is not available" | ||
fi | ||
|
||
# Use "xargs" to parse quoted args. | ||
# | ||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed. | ||
# | ||
# In Bash we could simply go: | ||
# | ||
# readarray ARGS < <( xargs -n1 <<<"$var" ) && | ||
# set -- "${ARGS[@]}" "$@" | ||
# | ||
# but POSIX shell has neither arrays nor command substitution, so instead we | ||
# post-process each arg (as a line of input to sed) to backslash-escape any | ||
# character that might be a shell metacharacter, then use eval to reverse | ||
# that process (while maintaining the separation between arguments), and wrap | ||
# the whole thing up as a single "set" statement. | ||
# | ||
# This will of course break if any of these variables contains a newline or | ||
# an unmatched quote. | ||
# | ||
|
||
eval "set -- $( | ||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | | ||
xargs -n1 | | ||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | | ||
tr '\n' ' ' | ||
)" '"$@"' | ||
|
||
exec "$JAVACMD" "$@" |
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.
Nice logo!