diff options
| author | Nino Breuer | 2014-10-16 15:20:22 +0200 |
|---|---|---|
| committer | Nino Breuer | 2014-10-16 15:20:22 +0200 |
| commit | 3356b1611250a916f78b6bd04b2df9b75ae55209 (patch) | |
| tree | 01ff79410c276639dc3a4561faf9179f093fba74 | |
| parent | • removed bug which caused main menu to open twice while working in offline... (diff) | |
| parent | fix NPE if no args are given & fake user info for bwIDM tests (diff) | |
| download | tutor-module-3356b1611250a916f78b6bd04b2df9b75ae55209.tar.gz tutor-module-3356b1611250a916f78b6bd04b2df9b75ae55209.tar.xz tutor-module-3356b1611250a916f78b6bd04b2df9b75ae55209.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
| -rw-r--r-- | dozentenmodul/src/main/java/gui/intro/Login_GUI.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index 5531ca23..d6bed1c8 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -289,7 +289,7 @@ public class Login_GUI extends JFrame { if (loginType == LOGIN_TYPE_BWLEHRPOOL) { - if(args[0].equals("offline_mode")) + if(args.length != 0 && args[0].equals("offline_mode")) { SessionData.session.setServerAdress("141.79.128.102"); System.out.println("Entering in offline_mode"); @@ -426,6 +426,18 @@ public class Login_GUI extends JFrame { } }; worker.execute(); + + // now we fake the user information for testing purposes. + // TODO parse the response from the SP and set the correct user info + person.verantwortlicher.setUsername(lblusername.getText().trim()); + person.verantwortlicher.setUserID(lblusername.getText().trim()); + person.verantwortlicher.setName("Joe"); + person.verantwortlicher.setVorname("B"); + person.verantwortlicher.setEMail("spam@aol.com"); + person.verantwortlicher.setHochschule("fr-test.de"); + person.verantwortlicher.setRole("Dozent"); + SessionData.session.setServerAdress("132.230.8.199"); + } // always save to user's config file. |