You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by no...@apache.org on 2009/06/27 15:16:49 UTC
svn commit: r788967 - in /labs/hupa/src/main/java/org/apache/hupa:
client/HupaConstants.java client/HupaConstants.properties
client/model/SessionModel.java client/view/LoginView.java
client/view/MainView.java common/data/Session.java
Author: norman
Date: Sat Jun 27 13:16:48 2009
New Revision: 788967
URL: http://svn.apache.org/viewvc?rev=788967&view=rev
Log:
handle invalid logins
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/HupaConstants.java
labs/hupa/src/main/java/org/apache/hupa/client/HupaConstants.properties
labs/hupa/src/main/java/org/apache/hupa/client/model/SessionModel.java
labs/hupa/src/main/java/org/apache/hupa/client/view/LoginView.java
labs/hupa/src/main/java/org/apache/hupa/client/view/MainView.java
labs/hupa/src/main/java/org/apache/hupa/common/data/Session.java
Modified: labs/hupa/src/main/java/org/apache/hupa/client/HupaConstants.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/HupaConstants.java?rev=788967&r1=788966&r2=788967&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/HupaConstants.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/HupaConstants.java Sat Jun 27 13:16:48 2009
@@ -59,4 +59,5 @@
public String mailTableDate();
public String loading();
+ public String loginInvalid();
}
Modified: labs/hupa/src/main/java/org/apache/hupa/client/HupaConstants.properties
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/HupaConstants.properties?rev=788967&r1=788966&r2=788967&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/HupaConstants.properties (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/HupaConstants.properties Sat Jun 27 13:16:48 2009
@@ -17,4 +17,5 @@
mailTableFrom=From
mailTableSubject=Subject
mailTableDate=Date
-loading=Loading....
\ No newline at end of file
+loading=Loading....
+loginInvalid=Unable to login, please check username and password
\ No newline at end of file
Modified: labs/hupa/src/main/java/org/apache/hupa/client/model/SessionModel.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/model/SessionModel.java?rev=788967&r1=788966&r2=788967&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/model/SessionModel.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/model/SessionModel.java Sat Jun 27 13:16:48 2009
@@ -44,7 +44,7 @@
new AsyncCallback<Session>() {
public void onFailure(Throwable caught) {
-
+ update(null,event);
}
public void onSuccess(Session result) {
@@ -55,7 +55,8 @@
}
public void logout(Session session,Event ev) {
- update(null,ev);
+ session.reset();
+ update(session,ev);
}
}
Modified: labs/hupa/src/main/java/org/apache/hupa/client/view/LoginView.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/view/LoginView.java?rev=788967&r1=788966&r2=788967&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/view/LoginView.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/view/LoginView.java Sat Jun 27 13:16:48 2009
@@ -40,6 +40,7 @@
private TextBox usernameTextBox = new TextBox();
private PasswordTextBox passwordTextBox = new PasswordTextBox();
private CheckBox saveBox = new CheckBox(constants.saveLoginLabel());
+ private Label errorLabel = new Label(constants.loginInvalid());
private LoadingMasker masker = new LoadingMasker();
private int minUsernameLength = 1;
@@ -83,6 +84,9 @@
resetButton.addClickHandler(this);
vPanel.add(buttonBar);
+
+ errorLabel.setVisible(false);
+ vPanel.add(errorLabel);
return vPanel;
}
@@ -91,9 +95,14 @@
public void onModelChange(ModelForView<Session> model) {
if (model.getValue() == null) {
- reset();
+ error();
} else {
- controller.call(new Event<Session, HupaAction>(HupaAction.LOGIN_SUCCESSFULL, model.getValue()));
+ if (model.getValue().getIMAPUser() != null) {
+ success();
+ controller.call(new Event<Session, HupaAction>(HupaAction.LOGIN_SUCCESSFULL, model.getValue()));
+ } else {
+ clear();
+ }
}
}
@@ -119,21 +128,24 @@
}
}
- public void reset() {
+ private void reset() {
+ errorLabel.setVisible(false);
loginButton.setEnabled(false);
usernameTextBox.setText("");
passwordTextBox.setText("");
}
- public void error() {
+ private void error() {
reset();
+ errorLabel.setVisible(true);
+
if (saveBox.getValue()) {
Cookies.removeCookie("username");
Cookies.removeCookie("password");
}
}
- public void success() {
+ private void success() {
if (saveBox.getValue()) {
Cookies.setCookie("username", getUsername());
Cookies.setCookie("password", getPassword());
@@ -156,11 +168,11 @@
}
}
- public String getUsername() {
+ private String getUsername() {
return usernameTextBox.getText();
}
- public String getPassword() {
+ private String getPassword() {
return passwordTextBox.getText();
}
}
Modified: labs/hupa/src/main/java/org/apache/hupa/client/view/MainView.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/view/MainView.java?rev=788967&r1=788966&r2=788967&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/view/MainView.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/view/MainView.java Sat Jun 27 13:16:48 2009
@@ -66,7 +66,7 @@
import com.googlecode.gwtmvc.client.View;
public class MainView extends View {
-
+
private IMAPTreeImages tImages = GWT.create(IMAPTreeImages.class);
private Tree folderTree = new Tree(tImages, true);
private HupaConstants constants = GWT.create(HupaConstants.class);
@@ -262,6 +262,8 @@
if (message.getIMAPFlags().contains(IMAPFlag.SEEN) == false) {
mailTable.getRowFormatter().addStyleName(rows,
"hupa-Mailtable-row-notseen");
+ } else {
+ mailTable.getRowFormatter().removeStyleName(rows, "hupa-Mailtable-row-notseen");
}
mailTable.getCellFormatter().setWordWrap(rows, 1,
false);
@@ -342,10 +344,11 @@
public void onModelChange(ModelForView model) {
if (model instanceof SessionModel) {
- if (model.getValue() == null) {
+ Session tmpSession = (Session)model.getValue();
+ if (tmpSession != null && tmpSession.getIMAPUser() == null) {
reset();
} else {
- load((Session) model.getValue());
+ load(tmpSession);
}
} else if (model instanceof FolderModel) {
List<TreeItem> tList = createTreeNodes((List<IMAPFolder>) model
@@ -356,6 +359,7 @@
} else if (model instanceof MessageListModel) {
loadMails((ResultList<IMAPMessage>)model.getValue());
} else if (model instanceof MessageModel) {
+
msgWidget.setIMAPMessage((IMAPMessage)model.getValue());
center.clear();
center.add(msgWidget);
Modified: labs/hupa/src/main/java/org/apache/hupa/common/data/Session.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/common/data/Session.java?rev=788967&r1=788966&r2=788967&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/common/data/Session.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/common/data/Session.java Sat Jun 27 13:16:48 2009
@@ -30,6 +30,12 @@
private IMAPFolder folder;
private IMAPMessage message;
+ public void reset() {
+ user = null;
+ folder = null;
+ message = null;
+ }
+
public void setIMAPUser(IMAPUser user) {
this.user = user;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org