summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
diff options
context:
space:
mode:
Diffstat (limited to 'dozentenmodul/src/main/java/gui/intro/Login_GUI.java')
-rw-r--r--dozentenmodul/src/main/java/gui/intro/Login_GUI.java16
1 files changed, 9 insertions, 7 deletions
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 4940e4c9..71aaaa2d 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -186,11 +186,14 @@ public class Login_GUI extends JFrame {
lblusername.setColumns(10);
// Lese Benutzername aus der Konfigurationsdatei
lblusername.setText(Config.getUsername());
- lblusername.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent arg0) {
- performLogin();
- }
- });
+
+ // this next block did nothing? since the action is triggered by the
+ // login button and not the JTextField containing the username
+// lblusername.addActionListener(new ActionListener() {
+// public void actionPerformed(ActionEvent arg0) {
+// performLogin();
+// }
+// });
panel.add(lblusername);
// Erzeugen und Hinzufuegen des Labels
@@ -263,7 +266,7 @@ public class Login_GUI extends JFrame {
bgLoginType.add(rdbtnMasterserver);
panel_1.add(rdbtnMasterserver);
- rdbtnDirekteVerbindung = new JRadioButton("Satellit");
+ rdbtnDirekteVerbindung = new JRadioButton("Lokales Satellit");
rdbtnDirekteVerbindung.setBounds(32, 85, 244, 23);
rdbtnDirekteVerbindung.setActionCommand(LOGIN_TYPE_SATLLITE);
rdbtnDirekteVerbindung.addActionListener(loginTypeActionListener);
@@ -287,7 +290,6 @@ public class Login_GUI extends JFrame {
MasterThriftConnection thrift = new MasterThriftConnection();
Client client = thrift.getMasterThriftConnection();
-
if (client == null) {
// Thrift connection to master could not be established
setStatus(Color.red, "Fehler: Masterserver nicht erreichbar.", null);