summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/App.java
diff options
context:
space:
mode:
authorMichael Wilson2014-10-16 15:15:39 +0200
committerMichael Wilson2014-10-16 15:15:39 +0200
commita7b7e76e8e9de04a3cac681f474c1946fe000ea1 (patch)
tree2867903d05b9eadeb66278e181a073bb9ccf5c44 /dozentenmodul/src/main/java/App.java
parentfehler protokoll erweitert (diff)
parentfix NPE if no args are given & fake user info for bwIDM tests (diff)
downloadtutor-module-a7b7e76e8e9de04a3cac681f474c1946fe000ea1.tar.gz
tutor-module-a7b7e76e8e9de04a3cac681f474c1946fe000ea1.tar.xz
tutor-module-a7b7e76e8e9de04a3cac681f474c1946fe000ea1.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src/main/java/App.java')
-rw-r--r--dozentenmodul/src/main/java/App.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/App.java b/dozentenmodul/src/main/java/App.java
index 50658d5f..4b7a24ef 100644
--- a/dozentenmodul/src/main/java/App.java
+++ b/dozentenmodul/src/main/java/App.java
@@ -51,7 +51,7 @@ public class App {
LOGGER.info("Logger initialised.");
}
- public static void main(String[] args) {
+ public static void main(final String[] args) {
// Pruefe und Erzeuge gegebenfalls Config
try {
@@ -70,7 +70,7 @@ public class App {
public void run() {
try {
// Aufruf und Anzeige des Login Fensters
- Login_GUI frame = new Login_GUI();
+ Login_GUI frame = new Login_GUI(args);
frame.setVisible(true);
} catch (Exception e) {