diff options
| author | unknown | 2014-05-08 13:59:31 +0200 |
|---|---|---|
| committer | unknown | 2014-05-08 13:59:31 +0200 |
| commit | ea2bbcbaa29508d11404a31b2c17380edc38f80a (patch) | |
| tree | 275929ef8da853da76e62ad1780ef233aadf0120 /Dozentenmodul/src/gui/intro/Login_GUI.java | |
| parent | FAQ & OTRS (diff) | |
| parent | -Kopieren von Temp zu Prod inkl. änderung des Pfades in SQL-DB (diff) | |
| download | tutor-module-ea2bbcbaa29508d11404a31b2c17380edc38f80a.tar.gz tutor-module-ea2bbcbaa29508d11404a31b2c17380edc38f80a.tar.xz tutor-module-ea2bbcbaa29508d11404a31b2c17380edc38f80a.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class
Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class
Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
Diffstat (limited to 'Dozentenmodul/src/gui/intro/Login_GUI.java')
| -rw-r--r-- | Dozentenmodul/src/gui/intro/Login_GUI.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index 019a2ec7..75320b58 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -12,6 +12,8 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; +import java.util.UUID; + import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; @@ -89,6 +91,7 @@ public class Login_GUI extends JFrame { // Fenster darf nicht vergrößert werden setResizable(false); + try { // Setzt das Look and Feel auf System UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); @@ -213,12 +216,14 @@ public class Login_GUI extends JFrame { + ", mein Token für den Satelliten " + result.authToken); + /* // show received information JOptionPane.showMessageDialog(null, "Freiburg liefert:" + "\nSession-ID = " + result.sessionId + "\nToken = " + result.authToken + "\nSatellit = " + result.serverAddress, "Rückgabewerte aus Freiburg", JOptionPane.INFORMATION_MESSAGE); + */ if (login == true) { /* @@ -248,6 +253,7 @@ public class Login_GUI extends JFrame { person.verantwortlicher.setEMail(user.eMail); person.verantwortlicher.setHochschule(hochschule); + /* // show processed information JOptionPane .showMessageDialog( @@ -289,6 +295,7 @@ public class Login_GUI extends JFrame { .getEMail(), "Werte vergleichen", JOptionPane.INFORMATION_MESSAGE); + */ try { //Lege config File an und entscheide welches Fenster als nächstes geöffnet wird |