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

[Shenyi] iP #520

Open
wants to merge 79 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
556af3f
Add Gradle support
May 24, 2020
abb503a
chore: update gitignore to include .class
ShenyiCui Aug 17, 2022
80c7139
feature: complete level-1 criteria
ShenyiCui Aug 17, 2022
4eb21b7
feature: create Task class to store items added by user
ShenyiCui Aug 17, 2022
1657ee9
feature: add function for main to add tasks
ShenyiCui Aug 17, 2022
35408e0
feature: add task marking methods
ShenyiCui Aug 17, 2022
d338c7f
refactor: change mark and unmark output msg
ShenyiCui Aug 17, 2022
1cd9afa
feature: add control flow to mark and unmark command
ShenyiCui Aug 17, 2022
4d74029
feature: add new classes for subtypes of Task
ShenyiCui Aug 17, 2022
3b9e5dd
fix: fix infinite toString recursion error
ShenyiCui Aug 17, 2022
2339fe9
refactor: change user output logic for the creation of tasks
ShenyiCui Aug 17, 2022
75af629
feature: add-text-ui-testing
ShenyiCui Aug 17, 2022
87b7c20
feature: add exception handling
ShenyiCui Aug 17, 2022
f055b47
refactor: remove taskCount
ShenyiCui Aug 17, 2022
46f2a8e
feature: add Delete Feature
ShenyiCui Aug 17, 2022
3b31edc
feature: add enums
ShenyiCui Aug 17, 2022
078d67f
refactor: fix code with google-styleguide
ShenyiCui Aug 18, 2022
0be5907
refactor: refactor out logo into static constant
ShenyiCui Aug 18, 2022
a777310
feature: add new test cases
ShenyiCui Aug 18, 2022
8bec142
chore: update .gitignore to ignore vscode files
ShenyiCui Aug 18, 2022
41835b5
refactor: refactor java styles
ShenyiCui Aug 18, 2022
ed2f926
refactor: move logic for commands from Duke to Command
ShenyiCui Aug 19, 2022
6edd53d
chore: remove unused Commands file
ShenyiCui Aug 19, 2022
2920356
feature: add new AllTaskList to track all Tasks
ShenyiCui Aug 19, 2022
ec232d2
refactor: finish moving logic of commands from Duke to Command
ShenyiCui Aug 19, 2022
2ba32d6
refactor: refactor method to throw DukeException
ShenyiCui Aug 19, 2022
5e3fb89
refactor: refactor logic for error handling
ShenyiCui Aug 19, 2022
aecbfb5
refactor: refactor logic for Task Creation
ShenyiCui Aug 19, 2022
1200027
refactor: refactor output to user for add and delete
ShenyiCui Aug 19, 2022
3178152
refactor: create uniform execption handling with DukeException
ShenyiCui Aug 19, 2022
c273e2d
fix: fix user output bugs
ShenyiCui Aug 19, 2022
2c9fe9d
fix: styling indentation
ShenyiCui Sep 1, 2022
c16beda
feat: make classes serializable
ShenyiCui Sep 1, 2022
4e2ec5d
feat: create storage utility functions
ShenyiCui Sep 1, 2022
a5ad215
feat: init load and store from storage
ShenyiCui Sep 1, 2022
a444cda
feat: add storage initilizer
ShenyiCui Sep 1, 2022
5d3ff54
feat: add date-time support to Deadlines
ShenyiCui Sep 1, 2022
914a3a3
Merge branch 'branch-Level-7'
ShenyiCui Sep 1, 2022
a6f1fc3
Merge branch 'branch-Level-8'
ShenyiCui Sep 1, 2022
8c8c815
refactor: refactor duke into a package
ShenyiCui Sep 1, 2022
ebbe069
Merge branch 'add-gradle-support'
ShenyiCui Sep 1, 2022
6641d67
feat: add jUnit Tests
ShenyiCui Sep 1, 2022
b755a38
feat: add jar build
ShenyiCui Sep 1, 2022
5a6d455
fix: coding style for switch case
ShenyiCui Sep 1, 2022
b134563
feat: add javadocs
ShenyiCui Sep 1, 2022
fbd4c79
feat: fix coding standards of javadocs
ShenyiCui Sep 1, 2022
1e446bf
feat: add find function
ShenyiCui Sep 1, 2022
182d1d5
Merge branch 'branch-A-JavaDoc'
ShenyiCui Sep 1, 2022
63a519d
Merge branch 'branch-A-CodingStandard'
ShenyiCui Sep 1, 2022
4a911eb
Merge branch 'branch-Level-9'
ShenyiCui Sep 1, 2022
40626f0
feat: add checkstyle to project
ShenyiCui Sep 3, 2022
5ce1b67
refactor: refactor code to match checkstyle standards
ShenyiCui Sep 3, 2022
275daa1
feat: add GUI
ShenyiCui Sep 3, 2022
58e4c52
feat: use java fxml
ShenyiCui Sep 11, 2022
fb91479
feat: update gradle to build new jar
ShenyiCui Sep 11, 2022
56fc5d4
feat: add assertion for user input
ShenyiCui Sep 11, 2022
fa01737
refactor: refactor to adhere to SLAP
ShenyiCui Sep 11, 2022
2328a3c
refactor: apply SLAP to commands
ShenyiCui Sep 11, 2022
3a85c8d
refactor: refactor to remove complicated expression
ShenyiCui Sep 11, 2022
9daf9c7
refactor: adjust spacing for array
ShenyiCui Sep 11, 2022
734b316
feat: add view schedule
ShenyiCui Sep 11, 2022
423cea3
Merge pull request #2 from ShenyiCui/branch-A-Assertions
ShenyiCui Sep 11, 2022
bb6673a
Merge branch 'branch-A-CodeQuality'
ShenyiCui Sep 11, 2022
ebebfc8
Merge branch 'master' into branch-B-ViewSchedule
ShenyiCui Sep 11, 2022
0e16031
refactor: refactor to adhere to SLAP
ShenyiCui Sep 11, 2022
d6f85f4
refactor: apply SLAP to commands
ShenyiCui Sep 11, 2022
c49fc3e
refactor: refactor to remove complicated expression
ShenyiCui Sep 11, 2022
41b8af0
refactor: adjust spacing for array
ShenyiCui Sep 11, 2022
8fcf17c
Merge pull request #3 from ShenyiCui/branch-A-CodeQuality
ShenyiCui Sep 11, 2022
be3b017
Merge pull request #4 from ShenyiCui/branch-B-ViewSchedule
ShenyiCui Sep 11, 2022
f3512fc
feat: add ci/cd
ShenyiCui Sep 15, 2022
41e4a9e
fix: fix bad indents in ci/cd
ShenyiCui Sep 15, 2022
7510730
fix: change ci/cd from javac to ./gradlew
ShenyiCui Sep 15, 2022
ce239aa
style: fix checkstyle errors
ShenyiCui Sep 15, 2022
299c1f6
feat: change user and bot image
ShenyiCui Sep 15, 2022
1bbc349
docs: add Ui.png image
ShenyiCui Sep 15, 2022
4c9cdd1
docs: add user guide
ShenyiCui Sep 15, 2022
99acdac
fix: fix find function bug
ShenyiCui Sep 24, 2022
73c29be
docs: add more commands to the readme
ShenyiCui Sep 24, 2022
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
Next Next commit
Add Gradle support
  • Loading branch information
damithc authored and damithc committed Jul 31, 2022
commit 556af3f47a96b32898ab4cdbd65b16486a4871e8
41 changes: 41 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
plugins {
id 'java'
id 'application'
id 'com.github.johnrengelman.shadow' version '5.1.0'
}

repositories {
mavenCentral()
}

dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0'
}

test {
useJUnitPlatform()

testLogging {
events "passed", "skipped", "failed"

showExceptions true
exceptionFormat "full"
showCauses true
showStackTraces true
showStandardStreams = false
}
}

application {
mainClassName = "seedu.duke.Duke"
}

shadowJar {
archiveBaseName = "duke"
archiveClassifier = null
}

run{
standardInput = System.in
}
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
183 changes: 183 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
#!/usr/bin/env sh

#
# Copyright 2015 the original author or 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 UN*X
##
##############################################################################

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# 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 "$*"
}

die () {
echo
echo "$*"
echo
exit 1
}

# 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
;;
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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

exec "$JAVACMD" "$@"
103 changes: 103 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
@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=.
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%" == "0" goto init

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 init

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

:init
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*

: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 %CMD_LINE_ARGS%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="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!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

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

:omega
Empty file modified text-ui-test/runtest.sh
100644 → 100755
Empty file.