midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-1403 NPE when empty language combobox in login screen / minor peer review

This commit is contained in:
Carlos Ruiz 2013-10-16 17:55:48 -05:00
parent d5a839d4a3
commit b9420079f4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
View File

@ -99,7 +99,7 @@ public class LoginPanel extends Window implements EventListener<Event>
/** /**
* *
*/ */
private static final long serialVersionUID = -3317111366328505399L; private static final long serialVersionUID = -3361823499124119753L;
private static LogAuthFailure logAuthFailure = new LogAuthFailure(); private static LogAuthFailure logAuthFailure = new LogAuthFailure();
@ -120,7 +120,7 @@ public class LoginPanel extends Window implements EventListener<Event>
protected A btnResetPassword; protected A btnResetPassword;
protected ConfirmPanel pnlButtons; protected ConfirmPanel pnlButtons;
protected boolean email_login = MSysConfig.getBooleanValue(MSysConfig.USE_EMAIL_FOR_LOGIN, false); protected boolean email_login = MSysConfig.getBooleanValue(MSysConfig.USE_EMAIL_FOR_LOGIN, false);
protected String vailidLstLanguage = null; protected String validLstLanguage = null;
public LoginPanel(Properties ctx, LoginWindow loginWindow) public LoginPanel(Properties ctx, LoginWindow loginWindow)
{ {
@ -382,7 +382,7 @@ public class LoginPanel extends Window implements EventListener<Event>
btnResetPassword.setId("btnResetPassword"); btnResetPassword.setId("btnResetPassword");
if (lstLanguage.getItems().size() > 0){ if (lstLanguage.getItems().size() > 0){
vailidLstLanguage = (String)lstLanguage.getItems().get(0).getLabel(); validLstLanguage = (String)lstLanguage.getItems().get(0).getLabel();
} }
} }
@ -402,12 +402,12 @@ public class LoginPanel extends Window implements EventListener<Event>
{ {
if(eventComp.getId().equals(lstLanguage.getId())) { if(eventComp.getId().equals(lstLanguage.getId())) {
if (lstLanguage.getSelectedItem() == null){ if (lstLanguage.getSelectedItem() == null){
lstLanguage.setValue(vailidLstLanguage); lstLanguage.setValue(validLstLanguage);
}else{ }else{
vailidLstLanguage = lstLanguage.getSelectedItem().getLabel(); validLstLanguage = lstLanguage.getSelectedItem().getLabel();
} }
languageChanged(vailidLstLanguage); languageChanged(validLstLanguage);
} }
} }
else if (event.getTarget() == btnResetPassword) else if (event.getTarget() == btnResetPassword)