Author: dongxu
Date: Thu Sep 12 04:20:07 2013
New Revision: 1522332
URL: http://svn.apache.org/r1522332
Log:
fixed issue#54 just using History.back()
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522332&r1=1522331&r2=1522332&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
Thu Sep 12 04:20:07 2013
@@ -67,7 +67,6 @@ import java.util.Iterator;
import java.util.List;
import org.apache.hupa.client.place.ComposePlace;
-import org.apache.hupa.client.place.DefaultPlace;
import org.apache.hupa.client.rf.SendForwardMessageRequest;
import org.apache.hupa.client.rf.SendMessageRequest;
import org.apache.hupa.client.rf.SendReplyMessageRequest;
@@ -84,9 +83,6 @@ import org.apache.hupa.shared.domain.Sen
import org.apache.hupa.shared.domain.SendMessageAction;
import org.apache.hupa.shared.domain.SendReplyMessageAction;
import org.apache.hupa.shared.domain.SmtpMessage;
-import org.apache.hupa.shared.domain.User;
-import org.apache.hupa.shared.events.LoginEvent;
-import org.apache.hupa.shared.events.LoginEventHandler;
<<<<<<< HEAD
>>>>>>> make send text mail work excellently
@@ -98,6 +94,7 @@ import com.google.gwt.event.dom.client.C
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.shared.EventBus;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.storage.client.Storage;
import com.google.gwt.user.client.History;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
@@ -122,6 +119,9 @@ public class ComposeActivity extends App
return this;
}
=======
+=======
+import com.google.gwt.user.client.History;
+>>>>>>> fixed issue#54 just using History.back()
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.HasHTML;
@@ -534,6 +534,8 @@ public class ComposeActivity extends App
private void bindTo(EventBus eventBus) {
registerHandler(display.getSendClick().addClickHandler(sendClickHandler));
+
registerHandler(display.getCancelClick().addClickHandler(cancelClickHandler));
+
registerHandler(display.getCcClick().addClickHandler(new
ClickHandler() {
@Override
@@ -651,6 +653,14 @@ public class ComposeActivity extends App
}
}
};
+
+ private ClickHandler cancelClickHandler = new ClickHandler(){
+ @Override
+ public void onClick(ClickEvent event) {
+ History.back();
+ }
+
+ };
>>>>>>> coping with reply and forward sending message
protected ClickHandler sendClickHandler = new ClickHandler() {
@@ -960,6 +970,7 @@ public class ComposeActivity extends App
HasText getBcc();
HasText getSubject();
HasClickHandlers getSendClick();
+ HasClickHandlers getCancelClick();
HasClickHandlers getCcClick();
HasClickHandlers get_CcClick();
HasClickHandlers getBccClick();
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java?rev=1522332&r1=1522331&r2=1522332&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
Thu Sep 12 04:20:07 2013
@@ -331,6 +331,11 @@ public class ComposeView extends Composi
public HasClickHandlers getSendClick() {
return sendButton;
}
+
+ @Override
+ public HasClickHandlers getCancelClick(){
+ return cancelButton;
+ }
@Override
public HasClickHandlers getCcClick() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
