aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--build.gradle12
-rwxr-xr-xgradlew164
-rw-r--r--gradlew.bat90
-rw-r--r--settings.gradle19
-rw-r--r--src/de/romjaki/logger/EventHandler.java7
-rw-r--r--src/de/romjaki/logger/Level.java18
-rw-r--r--src/de/romjaki/logger/LogEvent.java26
-rw-r--r--src/de/romjaki/logger/LogHandler.java7
-rw-r--r--src/de/romjaki/logger/LoggedEvent.java23
-rw-r--r--src/de/romjaki/logger/Logger.java179
11 files changed, 291 insertions, 260 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..680bc52
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.idea/
+gradle/
+.gradle/
+*.iml
+out/
+build/ \ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..b552fae
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'java'
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
+repositories {
+
+}
+
+dependencies {
+
+} \ No newline at end of file
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..27309d9
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## 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=""
+
+# 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, 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..832fdb6
--- /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
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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=
+
+@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/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..0c956ad
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,19 @@
+/*
+ * This settings file was auto generated by the Gradle buildInit task
+ * by 'romangraef' at '2/4/18 6:08 PM' with Gradle 2.13
+ *
+ * The settings file is used to specify which projects to include in your build.
+ * In a single project build this file can be empty or even removed.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user guide at https://docs.gradle.org/2.13/userguide/multi_project_builds.html
+ */
+
+/*
+// To declare projects as part of a multi-project build use the 'include' method
+include 'shared'
+include 'api'
+include 'services:webservice'
+*/
+
+rootProject.name = 'Logging'
diff --git a/src/de/romjaki/logger/EventHandler.java b/src/de/romjaki/logger/EventHandler.java
deleted file mode 100644
index 6e07466..0000000
--- a/src/de/romjaki/logger/EventHandler.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package de.romjaki.logger;
-
-/**
- * Created by RGR on 17.08.2017.
- */
-public @interface EventHandler {
-}
diff --git a/src/de/romjaki/logger/Level.java b/src/de/romjaki/logger/Level.java
deleted file mode 100644
index 38310ab..0000000
--- a/src/de/romjaki/logger/Level.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.romjaki.logger;
-
-/**
- * Created by RGR on 17.08.2017.
- */
-public enum Level {
- ALL,
- FAILURE,
- ERROR,
- WARNING,
- INFO,
- DEBUG,
- OFF;
-
- public boolean logs(Level level) {
- return this.ordinal() <= level.ordinal();
- }
-}
diff --git a/src/de/romjaki/logger/LogEvent.java b/src/de/romjaki/logger/LogEvent.java
deleted file mode 100644
index e62742c..0000000
--- a/src/de/romjaki/logger/LogEvent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package de.romjaki.logger;
-
-/**
- * Created by RGR on 17.08.2017.
- */
-public abstract class LogEvent {
-
- boolean interrupted = false;
- Class<?> actor;
-
- public LogEvent(Class<?> actor) {
- this.actor = actor;
- }
-
- public void interrupt() {
- interrupted = true;
- }
-
- public Class<?> getActor() {
- return actor;
- }
-
- public boolean isInterrupted() {
- return interrupted;
- }
-}
diff --git a/src/de/romjaki/logger/LogHandler.java b/src/de/romjaki/logger/LogHandler.java
deleted file mode 100644
index d5c01f6..0000000
--- a/src/de/romjaki/logger/LogHandler.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package de.romjaki.logger;
-
-/**
- * Created by RGR on 17.08.2017.
- */
-public interface LogHandler {
-}
diff --git a/src/de/romjaki/logger/LoggedEvent.java b/src/de/romjaki/logger/LoggedEvent.java
deleted file mode 100644
index 143ab0c..0000000
--- a/src/de/romjaki/logger/LoggedEvent.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package de.romjaki.logger;
-
-/**
- * Created by RGR on 17.08.2017.
- */
-public class LoggedEvent extends LogEvent {
- private final Level level;
- private final String text;
-
- public LoggedEvent(Class<?> clazz, Level level, String text) {
- super(clazz);
- this.level = level;
- this.text = text;
- }
-
- public Level getLevel() {
- return level;
- }
-
- public String getText() {
- return text;
- }
-}
diff --git a/src/de/romjaki/logger/Logger.java b/src/de/romjaki/logger/Logger.java
deleted file mode 100644
index f860d9d..0000000
--- a/src/de/romjaki/logger/Logger.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package de.romjaki.logger;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import static de.romjaki.logger.Level.*;
-
-/**
- * Created by RGR on 17.08.2017.
- */
-public class Logger {
- static String format = "[{LEVEL}][{DATE}]{NAME}: {TEXT}";
- static DateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
- String name;
- Level logLevel = WARNING;
- List<LogHandler> handlers = new ArrayList<>();
-
- public Logger() {
- this("");
- }
-
- public Logger(String name) {
- this.name = name;
- }
-
- public Level getLogLevel() {
- return logLevel;
- }
-
- public void setLogLevel(Level logLevel) {
- this.logLevel = logLevel;
- }
-
- public String getName() {
- return name;
- }
-
- public void log(Level level, String text) {
- if (logLevel.logs(level)) {
- doLog(level, text);
- }
- }
-
- public void logf(Level level, String format, Object... fillIn) {
- log(level, String.format(format, fillIn));
- }
-
- public void info(String text) {
- log(INFO, text);
- }
-
- public void infof(String format, Object... fillIn) {
- logf(INFO, format, fillIn);
- }
-
- public void warn(String text) {
- log(WARNING, text);
- }
-
- public void warnf(String format, Object... fillIn) {
- logf(WARNING, format, fillIn);
- }
-
- public void debug(String text) {
- log(DEBUG, text);
- }
-
- public void debugf(String format, Object... fillIn) {
- logf(DEBUG, format, fillIn);
- }
-
- public void error(String text) {
- log(ERROR, text);
- }
-
- public void errorf(String format, Object... fillIn) {
- logf(ERROR, format, fillIn);
- }
-
- public void failure(String text) {
- log(FAILURE, text);
- }
-
- public void failuref(String format, Object... fillIn) {
- logf(Level.FAILURE, format, fillIn);
- }
-
- public PrintStream getAsPrintStream() {
- return getAsPrintStream(ALL);
- }
-
- public PrintStream getAsPrintStream(Level level) {
- return getAsPrintStream(level, System.lineSeparator());
- }
-
- public PrintStream getAsPrintStream(Level level, String sep) {
- return new PrintStream(new OutputStream() {
- StringBuffer buffer = new StringBuffer();
-
- Object locker = new Object();
-
- @Override
- public void write(int b) throws IOException {
- char c = (char) b;
- synchronized (locker) {
- buffer.append(c);
- if (buffer.indexOf(sep) != -1) {
- String[] splits = buffer.toString().split(sep, 2);
- log(level, splits[0]);
- if (splits.length > 1) {
- buffer = new StringBuffer(splits[1].replace(sep, ""));
- } else {
- buffer = new StringBuffer();
- }
- }
- }
- }
- }, true);
- }
-
- public void exception(Throwable t) {
- t.printStackTrace(getAsPrintStream(ERROR));
- }
-
- void doLog(Level level, String text) {
- LogEvent event = new LoggedEvent(getCallingClass(), level, text);
- dispatchEvent(event);
- if (!event.isInterrupted()) {
- System.out.println(format
- .replace("{LEVEL}", level.name())
- .replace("{DATE}", dateFormat.format(new Date()))
- .replace("{NAME}", name != null ? name : "")
- .replace("{TEXT}", text));
- }
- }
-
- public void dispatchEvent(LogEvent event) {
- handlers.forEach(handler -> dispatchEvent(event, handler));
- }
-
- void dispatchEvent(LogEvent event, LogHandler handler) {
- for (Method method : handler.getClass().getMethods()) {
- invokeSingle(method, event, handler);
- }
- }
-
- void invokeSingle(Method method, LogEvent event, LogHandler handler) {
- if (method.isAnnotationPresent(EventHandler.class)) {
- Class<?>[] args = method.getParameterTypes();
- if (args.length == 1 && args[0].isInstance(event)) {
- try {
- method.invoke(handler, event);
- } catch (IllegalAccessException | InvocationTargetException e) {
- e.printStackTrace();
- }
- }
- }
- }
-
- Class<?> getCallingClass() {
- StackTraceElement[] trace = Thread.currentThread().getStackTrace();
- for (int i = 1; i < trace.length; i++) {
- StackTraceElement ste = trace[i];
- if (!ste.getClass().equals(Logger.class) && ste.getClassName().indexOf("java.lang.Thread") != 0) {
- return ste.getClass();
- }
- }
- return null;
- }
-
-}