Author: dongxu
Date: Thu Sep 12 04:11:36 2013
New Revision: 1522307
URL: http://svn.apache.org/r1522307
Log:
scrub code
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml?rev=1522307&r1=1522306&r2=1522307&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/HupaProd.gwt.xml Thu
Sep 12 04:11:36 2013
@@ -27,6 +27,7 @@
<!-- Set the languages to compile -->
<!-- It multiplies the number of permutations -->
<extend-property name="locale" values="es,de"/>
+ <extend-property name="locale" values="en"/>
<set-configuration-property name="locale.useragent" value="Y"/>
<!-- Compile for all browsers -->
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=1522307&r1=1522306&r2=1522307&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:11:36 2013
@@ -141,6 +141,11 @@ public class ComposeActivity extends App
private ComposePlace place;
>>>>>>> coping with reply and forward sending message
+ public Activity with(ComposePlace place) {
+ this.place = place;
+ return this;
+ }
+
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
container.setWidget(display.asWidget());
@@ -399,7 +404,7 @@ public class ComposeActivity extends App
bindTo(eventBus);
display.getFromList().addItem("demo");
- if (user != null) {//FIXME
+ if (user != null) {// FIXME
display.getFromList().addItem(user.getName());
}
}
@@ -535,6 +540,7 @@ public class ComposeActivity extends App
} else if ("forward".equals(place.getToken())) {
// FIXME will get a NullPointerException given
accessing
// directly from some URL like #/compose:forward
+<<<<<<< HEAD
SendForwardMessageRequest req =
rf.sendForwardMessageRequest();
SendForwardMessageAction action =
req.create(SendForwardMessageAction.class);
action.setMessage(parseMessage(req));
@@ -562,6 +568,8 @@ public class ComposeActivity extends App
>>>>>>> coping with reply and forward sending message
=======
//FIXME will get a NullPointerException given
accessing directly from some URL like #/compose:forward
+=======
+>>>>>>> scrub code
SendForwardMessageRequest req =
requestFactory.sendForwardMessageRequest();
SendForwardMessageAction action =
req.create(SendForwardMessageAction.class);
action.setMessage(parseMessage(req));
@@ -630,13 +638,13 @@ public class ComposeActivity extends App
>>>>>>> coping with java.lang.IllegalArgumentException: uid
} else {
SendReplyMessageRequest replyReq =
requestFactory.sendReplyMessageRequest();
- SendReplyMessageAction replyAction =
replyReq.create(SendReplyMessageAction.class);
- replyAction.setMessage(parseMessage(replyReq));
+ SendReplyMessageAction action =
replyReq.create(SendReplyMessageAction.class);
+ action.setMessage(parseMessage(replyReq));
ImapFolder folder =
replyReq.create(ImapFolder.class);
folder.setFullName(place.getParameters().getFolder().getFullName());
- replyAction.setFolder(folder);
-
replyAction.setUid(place.getParameters().getOldmessage().getUid());
- replyReq.send(replyAction).fire(new
Receiver<GenericResult>() {
+ action.setFolder(folder);
+
action.setUid(place.getParameters().getOldmessage().getUid());
+ replyReq.send(action).fire(new
Receiver<GenericResult>() {
@Override
public void onSuccess(GenericResult
response) {
afterSend(response);
@@ -788,9 +796,4 @@ public class ComposeActivity extends App
IUploader getUploader();
>>>>>>> make attachments sending work as expected
}
-
- public Activity with(ComposePlace place) {
- this.place = place;
- return this;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
