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

[butteredyakiimo] iP #525

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
28ad2b8
Add Gradle support
May 24, 2020
ed6d4d2
Bump gradle and lib version
Eclipse-Dominator Aug 5, 2023
3455fd8
Change name of chatbot and add greetings
butteredyakiimo Aug 22, 2023
9400b64
Add user input, chatbot echos command, exits with bye
butteredyakiimo Aug 22, 2023
15a2322
Store user input, list out all tasks
butteredyakiimo Aug 22, 2023
439f39c
Add a Task class, users can mark tasks as done
butteredyakiimo Aug 22, 2023
91ae7f7
Add commands todo, deadline and event, created these classes too
butteredyakiimo Aug 22, 2023
06eec05
Add TextUiTesting, made some fields private
butteredyakiimo Aug 23, 2023
755476c
Handle errors, such as invalid and incomplete commands
butteredyakiimo Aug 23, 2023
b57d752
Add delete function, fix invalid task id for mark, unmark and delete
butteredyakiimo Aug 23, 2023
6d75b93
Update changes to Duke.java, include fixes mark, unmark and delete
butteredyakiimo Aug 24, 2023
7ea3176
Add exceptions
butteredyakiimo Aug 26, 2023
6ecc10f
Tasks are saved in another file, updates when list changes
butteredyakiimo Sep 3, 2023
9fbaf7a
Merge branch 'branch-Level-7'
butteredyakiimo Sep 3, 2023
a73c97d
Change date to LocalDateTime for deadline
butteredyakiimo Sep 3, 2023
95ffd61
Dates in Events are now LocalDateTime
butteredyakiimo Sep 3, 2023
e0cdfbf
Merge branch 'branch-Level-8'
butteredyakiimo Sep 3, 2023
062d9fe
Extract out Ui, Storage, Parser and TaskList classes
butteredyakiimo Sep 3, 2023
3039976
Add new exceptions, improve abtraction of ui class
butteredyakiimo Sep 4, 2023
f0ecace
Merge branch 'branch-A-MoreOOP'
butteredyakiimo Sep 4, 2023
1a5f2ba
Create packages: duke, exceptions and tasks
butteredyakiimo Sep 4, 2023
a7139c2
Merge branch 'branch-A-Packages'
butteredyakiimo Sep 4, 2023
d6b8bb9
Merge commit 'ed6d4d25bd4e34461919ffe785a6f10f4c087552' into A-Gradle
butteredyakiimo Sep 4, 2023
c1a458f
Set up gradle to build and run Duke
butteredyakiimo Sep 4, 2023
28a4290
Merge branch 'A-Gradle'
butteredyakiimo Sep 4, 2023
208fb22
Add tests for all classes under tasks package
butteredyakiimo Sep 4, 2023
746e428
Add tests for all classes under tasks package
butteredyakiimo Sep 4, 2023
94edef4
Merge branch 'branch-A-JUnit'
butteredyakiimo Sep 4, 2023
a10b7c1
Create JAR file
butteredyakiimo Sep 4, 2023
8329871
Merge branch 'branch-A-JAR'
butteredyakiimo Sep 4, 2023
071cd0e
No exceptions are caught in Duke class, handled instead by parser
butteredyakiimo Sep 5, 2023
3980ff3
Merge branch 'branch-Fix-Exceptions'
butteredyakiimo Sep 5, 2023
feb7a33
Add Java docs for all classes, except exceptions
butteredyakiimo Sep 5, 2023
f495558
Edit code to adhere to coding standards
butteredyakiimo Sep 5, 2023
12be5fe
Add find feature
butteredyakiimo Sep 5, 2023
08fa791
Merge branch 'branch-A-JavaDoc'
butteredyakiimo Sep 5, 2023
64a4897
Merge branch 'branch-A-CodingStandard'
butteredyakiimo Sep 5, 2023
196720d
Merge branch 'branch-Level-9'
butteredyakiimo Sep 5, 2023
28b6492
Fix renaming of ID to id in exceptions and methods
butteredyakiimo Sep 5, 2023
fc3d1f6
Add more JavaDocs
butteredyakiimo Sep 5, 2023
a076c35
Merge branch 'branch-Fix-Merge-Bugs'
butteredyakiimo Sep 5, 2023
0bc4f5e
Fix cosmetic issues for javadocs
butteredyakiimo Sep 5, 2023
63bca76
Fix nested code
butteredyakiimo Sep 7, 2023
0a3bdca
Add more unit tests
butteredyakiimo Sep 8, 2023
5cd50af
Fix style violations
butteredyakiimo Sep 8, 2023
c7e834b
Merge branch 'branch-A-CheckStyle'
butteredyakiimo Sep 8, 2023
4e169a9
Add GUI
butteredyakiimo Sep 8, 2023
aa7bc79
Change layout
butteredyakiimo Sep 8, 2023
dc1b7b1
Merge branch 'branch-Level-10'
butteredyakiimo Sep 8, 2023
2348339
Add configurations to build.gradle to create jar file
butteredyakiimo Sep 12, 2023
ce2258a
Add assertions to some classes.
butteredyakiimo Sep 12, 2023
5b2654a
Modify code to adhere to code quality standards.
butteredyakiimo Sep 13, 2023
d9647de
Merge pull request #2 from butteredyakiimo/branch-A-Assertions
butteredyakiimo Sep 13, 2023
c2a3c8b
Merge branch 'master' into branch-A-CodeQuality
butteredyakiimo Sep 13, 2023
9d35c58
Merge pull request #1 from butteredyakiimo/branch-A-CodeQuality
butteredyakiimo Sep 13, 2023
4e483f9
Add a tag to the list command
butteredyakiimo Sep 13, 2023
0ef1a67
Add a tag to the list command
butteredyakiimo Sep 13, 2023
022a367
Merge branch 'branch-Reminders'
butteredyakiimo Sep 13, 2023
33e9039
Fix style
butteredyakiimo Sep 13, 2023
c2e2e9b
Add background color for response dialog label
butteredyakiimo Sep 19, 2023
b123a36
Set title of stage to BUTTER
butteredyakiimo Sep 19, 2023
5f0accf
Merge branch 'branch-A-BetterGui'
butteredyakiimo Sep 19, 2023
743ab4d
Add user guide
butteredyakiimo Sep 19, 2023
4842575
Fix paragraph issue in user guide
butteredyakiimo Sep 19, 2023
c6eec78
Modify code to meet ip standards
butteredyakiimo Sep 19, 2023
7182704
Modify list [FLAG] to include todos
butteredyakiimo Sep 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ bin/

/text-ui-test/ACTUAL.TXT
text-ui-test/EXPECTED-UNIX.TXT

/src/main/java/*.class
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me 😄

3 changes: 3 additions & 0 deletions META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: duke.Duke

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Duke project template
# duke.Duke project template

This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it.

Expand All @@ -13,7 +13,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version.
1. If there are any further prompts, accept the defaults.
1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).<br>
In the same dialog, set the **Project language level** field to the `SDK default` option.
3. After that, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output:
3. After that, locate the `src/main/java/duke.Duke.java` file, right-click it, and choose `Run duke.Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output:
```
Hello from
____ _
Expand Down
43 changes: 43 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
plugins {
id 'java'
id 'application'
id 'checkstyle'
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("duke.Duke")
}

shadowJar {
archiveBaseName = "duke"
archiveClassifier = null
dependsOn("distZip", "distTar")
}

run{
standardInput = System.in
}
6 changes: 6 additions & 0 deletions data/duke.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
T | 0 | eat cookies
T | 0 | bake cookie
T | 0 | bake more coolies
T | 0 | bake more cookies
E | 0 | cookie baking event | 2023-09-08 18:00 | 2023-09-09 01:00
D | 0 | cookies marathon | 2023-09-08 17:00
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 7 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
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
248 changes: 248 additions & 0 deletions gradlew
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" "$@"
Loading