summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
diff options
context:
space:
mode:
authorSimon Rettberg2015-08-14 16:43:40 +0200
committerSimon Rettberg2015-08-14 16:43:40 +0200
commit13b8f65c5e51d42591acb17bd8a25805e594ed06 (patch)
tree4d03540c2b147b146ca5818f0c57b24d48ff5756 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
parent[server] Return permissions for lectures, LectureRead changed (diff)
downloadtutor-module-13b8f65c5e51d42591acb17bd8a25805e594ed06.tar.gz
tutor-module-13b8f65c5e51d42591acb17bd8a25805e594ed06.tar.xz
tutor-module-13b8f65c5e51d42591acb17bd8a25805e594ed06.zip
[client] Design improvements
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java16
1 files changed, 15 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
index ebd0da26..5472ea42 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
@@ -20,6 +20,8 @@ import javax.swing.border.TitledBorder;
import org.apache.log4j.Logger;
import org.openslx.bwlp.thrift.iface.Organization;
import org.openslx.dozmod.gui.Gui;
+import org.openslx.dozmod.gui.control.ComboBox;
+import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer;
import org.openslx.dozmod.gui.helper.GridManager;
import org.openslx.dozmod.util.ResourceLoader;
@@ -77,7 +79,19 @@ public abstract class LoginWindowLayout extends JDialog {
loginTypes[1] = new JRadioButton("Test-Zugang mit festem Benutzer");
loginTypes[2] = new JRadioButton("Direkter Zugang zum Satelliten");
- idpCombo = new JComboBox<Organization>();
+ idpCombo = new ComboBox<>(new ComboBoxRenderer<Organization>() {
+ @Override
+ public String renderItem(Organization item) {
+ if (item == null)
+ return null;
+ return item.getDisplayName();
+ }
+
+ @Override
+ public String getEmptyText() {
+ return "Wird geladen...";
+ }
+ });
usernameField = new JTextField();
passwordField = new JPasswordField();
loginButton = new JButton("Login");