You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2013/09/12 05:29:26 UTC
svn commit: r1522209 - in
/james/hupa/trunk/client/src/main/java/org/apache/hupa/client:
activity/AppBaseActivity.java activity/IMAPMessageActivity.java
activity/IMAPMessageListActivity.java activity/MessageSendActivity.java
ui/IMAPMessageListView.java
Author: dongxu
Date: Thu Sep 12 03:29:25 2013
New Revision: 1522209
URL: http://svn.apache.org/r1522209
Log:
fix issue 10
[10]would send increasing 1 message every new send
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java?rev=1522209&r1=1522208&r2=1522209&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java Thu Sep 12 03:29:25 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.client.activity;
import java.util.ArrayList;
import java.util.List;
+<<<<<<< HEAD
import org.apache.hupa.client.HupaController;
import org.apache.hupa.client.rf.HupaRequestFactory;
@@ -38,11 +39,19 @@ public abstract class AppBaseActivity ex
@Inject protected PlaceController pc;
@Inject protected HupaRequestFactory rf;
+=======
+import com.google.gwt.activity.shared.AbstractActivity;
+import com.google.gwt.event.shared.HandlerRegistration;
+
+public abstract class AppBaseActivity extends AbstractActivity {
+
+>>>>>>> fix issue 10
protected List<HandlerRegistration> registrations = new ArrayList<HandlerRegistration>();
@Override
public void onStop() {
for (HandlerRegistration registration : registrations) {
+<<<<<<< HEAD
if(registration != null){
registration.removeHandler();
}
@@ -60,4 +69,10 @@ public abstract class AppBaseActivity ex
public void onCancel() {
}
+=======
+ registration.removeHandler();
+ }
+ registrations.clear();
+ }
+>>>>>>> fix issue 10
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java?rev=1522209&r1=1522208&r2=1522209&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageActivity.java Thu Sep 12 03:29:25 2013
@@ -92,7 +92,6 @@ import org.apache.hupa.shared.rpc.Delete
=======
>>>>>>> other RFs
-import com.google.gwt.activity.shared.AbstractActivity;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
@@ -104,7 +103,7 @@ import com.google.gwt.user.client.ui.Acc
import com.google.inject.Inject;
import com.google.web.bindery.requestfactory.shared.Receiver;
-public class IMAPMessageActivity extends AbstractActivity {
+public class IMAPMessageActivity extends AppBaseActivity {
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
@@ -226,7 +225,7 @@ public class IMAPMessageActivity extends
public HasClickHandlers getBackButtonClick();
=======
protected void bind() {
- display.getDeleteButtonClick().addClickHandler(new ClickHandler() {
+ registrations.add(display.getDeleteButtonClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
ArrayList<Long> uidList = new ArrayList<Long>();
uidList.add(message.getUid());
@@ -242,36 +241,36 @@ public class IMAPMessageActivity extends
});
}
- });
- display.getForwardButtonClick().addClickHandler(new ClickHandler() {
+ }));
+ registrations.add(display.getForwardButtonClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
eventBus.fireEvent(new ForwardMessageEvent(user, folder, message, messageDetails));
}
- });
- display.getReplyButtonClick().addClickHandler(new ClickHandler() {
+ }));
+ registrations.add(display.getReplyButtonClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
eventBus.fireEvent(new ReplyMessageEvent(user, folder, message, messageDetails, false));
}
- });
- display.getReplyAllButtonClick().addClickHandler(new ClickHandler() {
+ }));
+ registrations.add(display.getReplyAllButtonClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
eventBus.fireEvent(new ReplyMessageEvent(user, folder, message, messageDetails, true));
}
- });
- display.getBackButtonClick().addClickHandler(new ClickHandler() {
+ }));
+ registrations.add(display.getBackButtonClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
eventBus.fireEvent(new BackEvent());
}
- });
- display.getShowRawMessageClick().addClickHandler(new ClickHandler() {
+ }));
+ registrations.add(display.getShowRawMessageClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
String message_url = GWT.getModuleBaseURL() + SConsts.SERVLET_SOURCE + "?" + SConsts.PARAM_UID + "="
@@ -279,7 +278,7 @@ public class IMAPMessageActivity extends
Window.open(message_url, "_blank", "");
}
- });
+ }));
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java?rev=1522209&r1=1522208&r2=1522209&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java Thu Sep 12 03:29:25 2013
@@ -495,10 +495,13 @@ import org.apache.hupa.shared.rpc.SetFla
>>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
import org.apache.hupa.widgets.ui.HasEnable;
+<<<<<<< HEAD
import com.google.gwt.activity.shared.AbstractActivity;
<<<<<<< HEAD
>>>>>>> Change to new mvp framework - first step
=======
+=======
+>>>>>>> fix issue 10
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -533,7 +536,7 @@ import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.web.bindery.requestfactory.shared.Receiver;
-public class IMAPMessageListActivity extends AbstractActivity {
+public class IMAPMessageListActivity extends AppBaseActivity {
<<<<<<< HEAD
private String searchValue;
@@ -593,6 +596,7 @@ public class IMAPMessageListActivity ext
container.setWidget(display.asWidget());
}
<<<<<<< HEAD
+<<<<<<< HEAD
private void bind(){
=======
@@ -625,6 +629,8 @@ public class IMAPMessageListActivity ext
<<<<<<< HEAD
=======
+=======
+>>>>>>> fix issue 10
private void bind() {
eventBus.addHandler(LogoutEvent.TYPE, new LogoutEventHandler() {
@@ -644,7 +650,7 @@ public class IMAPMessageListActivity ext
}
});
- display.getSearchClick().addClickHandler(new ClickHandler() {
+ registrations.add(display.getSearchClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
String searchValue = null;
@@ -654,7 +660,7 @@ public class IMAPMessageListActivity ext
eventBus.fireEvent(new LoadMessagesEvent(user, folder, searchValue));
}
- });
+ }));
eventBus.addHandler(MoveMessageEvent.TYPE, new MoveMessageEventHandler() {
public void onMoveMessageHandler(MoveMessageEvent event) {
final Message message = event.getMessage();
@@ -674,22 +680,22 @@ public class IMAPMessageListActivity ext
}
});
- display.getSelectAllClick().addClickHandler(new ClickHandler() {
+ registrations.add(display.getSelectAllClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
display.deselectAllMessages();
display.selectAllMessages();
}
- });
- display.getSelectNoneClick().addClickHandler(new ClickHandler() {
+ }));
+ registrations.add(display.getSelectNoneClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
display.deselectAllMessages();
}
- });
- display.getDeleteClick().addClickHandler(new com.google.gwt.event.dom.client.ClickHandler() {
+ }));
+ registrations.add(display.getDeleteClick().addClickHandler(new com.google.gwt.event.dom.client.ClickHandler() {
public void onClick(com.google.gwt.event.dom.client.ClickEvent event) {
if (folder.getFullName().equals(user.getSettings().getTrashFolderName())) {
@@ -700,30 +706,30 @@ public class IMAPMessageListActivity ext
}
- });
- display.getConfirmDeleteDialogClick().addClickHandler(new ClickHandler() {
+ }));
+ registrations.add(display.getConfirmDeleteDialogClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
deleteMessages();
}
- });
- display.getNewClick().addClickHandler(new com.google.gwt.event.dom.client.ClickHandler() {
+ }));
+ registrations.add(display.getNewClick().addClickHandler(new com.google.gwt.event.dom.client.ClickHandler() {
public void onClick(com.google.gwt.event.dom.client.ClickEvent event) {
// eventBus.fireEvent(new NewMessageEvent());
placeController.goTo(messageSendPlaceProvider.get().with(user, null, null, null, Type.NEW));
}
- });
- display.getDeleteAllClick().addClickHandler(new ClickHandler() {
+ }));
+ registrations.add(display.getDeleteAllClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
display.getConfirmDeleteAllDialog().center();
}
- });
- display.getConfirmDeleteAllDialogClick().addClickHandler(new ClickHandler() {
+ }));
+ registrations.add(display.getConfirmDeleteAllDialogClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
DeleteMessageAllRequest req = requestFactory.deleteMessageAllRequest();
@@ -739,8 +745,8 @@ public class IMAPMessageListActivity ext
});
}
- });
- display.getMarkSeenClick().addClickHandler(new ClickHandler() {
+ }));
+ registrations.add(display.getMarkSeenClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
final ArrayList<Message> selectedMessages = new ArrayList<Message>(display.getSelectedMessages());
ArrayList<Long> uids = new ArrayList<Long>();
@@ -772,8 +778,8 @@ public class IMAPMessageListActivity ext
});
}
- });
- display.getMarkUnseenClick().addClickHandler(new ClickHandler() {
+ }));
+ registrations.add(display.getMarkUnseenClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
final ArrayList<Message> selectedMessages = new ArrayList<Message>(display.getSelectedMessages());
@@ -806,7 +812,7 @@ public class IMAPMessageListActivity ext
});
}
- });
+ }));
eventBus.addHandler(FolderSelectionEvent.TYPE, new FolderSelectionEventHandler() {// TODO
public void onFolderSelectionEvent(FolderSelectionEvent event) {
@@ -815,22 +821,22 @@ public class IMAPMessageListActivity ext
}
});
- display.getRefreshClick().addClickHandler(new ClickHandler() {
+ registrations.add(display.getRefreshClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
display.reset();
display.reloadData();
}
- });
- display.getRowsPerPageChange().addChangeHandler(new ChangeHandler() {
+ }));
+ registrations.add(display.getRowsPerPageChange().addChangeHandler(new ChangeHandler() {
public void onChange(ChangeEvent event) {
// firePresenterRevealedEvent(true);
// firePresenterChangedEvent();
}
- });
+ }));
// display.addTableListener(tableListener);
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java?rev=1522209&r1=1522208&r2=1522209&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java Thu Sep 12 03:29:25 2013
@@ -167,11 +167,14 @@ import org.apache.hupa.shared.rpc.Contac
>>>>>>> forward and reply message to use RF
import org.apache.hupa.widgets.ui.HasEnable;
+<<<<<<< HEAD
import com.google.gwt.activity.shared.AbstractActivity;
<<<<<<< HEAD
>>>>>>> 1. improve the inbox folder place.
=======
>>>>>>> 1. improve the inbox folder place.
+=======
+>>>>>>> fix issue 10
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
@@ -233,7 +236,7 @@ public class MessageSendActivity extends
=======
import com.google.web.bindery.requestfactory.shared.Receiver;
-public class MessageSendActivity extends AbstractActivity {
+public class MessageSendActivity extends AppBaseActivity {
private List<MessageAttachment> attachments = new ArrayList<MessageAttachment>();
private Type type = Type.NEW;
@@ -618,16 +621,16 @@ public class MessageSendActivity extends
display.fillContactList(event.getContacts());
}
});
- display.getSendClick().addClickHandler(sendClickHandler);
- display.getBackButtonClick().addClickHandler(new ClickHandler() {
+ this.registrations.add(display.getSendClick().addClickHandler(sendClickHandler));
+ registrations.add(display.getBackButtonClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
eventBus.fireEvent(new BackEvent());
}
- });
+ }));
- display.getUploader().addOnStatusChangedHandler(onStatusChangedHandler);
- display.getUploader().addOnFinishUploadHandler(onFinishUploadHandler);
- display.getUploader().addOnCancelUploadHandler(onCancelUploadHandler);
+ registrations.add(display.getUploader().addOnStatusChangedHandler(onStatusChangedHandler));
+ registrations.add(display.getUploader().addOnFinishUploadHandler(onFinishUploadHandler));
+ registrations.add(display.getUploader().addOnCancelUploadHandler(onCancelUploadHandler));
reset();
}
@@ -639,7 +642,7 @@ public class MessageSendActivity extends
sendReq = requestFactory.sendMessageRequest();
message = sendReq.create(SmtpMessage.class);
List<MessageAttachment> attaches = new ArrayList<MessageAttachment>();
- for(MessageAttachment attach : attachments){
+ for(MessageAttachment attach : attachments){// we must use this, else console will complain a NullPointerException
MessageAttachment attachMent = sendReq.create(MessageAttachment.class);
attachMent.setName(attach.getName());
attachMent.setSize(attach.getSize());
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java?rev=1522209&r1=1522208&r2=1522209&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java Thu Sep 12 03:29:25 2013
@@ -89,7 +89,6 @@ import org.apache.hupa.client.bundles.Hu
>>>>>>> fix issue 5,6,8:
import org.apache.hupa.client.rf.FetchMessagesRequest;
import org.apache.hupa.client.rf.HupaRequestFactory;
-import org.apache.hupa.client.widgets.CommandsBar;
import org.apache.hupa.client.widgets.ConfirmDialogBox;
import org.apache.hupa.client.widgets.EnableButton;
import org.apache.hupa.client.widgets.HasDialog;
@@ -179,12 +178,15 @@ import com.google.gwt.user.client.ui.Com
import com.google.gwt.user.client.ui.DockLayoutPanel;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
=======
import com.google.gwt.user.client.ui.Grid;
>>>>>>> fix issue 5,6,8:
import com.google.gwt.user.client.ui.HTML;
>>>>>>> decorate columns of messages list and related panels above and below.
+=======
+>>>>>>> fix issue 10
import com.google.gwt.user.client.ui.HasValue;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.ListBox;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org