diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..4157aec --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: java + +jdk: + - oraclejdk8 \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..35a0a6c --- /dev/null +++ b/build.gradle @@ -0,0 +1,29 @@ +apply plugin: 'java' +apply plugin: 'eclipse' + +sourceCompatibility = 1.8 + +sourceSets { + test { + java { + srcDir 'src/test' + } + } +} +repositories { + mavenCentral() +} + +dependencies { + testCompile 'junit:junit:4.12' +} + +jar { + manifest { + attributes 'Main-Class': 'main.java.gui.MainApp' + } +} + +task wrapper(type: Wrapper) { + gradleVersion = '2.11' +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5ccda13 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..234eeea --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Mar 31 11:57:16 SGT 2016 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# 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 +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# 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 + +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" ] ; 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, switch paths to Windows format before running java +if $cygwin ; 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=$((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 + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..72d362d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@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 + +@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= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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 +if "%@eval[2+2]" == "4" goto 4NT_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=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +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 diff --git a/src/main/java/gui/CommandBarController.java b/src/main/java/gui/CommandBarController.java index 0432037..be2591f 100644 --- a/src/main/java/gui/CommandBarController.java +++ b/src/main/java/gui/CommandBarController.java @@ -12,7 +12,7 @@ /** * This class handles the TextField that users input commands in and the Label * that shows feedback. - * + * * @author Sebastian Quek * */ @@ -24,7 +24,7 @@ public class CommandBarController extends BorderPane { @FXML private TextField commandBar; - private static final String COMMAND_BAR_LAYOUT_FXML = "/main/resources/layouts/CommandBar.fxml"; + private static final String COMMAND_BAR_LAYOUT_FXML = "/layouts/CommandBar.fxml"; private MainApp mainApp; diff --git a/src/main/java/gui/FileStatsController.java b/src/main/java/gui/FileStatsController.java index 7257c1d..4999bed 100644 --- a/src/main/java/gui/FileStatsController.java +++ b/src/main/java/gui/FileStatsController.java @@ -16,7 +16,7 @@ /** * This class controls the view that shows an author's individual contributions * to the source files. - * + * * @author Sebastian Quek * */ @@ -24,11 +24,11 @@ public class FileStatsController extends BorderPane { @FXML private ListView fileStats; - + @FXML private Label title; - private static final String FILE_STATS_FXML = "/main/resources/layouts/FileStats.fxml"; + private static final String FILE_STATS_FXML = "/layouts/FileStats.fxml"; private ArrayList items; @@ -43,18 +43,18 @@ public FileStatsController(String authorName, } catch (IOException e) { e.printStackTrace(); } - + title.setText(authorName); initStats(statistics); } private void initStats(HashMap statistics) { items = new ArrayList(); - + for (SourceFile sourceFile : statistics.keySet()) { addFileStatsItem(sourceFile, statistics.get(sourceFile)); } - + Collections.sort(items); fileStats.setItems(FXCollections.observableList(items)); } @@ -62,7 +62,7 @@ private void initStats(HashMap statistics) { /** * Each FileStatsItem corresponds to a source file and is displayed as a row * in this custom view. - * + * * @param currentFile * @param currentNumLines */ diff --git a/src/main/java/gui/FileStatsItem.java b/src/main/java/gui/FileStatsItem.java index 093d0a2..21a5a2c 100644 --- a/src/main/java/gui/FileStatsItem.java +++ b/src/main/java/gui/FileStatsItem.java @@ -13,7 +13,7 @@ * This class represents each row in the custom FileStats view. * It implements Comparable so that they can be sorted by their percentage * values. - * + * * @author Sebastian Quek * */ @@ -35,7 +35,7 @@ public class FileStatsItem extends BorderPane implements @FXML private Shape circle; - private static final String FILE_STATS_ITEM_FXML = "/main/resources/layouts/FileStatsItem.fxml"; + private static final String FILE_STATS_ITEM_FXML = "/layouts/FileStatsItem.fxml"; private static final String STRING_TRUNCATED_FORMAT = "...%s"; private static final String STRING_LINES_OF_CODE_FORMAT = "%s lines"; diff --git a/src/main/java/gui/MainApp.java b/src/main/java/gui/MainApp.java index 34aa17d..e18feeb 100644 --- a/src/main/java/gui/MainApp.java +++ b/src/main/java/gui/MainApp.java @@ -12,15 +12,15 @@ /** * MainApp is the entry point for JavaFX applications. - * + * * @author Sebastian Quek * */ public class MainApp extends Application { - private static final String ROOT_LAYOUT_FXML = "/main/resources/layouts/RootLayout.fxml"; + private static final String ROOT_LAYOUT_FXML = "/layouts/RootLayout.fxml"; private static final String WINDOW_TITLE = "Collate"; - + private static final String FEEDBACK_COLLATE_SUCCESSFUL = "Collate successful!"; private static final String FEEDBACK_EMPTY = ""; private static final String FEEDBACK_INVALID_COMMAND = "Invalid command."; @@ -59,7 +59,7 @@ private void initRootLayout() { /** * Initialises the main JavaFX Stage with RootLayout being the main Scene. - * + * * @param primaryStage */ private void initPrimaryStage(Stage primaryStage) { @@ -102,17 +102,17 @@ public void handleKeyPress(CommandBarController commandBarController, private void handleEnterPress(CommandBarController commandBarController, String userInput) { switch (logic.executeCommand(userInput)) { - + case COLLATE : commandBarController.setFeedback(FEEDBACK_COLLATE_SUCCESSFUL); case SUMMARY : addSummary(this); break; - + case EXIT : primaryStage.hide(); break; - + case VIEW : String authorName = logic.getTargetAuthorName(); if (authorName != null) { diff --git a/src/main/java/gui/SummaryController.java b/src/main/java/gui/SummaryController.java index 440f874..563099c 100644 --- a/src/main/java/gui/SummaryController.java +++ b/src/main/java/gui/SummaryController.java @@ -16,12 +16,12 @@ /** * This class controls the Summary view by loading the corresponding fxml file * and initialising the table's columns with the authors' properties. - * + * * @author Sebastian Quek * */ public class SummaryController extends StackPane { - + @FXML private TableView summaryTable; @FXML @@ -31,7 +31,7 @@ public class SummaryController extends StackPane { @FXML private TableColumn proportionColumn; - private static final String OVERVIEW_LAYOUT_FXML = "/main/resources/layouts/Summary.fxml"; + private static final String OVERVIEW_LAYOUT_FXML = "/layouts/Summary.fxml"; public SummaryController(Collection inputSummaryData) { FXMLLoader loader = new FXMLLoader(getClass().getResource(OVERVIEW_LAYOUT_FXML)); @@ -43,7 +43,7 @@ public SummaryController(Collection inputSummaryData) { } catch (IOException e) { e.printStackTrace(); } - + ObservableList summaryData = FXCollections.observableArrayList(); for (Author author : inputSummaryData) { summaryData.add(new AuthorBean(author)); diff --git a/src/main/resources/layouts/RootLayout.fxml b/src/main/resources/layouts/RootLayout.fxml index 1b278b2..404d448 100644 --- a/src/main/resources/layouts/RootLayout.fxml +++ b/src/main/resources/layouts/RootLayout.fxml @@ -7,5 +7,5 @@