[client] Changed keylisteners in loginWindow to keyBindings. Added some Keybindings to lecture- and image tables.

1 files changed, 12 insertions, 12 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
index 518e58ef..fc7d6ca4 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
@@ -14,8 +14,11 @@ import java.awt.event.WindowEvent;
 import java.util.Iterator;
 import java.util.List;
 
+import javax.swing.AbstractAction;
 import javax.swing.DefaultComboBoxModel;
+import javax.swing.JComponent;
 import javax.swing.JFrame;
+import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 
 import org.apache.log4j.Logger;
@@ -73,7 +76,7 @@ public class LoginWindow extends LoginWindowLayout {
 	private final String NO_PASSWORD = "Kein Passwort angegeben!";
 
 	private boolean forceCustomSatellite = false;
-	
+
 	private final KeyEventDispatcher satelliteShiftDispatcher = new KeyEventDispatcher() {
 		@Override
 		public boolean dispatchKeyEvent(KeyEvent event) {
@@ -177,19 +180,16 @@ public class LoginWindow extends LoginWindowLayout {
 				doLogin();
 			}
 		});
-		// add a key listener to the password field to trigger login
-		// when the user presses the ENTER key.
-		KeyAdapter loginOnEnter = new KeyAdapter() {
+
+		// make enter key activate login
+		loginFormPanel.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
+				KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "login");
+		loginFormPanel.getActionMap().put("login", new AbstractAction() {
 			@Override
-			public void keyReleased(KeyEvent e) {
-				super.keyReleased(e);
-				if (e.getKeyCode() == KeyEvent.VK_ENTER) {
-					loginButton.doClick();
-				}
+			public void actionPerformed(ActionEvent ae) {
+				loginButton.doClick();
 			}
-		};
-		passwordField.addKeyListener(loginOnEnter);
-		saveUsernameCheck.addKeyListener(loginOnEnter);
+		});
 
 		// finally check if we had a saved username
 		String savedUsername = Config.getUsername();