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

[vivienherq] iP #529

Open
wants to merge 72 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
72 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
4b12bd6
rename
vivienherq Aug 23, 2023
a6f13d3
greet & exit
vivienherq Aug 23, 2023
6ae3cc1
echo
vivienherq Aug 23, 2023
cfc7c19
store & list
vivienherq Aug 23, 2023
ae180ce
task class
vivienherq Aug 23, 2023
07d666a
mark & unmark
vivienherq Aug 23, 2023
4cec3c5
lvl4 todo, event & deadline classes
vivienherq Aug 23, 2023
a056e50
lvl4 todo
vivienherq Aug 23, 2023
acbfead
lvl4 create todos, events, deadlines
vivienherq Aug 23, 2023
0dadc72
lvl 5 handle errors
vivienherq Sep 1, 2023
91b96cf
lvl 6 delete
vivienherq Sep 1, 2023
2445b29
add text ui testing
vivienherq Sep 6, 2023
8f55d5e
add save tasks and load task
vivienherq Sep 6, 2023
4fc7fc4
implement datetime recognition for deadline
vivienherq Sep 6, 2023
725c47e
Refactor code into Ui, Storage, Parser, TaskList, Command classes
vivienherq Sep 11, 2023
34281a2
Revert latest commit to push to A-MoreOOP Branch
vivienherq Sep 11, 2023
6bcc6ec
Refactor code into Ui, Storage, Parser, TaskList, Command classes
vivienherq Sep 11, 2023
85e358c
Organise classes into packages
vivienherq Sep 11, 2023
8144a1c
Merge branch 'A-Packages'
vivienherq Sep 11, 2023
89204e3
Merge pull request #1 from vivienherq/add-gradle-support
vivienherq Sep 13, 2023
23714e1
Add Gradle support
vivienherq Sep 13, 2023
88e778a
Add JUnit tests
vivienherq Sep 13, 2023
9b188fa
Merge pull request #2 from vivienherq/A-JUnit
vivienherq Sep 13, 2023
1fef7f7
Modify build.gradle for JAR creation
vivienherq Sep 13, 2023
0314cf6
Implement find feature to search for tasks
vivienherq Sep 13, 2023
1e5aa08
Add JavaDocs to methods and classes
vivienherq Sep 13, 2023
9dcbe69
Modify code to apply coding standards
vivienherq Sep 13, 2023
b4f582c
Merge pull request #3 from vivienherq/branch-Level-9
vivienherq Sep 13, 2023
fbeeb36
Merge pull request #4 from vivienherq/branch-A-CodingStandard
vivienherq Sep 13, 2023
5e0e18e
Merge branch 'master' into branch-A-JavaDoc
vivienherq Sep 13, 2023
69be13d
Merge pull request #5 from vivienherq/branch-A-JavaDoc
vivienherq Sep 13, 2023
c6507ac
Fix coding style violations
vivienherq Sep 13, 2023
6fbf6bd
Create GUI for Dude
vivienherq Sep 14, 2023
1f85905
Add functionality to GUI for dude
vivienherq Sep 14, 2023
0e72557
Add user interaction functionality to GUI for Dude
vivienherq Sep 14, 2023
904825f
Merge pull request #6 from vivienherq/branch-Level-10
vivienherq Sep 14, 2023
e0f8bf4
Add assertions
vivienherq Sep 14, 2023
b9eff0b
Improve code quality
vivienherq Sep 14, 2023
b57f610
Merge pull request #7 from vivienherq/branch-A-Assertions
vivienherq Sep 14, 2023
46ac71c
Merge pull request #8 from vivienherq/branch-A-CodeQuality
vivienherq Sep 14, 2023
cc740a9
Set up CI
vivienherq Sep 14, 2023
2a9f2ab
Merge pull request #9 from vivienherq/branch-A-CI
vivienherq Sep 14, 2023
5f3101e
Add Note and NoteList classes
vivienherq Sep 15, 2023
bd2e27d
Add and modify methods to support Notes
vivienherq Sep 15, 2023
1130fc3
Fix Checkstyle violations
vivienherq Sep 15, 2023
35e7c49
Merge pull request #10 from vivienherq/branch-D-Notes
vivienherq Sep 15, 2023
19c71fe
Reorganise project structure and add packages
vivienherq Sep 15, 2023
ffb7e1f
Fix Checkstyle violations
vivienherq Sep 15, 2023
44cfd21
Storage: prevent null values from being returned
vivienherq Sep 15, 2023
c963ac1
Find command: make matching case-insensitive
vivienherq Sep 15, 2023
af043e0
Configure dimension and layout of GUI
vivienherq Sep 15, 2023
d2a8732
Improve GUI
vivienherq Sep 17, 2023
999bd2d
Merge pull request #12 from vivienherq/branch-A-BetterGui
vivienherq Sep 17, 2023
1c87ec3
Add delete note command
vivienherq Sep 22, 2023
2a15d2d
Add additional checks for error handling
vivienherq Sep 22, 2023
94c8ed9
Add exceptions to Parser class
vivienherq Sep 22, 2023
fa95713
Add exceptions to Storage class
vivienherq Sep 22, 2023
c40cdf4
Improve error checking and exception handling for date and time
vivienherq Sep 22, 2023
e3b47f8
Merge pull request #13 from vivienherq/branch-A-MoreErrorHandling
vivienherq Sep 22, 2023
a527597
Add delay before exiting and closing GUI
vivienherq Sep 22, 2023
3a58feb
Add personality for Dude
vivienherq Sep 22, 2023
7197092
Merge pull request #14 from vivienherq/branch-A-Personality
vivienherq Sep 22, 2023
8abaff7
Improve exception handling for parser
vivienherq Sep 22, 2023
14375d2
Upload image of UI
vivienherq Sep 22, 2023
1c14b2f
Improve code quality
vivienherq Sep 22, 2023
fbe3510
Update README.md
vivienherq Sep 23, 2023
4044a2c
Find command: support searching notes
vivienherq Sep 23, 2023
224d2a7
Update README.md
vivienherq Sep 23, 2023
8ec8d9e
Refactor classes into packages
vivienherq Sep 23, 2023
ddb13e1
Configure build.gradle to create fat JAR file
vivienherq Sep 23, 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
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 '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("dude.Dude")
}

shadowJar {
archiveBaseName = "dude"
archiveFileName = "dude.jar"
archiveClassifier = null
dependsOn("distZip", "distTar")
}

run{
standardInput = System.in
}
6 changes: 6 additions & 0 deletions data/dude.txt

Choose a reason for hiding this comment

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

This file can be excluded from commits!

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
T | 0 | eat
T | 1 | sleep
D | 0 | ip | 2023-09-22T23:59
E | 0 | ifg closing ceremony | 2023-09-22T18:00 | 2023-09-22T21:00
E | 0 | gen meeting | 2023-09-12T20:00 | 2023-09-12T22:00
T | 0 | go to school
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 6 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
244 changes: 244 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,244 @@
#!/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

# 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"'

# 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
which java >/dev/null 2>&1 || 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

# 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

# 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" "$@"
92 changes: 92 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
Loading