diff --git a/.gitignore b/.gitignore index 43f9955..647f4aa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,34 @@ .idea/ *.iml out/ +*.ipr +*.iws -# nope not having it -/src/main/webapp/dropbox.json +#Gradle +.gradletasknamecache +.gradle/ +build/ + +# dropbox credentials +/webapp/dropbox.json + + +# files for the dex VM +*.dex + +# Java class files +*.class + +# generated files +bin/ +gen/ + +# Local configuration file (sdk path, etc) +local.properties + +# Eclipse project files +.classpath +.project + +# Proguard folder generated by Eclipse +proguard/ \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..955225b --- /dev/null +++ b/build.gradle @@ -0,0 +1,16 @@ +group 'xyz.venfo.desktop' +version '1.0-SNAPSHOT' + +apply plugin: 'java' + +sourceCompatibility = 1.5 + +repositories { + mavenCentral() +} + +dependencies { + compile group: 'com.dropbox.core', name: 'dropbox-core-sdk', version: '2.0-beta-7' + compile group: 'org.json', name: 'json', version: '20160212' + testCompile group: 'junit', name: 'junit', version: '4.11' +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..30d399d 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..b76e764 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Feb 25 00:26:14 EST 2016 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/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 + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# 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\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +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"` + + # 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..8a0b282 --- /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 Windowz 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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..bb7e57e --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'IronGate' + diff --git a/src/main/java/Controller.java b/src/main/java/directory/Controller.java similarity index 58% rename from src/main/java/Controller.java rename to src/main/java/directory/Controller.java index f9da16a..13ea429 100644 --- a/src/main/java/Controller.java +++ b/src/main/java/directory/Controller.java @@ -1,22 +1,9 @@ -package main.java; +package directory; import javafx.fxml.FXML; -import javafx.scene.Node; import javafx.scene.control.MenuItem; -import javafx.scene.control.TreeCell; -import javafx.scene.control.TreeItem; import javafx.scene.control.TreeView; -import javafx.scene.image.Image; -import javafx.scene.image.ImageView; -import sun.misc.Resource; -import sun.reflect.generics.tree.Tree; -import java.io.File; -import java.io.IOException; -import java.nio.file.FileVisitOption; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.EnumSet; import java.util.ResourceBundle; public class Controller{ @@ -32,7 +19,7 @@ public class Controller{ FolderViewManager manager = new FolderViewManager(dirTree); // 2 statements in 1 line is best IronFile[] hardDrives = IronFile.listRoots(); // an array of hard drives manager.setRootDirectory(hardDrives); -// IronFile homeDir = new IronFile(System.getProperty("user.home")); // use this for specific directory +// directory.IronFile homeDir = new directory.IronFile(System.getProperty("user.home")); // use this for specific directory // manager.setRootDirectory(homeDir); } } diff --git a/src/main/java/FileTreeItem.java b/src/main/java/directory/FileTreeItem.java similarity index 98% rename from src/main/java/FileTreeItem.java rename to src/main/java/directory/FileTreeItem.java index 4b9eaa5..2d4b6b7 100644 --- a/src/main/java/FileTreeItem.java +++ b/src/main/java/directory/FileTreeItem.java @@ -1,4 +1,4 @@ -package main.java; +package directory; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/src/main/java/FolderViewManager.java b/src/main/java/directory/FolderViewManager.java similarity index 87% rename from src/main/java/FolderViewManager.java rename to src/main/java/directory/FolderViewManager.java index 962308c..e9e0535 100644 --- a/src/main/java/FolderViewManager.java +++ b/src/main/java/directory/FolderViewManager.java @@ -1,4 +1,4 @@ -package main.java; +package directory; import javafx.scene.control.TreeView; import javafx.scene.image.Image; @@ -15,12 +15,12 @@ @author Brian Patino patinobrian@gmail.com */ public class FolderViewManager { - private final Image hddIcon = new Image("/main/resources/icons/hdd.png"); -// private IronFileVisitor ironVisitor; // might be used later + private final Image hddIcon = new Image("/icons/hdd.png"); +// private directory.IronFileVisitor ironVisitor; // might be used later private TreeView view; public FolderViewManager(TreeView dirTree) { - /*ironVisitor = new IronFileVisitor(); // save this for later + /*ironVisitor = new directory.IronFileVisitor(); // save this for later ironVisitor.setRoot(new TreeItem<>());*/ // save this for later view = dirTree; } diff --git a/src/main/java/IronFile.java b/src/main/java/directory/IronFile.java similarity index 98% rename from src/main/java/IronFile.java rename to src/main/java/directory/IronFile.java index 45c3037..7f14847 100644 --- a/src/main/java/IronFile.java +++ b/src/main/java/directory/IronFile.java @@ -1,5 +1,4 @@ - -package main.java; +package directory; import java.io.File; diff --git a/src/main/java/IronFileVisitor.java b/src/main/java/directory/IronFileVisitor.java similarity index 91% rename from src/main/java/IronFileVisitor.java rename to src/main/java/directory/IronFileVisitor.java index ddc9222..eb77a4c 100644 --- a/src/main/java/IronFileVisitor.java +++ b/src/main/java/directory/IronFileVisitor.java @@ -1,10 +1,7 @@ -package main.java; +package directory; -import javafx.scene.Scene; import javafx.scene.control.TreeItem; -import javafx.scene.control.TreeView; -import java.io.File; import java.io.IOException; import java.nio.file.FileVisitResult; import java.nio.file.Path; @@ -27,7 +24,7 @@ public class IronFileVisitor extends SimpleFileVisitor{ public FileVisitResult visitFile(Path pathFile, BasicFileAttributes attrs) throws IOException { IronFile current = new IronFile(pathFile.toFile()); // System.out.println(current.getAbsolutePath()); -// root.getChildren().add(new TreeItem<>(new IronFile(current.getAbsolutePath()))); +// root.getChildren().add(new TreeItem<>(new directory.IronFile(current.getAbsolutePath()))); System.out.printf("Visiting file %s\n", pathFile); return FileVisitResult.CONTINUE; } diff --git a/src/main/java/Main.java b/src/main/java/launcher/Main.java similarity index 84% rename from src/main/java/Main.java rename to src/main/java/launcher/Main.java index 151fb3b..d64ce98 100644 --- a/src/main/java/Main.java +++ b/src/main/java/launcher/Main.java @@ -1,4 +1,4 @@ -package main.java; +package launcher; import javafx.application.Application; import javafx.fxml.FXMLLoader; @@ -17,8 +17,8 @@ public class Main extends Application { @Override public void start(Stage primaryStage) throws Exception{ -// setUserAgentStylesheet(STYLESHEET_CASPIAN); - Parent root = FXMLLoader.load(getClass().getResource("/main/resources/StartPage.fxml")); + setUserAgentStylesheet(STYLESHEET_CASPIAN); + Parent root = FXMLLoader.load(getClass().getResource("/StartPage.fxml")); primaryStage.setTitle("Iron-gate!"); primaryStage.setScene(new Scene(root, 990, 700)); Scene scene = primaryStage.getScene(); // we get the scene from above diff --git a/src/main/webapp/Dropbox.java b/src/main/java/webapp/Dropbox.java similarity index 96% rename from src/main/webapp/Dropbox.java rename to src/main/java/webapp/Dropbox.java index 5556089..e3a2088 100644 --- a/src/main/webapp/Dropbox.java +++ b/src/main/java/webapp/Dropbox.java @@ -1,4 +1,4 @@ -package main.webapp; +package webapp; import org.json.JSONException; import org.json.JSONObject; diff --git a/src/main/webapp/dropbox.json b/src/main/java/webapp/dropbox.json similarity index 100% rename from src/main/webapp/dropbox.json rename to src/main/java/webapp/dropbox.json diff --git a/src/main/resources/StartPage.fxml b/src/main/resources/StartPage.fxml index 17cb614..78162fa 100644 --- a/src/main/resources/StartPage.fxml +++ b/src/main/resources/StartPage.fxml @@ -10,7 +10,7 @@ - + diff --git a/src/test/main/Test.java b/src/test/java/Test.java similarity index 74% rename from src/test/main/Test.java rename to src/test/java/Test.java index 6c6eebb..f274cd4 100644 --- a/src/test/main/Test.java +++ b/src/test/java/Test.java @@ -1,5 +1,3 @@ -package test.main; - /** * A test of test methods */