diff options
| author | Nino Breuer | 2014-10-07 10:16:49 +0200 |
|---|---|---|
| committer | Nino Breuer | 2014-10-07 10:16:49 +0200 |
| commit | 5a1a0930d7893f4479ff48177b13e4554173c677 (patch) | |
| tree | 10c6e39bb4ff9d281ade38f40e0837c8d6657709 /dozentenmodul/src/main/java/gui/intro/Login_GUI.java | |
| parent | Removed (now) unused GUIs (diff) | |
| parent | [client] now also remember the "technisch-info" wenn going back a page (diff) | |
| download | tutor-module-5a1a0930d7893f4479ff48177b13e4554173c677.tar.gz tutor-module-5a1a0930d7893f4479ff48177b13e4554173c677.tar.xz tutor-module-5a1a0930d7893f4479ff48177b13e4554173c677.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
g
Diffstat (limited to 'dozentenmodul/src/main/java/gui/intro/Login_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/intro/Login_GUI.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index 656f58bb..a20daa55 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -241,8 +241,8 @@ public class Login_GUI extends JFrame { String hochschule = user.eMail.substring(user.eMail.indexOf("@") + 1); - person.verantwortlicher.setUsername(lblusername.getText().substring(0, - lblusername.getText().indexOf("@"))); + //person.verantwortlicher.setUsername(lblusername.getText().substring(0,lblusername.getText().indexOf("@"))); + person.verantwortlicher.setUsername(lblusername.getText().trim()); person.verantwortlicher.setName(user.lastName); person.verantwortlicher.setVorname(user.firstName); person.verantwortlicher.setEMail(user.eMail); |