diff options
author | Simon Rettberg | 2016-01-29 11:03:52 +0100 |
---|---|---|
committer | Simon Rettberg | 2016-01-29 11:03:52 +0100 |
commit | 7d81da615f089f06ba81c2cc2b67bc3ff4def957 (patch) | |
tree | 2d8cad390cbe7937b51a6f1b4693f8a5e6ed0d25 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java | |
parent | [client] Minor tweaks to image details window (diff) | |
download | tutor-module-7d81da615f089f06ba81c2cc2b67bc3ff4def957.tar.gz tutor-module-7d81da615f089f06ba81c2cc2b67bc3ff4def957.tar.xz tutor-module-7d81da615f089f06ba81c2cc2b67bc3ff4def957.zip |
[client] Sanitize coding style/conventions in GUI classes
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java | 82 |
1 files changed, 41 insertions, 41 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 d525062f..0c03df89 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 @@ -107,12 +107,12 @@ public class LoginWindow extends LoginWindowLayout { }); // first do all listeners stuff for (final LoginType type : LoginType.values()) { - loginTypes[type.id].setActionCommand(type.toString()); - loginTypes[type.id].addItemListener(new ItemListener() { + rdoLoginType[type.id].setActionCommand(type.toString()); + rdoLoginType[type.id].addItemListener(new ItemListener() { @Override public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.SELECTED) { - idpCombo.setEnabled(idpCombo.getModel().getSize() != 0 && type == LoginType.ECP); + cboOrganization.setEnabled(cboOrganization.getModel().getSize() != 0 && type == LoginType.ECP); loginType = type; } } @@ -134,11 +134,11 @@ public class LoginWindow extends LoginWindowLayout { enableLogin(false); } // While filling, disable - idpCombo.setEnabled(false); + cboOrganization.setEnabled(false); // Not yet implemented, disable - loginTypes[LoginType.DIRECT_CONNECT.id].setEnabled(false); + rdoLoginType[LoginType.DIRECT_CONNECT.id].setEnabled(false); // enable the corresponding button - loginTypes[savedLoginType.id].setSelected(true); + rdoLoginType[savedLoginType.id].setSelected(true); loginType = savedLoginType; QuickTimer.scheduleOnce(new Task() { @@ -174,7 +174,7 @@ public class LoginWindow extends LoginWindowLayout { KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(satelliteShiftDispatcher); - loginButton.addActionListener(new ActionListener() { + btnLogin.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { doLogin(); @@ -182,12 +182,12 @@ public class LoginWindow extends LoginWindowLayout { }); // make enter key activate login - loginFormPanel.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( + pnlLoginForm.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "login"); - loginFormPanel.getActionMap().put("login", new AbstractAction() { + pnlLoginForm.getActionMap().put("login", new AbstractAction() { @Override public void actionPerformed(ActionEvent ae) { - loginButton.doClick(); + btnLogin.doClick(); } }); @@ -198,27 +198,27 @@ public class LoginWindow extends LoginWindowLayout { } }); - usernameField.getDocument().addDocumentListener(new TextChangeListener() { + txtUsername.getDocument().addDocumentListener(new TextChangeListener() { @Override public void changed() { - if (idpCombo.getSelectedIndex() != -1) + if (cboOrganization.getSelectedIndex() != -1) return; - String name = usernameField.getText(); + String name = txtUsername.getText(); int at = name.indexOf('@'); if (at == -1) return; - final int oldCursorPos = usernameField.getCaretPosition(); + final int oldCursorPos = txtUsername.getCaretPosition(); String suffix = name.substring(at + 1); Organization organization = OrganizationCache.find(suffix); if (organization == null) return; final String nameOnly = name.substring(0, at); - idpCombo.setSelectedItem(organization); + cboOrganization.setSelectedItem(organization); Gui.asyncExec(new Runnable() { @Override public void run() { - usernameField.setText(nameOnly); - usernameField.setCaretPosition(Math.min(oldCursorPos, nameOnly.length())); + txtUsername.setText(nameOnly); + txtUsername.setCaretPosition(Math.min(oldCursorPos, nameOnly.length())); } }); } @@ -238,11 +238,11 @@ public class LoginWindow extends LoginWindowLayout { return; } - idpCombo.setModel(new DefaultComboBoxModel<Organization>(orgs.toArray(new Organization[orgs.size()]))); + cboOrganization.setModel(new DefaultComboBoxModel<Organization>(orgs.toArray(new Organization[orgs.size()]))); // now check if we had a saved identity provider String savedOrganizationId = Config.getIdentityProvider(); - idpCombo.setSelectedItem(OrganizationCache.find(savedOrganizationId)); - idpCombo.setEnabled(idpCombo.getModel().getSize() != 0 && loginType == LoginType.ECP); + cboOrganization.setSelectedItem(OrganizationCache.find(savedOrganizationId)); + cboOrganization.setEnabled(cboOrganization.getModel().getSize() != 0 && loginType == LoginType.ECP); } /** @@ -251,9 +251,9 @@ public class LoginWindow extends LoginWindowLayout { */ private void doSaveConfig() { // first we need to check if the "Remember me" button is active - if (saveUsernameCheck.isSelected()) { + if (chkSaveUsername.isSelected()) { // save username - String username = usernameField.getText(); + String username = txtUsername.getText(); if (!username.isEmpty()) { Config.setUsername(username); } @@ -263,7 +263,7 @@ public class LoginWindow extends LoginWindowLayout { // always save the authentication method and potentially the identity provider Config.setAuthenticationMethod(loginType.toString()); // save the selected identity provider - Organization selectedOrg = idpCombo.getItemAt(idpCombo.getSelectedIndex()); + Organization selectedOrg = cboOrganization.getItemAt(cboOrganization.getSelectedIndex()); if (selectedOrg != null) { Config.setIdentityProvider(selectedOrg.organizationId); } @@ -282,15 +282,15 @@ public class LoginWindow extends LoginWindowLayout { LOGGER, null); return; } - if (loginType == LoginType.ECP && idpCombo.getSelectedIndex() == -1) { + if (loginType == LoginType.ECP && cboOrganization.getSelectedIndex() == -1) { Gui.showMessageBox(this, "Bitte wählen Sie ihre Organisation als 'Identity Provider'.", MessageType.ERROR, LOGGER, null); - idpCombo.requestFocusInWindow(); + cboOrganization.requestFocusInWindow(); return; } // here we only check for the fields - String username = usernameField.getText(); - final String password = String.copyValueOf(passwordField.getPassword()); + String username = txtUsername.getText(); + final String password = String.copyValueOf(txtPassword.getPassword()); // login clicked, lets first read the fields if (username.isEmpty()) { Gui.showMessageBox(this, NO_USERNAME, MessageType.ERROR, LOGGER, null); @@ -302,7 +302,7 @@ public class LoginWindow extends LoginWindowLayout { } // determine which organization was selected by the user. - Organization selectedOrg = idpCombo.getItemAt(idpCombo.getSelectedIndex()); + Organization selectedOrg = cboOrganization.getItemAt(cboOrganization.getSelectedIndex()); // now lets check if the username contains an organization // for this we just check if the given username contains a '@' @@ -322,12 +322,12 @@ public class LoginWindow extends LoginWindowLayout { + "\nWollen Sie die in Ihrem Benutzername gefundene Organisation verwenden?", MessageType.QUESTION_YESNO, null, null); if (ret) { - idpCombo.setSelectedItem(orgInUsername); + cboOrganization.setSelectedItem(orgInUsername); selectedOrg = orgInUsername; } } // always set the username to everything before '@' - usernameField.setText(usernameSplit[0]); + txtUsername.setText(usernameSplit[0]); username = usernameSplit[0]; } } @@ -424,7 +424,7 @@ public class LoginWindow extends LoginWindowLayout { importFingerprints(data.satellites); // now try to init the session with the data received if (ThriftActions.initSession(data, forceCustomSatellite, SwingUtilities.getWindowAncestor(this))) { - if (saveUsernameCheck.isSelected()) { + if (chkSaveUsername.isSelected()) { Config.saveCurrentSession(Session.getSatelliteAddress(), Session.getSatelliteToken(), Session.getMasterToken()); } @@ -439,21 +439,21 @@ public class LoginWindow extends LoginWindowLayout { } private void enableLogin(boolean enable) { - loginButton.setEnabled(enable); - usernameField.setEnabled(enable); - passwordField.setEnabled(enable); - loginTypePanel.setEnabled(enable); - loginFormPanel.setEnabled(enable); - saveUsernameCheck.setEnabled(enable); + btnLogin.setEnabled(enable); + txtUsername.setEnabled(enable); + txtPassword.setEnabled(enable); + pnlLoginType.setEnabled(enable); + pnlLoginForm.setEnabled(enable); + chkSaveUsername.setEnabled(enable); if (enable) { // Do this here, otherwise the focus might not be set String savedUsername = Config.getUsername(); if (savedUsername != null && !savedUsername.isEmpty()) { - usernameField.setText(savedUsername); - saveUsernameCheck.setSelected(true); - passwordField.requestFocusInWindow(); + txtUsername.setText(savedUsername); + chkSaveUsername.setSelected(true); + txtPassword.requestFocusInWindow(); } else { - usernameField.requestFocusInWindow(); + txtUsername.requestFocusInWindow(); } } } |