Author: dongxu
Date: Thu Sep 12 03:29:50 2013
New Revision: 1522210
URL: http://svn.apache.org/r1522210
Log:
scrub code
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/LoginActivity.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/activity/TopActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.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=1522210&r1=1522209&r2=1522210&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:50 2013
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.List;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.HupaController;
import org.apache.hupa.client.rf.HupaRequestFactory;
@@ -40,12 +41,26 @@ public abstract class AppBaseActivity ex
@Inject protected HupaRequestFactory rf;
=======
+=======
+import org.apache.hupa.client.rf.HupaRequestFactory;
+
+>>>>>>> scrub code
import com.google.gwt.activity.shared.AbstractActivity;
+import com.google.gwt.event.shared.EventBus;
import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.place.shared.PlaceController;
+import com.google.inject.Inject;
public abstract class AppBaseActivity extends AbstractActivity {
+<<<<<<< HEAD
>>>>>>> fix issue 10
+=======
+ @Inject protected EventBus eventBus;
+ @Inject protected PlaceController placeController;
+ @Inject protected HupaRequestFactory requestFactory;
+
+>>>>>>> scrub code
protected List<HandlerRegistration> registrations = new
ArrayList<HandlerRegistration>();
@Override
@@ -74,5 +89,19 @@ public abstract class AppBaseActivity ex
}
registrations.clear();
}
+<<<<<<< HEAD
>>>>>>> fix issue 10
+=======
+
+ protected void registerHandler(HandlerRegistration handlerRegistration)
{
+ registrations.add(handlerRegistration);
+ }
+
+ public String mayStop() {
+ return null;
+ }
+
+ public void onCancel() {
+ }
+>>>>>>> scrub code
}
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=1522210&r1=1522209&r2=1522210&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:50 2013
@@ -31,7 +31,6 @@ import org.apache.hupa.client.evo.HupaEv
>>>>>>> other RFs
import org.apache.hupa.client.place.IMAPMessagePlace;
import org.apache.hupa.client.rf.DeleteMessageByUidRequest;
-import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.shared.SConsts;
<<<<<<< HEAD
@@ -97,7 +96,6 @@ import com.google.gwt.event.dom.client.C
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.place.shared.PlaceController;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.inject.Inject;
@@ -286,17 +284,12 @@ public class IMAPMessageActivity extends
private Message message;
private ImapFolder folder;
private User user;
- // @Inject private CachingDispatchAsync dispatcher;
@Inject private Displayable display;
- @Inject private EventBus eventBus;
- @Inject private PlaceController placeController;
- @Inject private HupaRequestFactory requestFactory;
public interface Displayable extends WidgetDisplayable {
public void setHeaders(Message msg);
public void setAttachments(List<MessageAttachment>
attachements, String folder, long uid);
public void setContent(String content);
-
public HasClickHandlers getShowRawMessageClick();
public HasClickHandlers getDeleteButtonClick();
public HasClickHandlers getReplyButtonClick();
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=1522210&r1=1522209&r2=1522210&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:50 2013
@@ -403,7 +403,6 @@ import org.apache.hupa.client.place.Mail
import org.apache.hupa.client.place.MessageSendPlace;
import org.apache.hupa.client.rf.DeleteMessageAllRequest;
import org.apache.hupa.client.rf.DeleteMessageByUidRequest;
-import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.client.rf.MoveMessageRequest;
import org.apache.hupa.client.rf.SetFlagRequest;
import org.apache.hupa.client.ui.WidgetDisplayable;
@@ -511,6 +510,7 @@ import com.google.gwt.event.dom.client.H
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.shared.EventBus;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.gen2.table.event.client.HasPageChangeHandlers;
import com.google.gwt.gen2.table.event.client.HasPageLoadHandlers;
import com.google.gwt.gen2.table.event.client.HasRowSelectionHandlers;
@@ -530,6 +530,8 @@ import com.google.gwt.gen2.table.event.c
=======
>>>>>>> remove gwt-incubator dependency in Messages List Model;
import com.google.gwt.place.shared.PlaceController;
+=======
+>>>>>>> scrub code
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.HasValue;
import com.google.inject.Inject;
@@ -539,6 +541,7 @@ import com.google.web.bindery.requestfac
public class IMAPMessageListActivity extends AppBaseActivity {
<<<<<<< HEAD
+<<<<<<< HEAD
private String searchValue;
private User user;
<<<<<<< HEAD
@@ -589,6 +592,8 @@ public class IMAPMessageListActivity ext
=======
>>>>>>> delete messages, make WestActivity Singleton
+=======
+>>>>>>> scrub code
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
bind();
@@ -633,25 +638,19 @@ public class IMAPMessageListActivity ext
>>>>>>> fix issue 10
private void bind() {
eventBus.addHandler(LogoutEvent.TYPE, new LogoutEventHandler() {
-
public void onLogout(LogoutEvent logoutEvent) {
IMAPMessageListActivity.this.display.reset();
IMAPMessageListActivity.this.display.getSearchValue().setValue("");
}
-
});
>>>>>>> delete messages, make WestActivity Singleton
eventBus.addHandler(MessagesReceivedEvent.TYPE, new
MessagesReceivedEventHandler() {
-
public void onMessagesReceived(MessagesReceivedEvent
event) {
-
// fill the oracle
display.fillSearchOracle(event.getMessages());
}
-
});
registrations.add(display.getSearchClick().addClickHandler(new
ClickHandler() {
-
public void onClick(ClickEvent event) {
String searchValue = null;
if
(display.getSearchValue().getValue().trim().length() > 0) {
@@ -659,7 +658,6 @@ public class IMAPMessageListActivity ext
}
eventBus.fireEvent(new LoadMessagesEvent(user,
folder, searchValue));
}
-
}));
eventBus.addHandler(MoveMessageEvent.TYPE, new
MoveMessageEventHandler() {
public void onMoveMessageHandler(MoveMessageEvent
event) {
@@ -678,59 +676,44 @@ public class IMAPMessageListActivity ext
}
});
}
-
});
registrations.add(display.getSelectAllClick().addClickHandler(new
ClickHandler() {
-
public void onClick(ClickEvent event) {
display.deselectAllMessages();
display.selectAllMessages();
}
-
}));
registrations.add(display.getSelectNoneClick().addClickHandler(new
ClickHandler() {
-
public void onClick(ClickEvent event) {
display.deselectAllMessages();
}
-
}));
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())) {
display.getConfirmDeleteDialog().show();
} else {
deleteMessages();
}
-
}
-
}));
registrations.add(display.getConfirmDeleteDialogClick().addClickHandler(new
ClickHandler() {
-
public void onClick(ClickEvent event) {
deleteMessages();
}
-
}));
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));
}
-
}));
registrations.add(display.getDeleteAllClick().addClickHandler(new
ClickHandler() {
-
public void onClick(ClickEvent event) {
display.getConfirmDeleteAllDialog().center();
}
-
}));
registrations.add(display.getConfirmDeleteAllDialogClick().addClickHandler(new
ClickHandler() {
-
public void onClick(ClickEvent event) {
DeleteMessageAllRequest req =
requestFactory.deleteMessageAllRequest();
DeleteMessageAllAction action =
req.create(DeleteMessageAllAction.class);
@@ -744,7 +727,6 @@ public class IMAPMessageListActivity ext
}
});
}
-
}));
registrations.add(display.getMarkSeenClick().addClickHandler(new ClickHandler()
{
public void onClick(ClickEvent event) {
@@ -757,7 +739,6 @@ public class IMAPMessageListActivity ext
selectedMessages.remove(m);
}
}
-
SetFlagRequest req =
requestFactory.setFlagRequest();
SetFlagAction action =
req.create(SetFlagAction.class);
action.setFlag(IMAPFlag.SEEN);
@@ -777,10 +758,8 @@ public class IMAPMessageListActivity ext
}
});
}
-
}));
registrations.add(display.getMarkUnseenClick().addClickHandler(new
ClickHandler() {
-
public void onClick(ClickEvent event) {
final ArrayList<Message> selectedMessages = new
ArrayList<Message>(display.getSelectedMessages());
ArrayList<Long> uids = new ArrayList<Long>();
@@ -807,14 +786,12 @@ public class IMAPMessageListActivity ext
}
display.redraw();
eventBus.fireEvent(new
IncreaseUnseenEvent(user, folder, selectedMessages.size()));
-
}
});
}
}));
eventBus.addHandler(FolderSelectionEvent.TYPE, new
FolderSelectionEventHandler() {// TODO
-
public void
onFolderSelectionEvent(FolderSelectionEvent event) {
folder = event.getFolder();
user = event.getUser();
@@ -822,7 +799,6 @@ public class IMAPMessageListActivity ext
});
registrations.add(display.getRefreshClick().addClickHandler(new
ClickHandler() {
-
public void onClick(ClickEvent event) {
display.reset();
display.reloadData();
@@ -830,14 +806,13 @@ public class IMAPMessageListActivity ext
}));
registrations.add(display.getRowsPerPageChange().addChangeHandler(new
ChangeHandler() {
-
public void onChange(ChangeEvent event) {
// firePresenterRevealedEvent(true);
// firePresenterChangedEvent();
}
}));
-// display.addTableListener(tableListener);
+ // display.addTableListener(tableListener);
}
private void deleteMessages() {
@@ -1234,7 +1209,6 @@ public class IMAPMessageListActivity ext
}
public void revealDisplay(User user, ImapFolder folder, String
searchValue) {
this.user = user;
-
if (this.user == null ||
!this.user.getName().equals(user.getName()) || this.folder == null
||
!this.folder.getFullName().equals(folder.getFullName())
|| (searchValue == null && this.searchValue != null)
@@ -1245,27 +1219,39 @@ public class IMAPMessageListActivity ext
display.setExpandLoading(false);
this.searchValue = searchValue;
this.folder = folder;
-
onRevealDisplay();
}
+ private String searchValue;
+ private User user;
+ private ImapFolder folder;
+
+ @Inject private Displayable display;
+ @Inject private Provider<MessageSendPlace> messageSendPlaceProvider;
+
public interface Displayable extends WidgetDisplayable {
public void setPostFetchMessageCount(int count);
+ public void fillSearchOracle(List<Message> messages);
+ public void setExpandLoading(boolean expanding);
+ public void redraw();
+ public void goToPage(int page);
+ public void reloadData();
+ public void removeMessages(List<Message> messages);
+ public void selectAllMessages();
+ public void deselectAllMessages();
+ public void reset();
+ public int getCurrentPage();
+ public int getRowsPerPageIndex();
public HasClickHandlers getNewClick();
public Message getData(int rowIndex);
public HasClickHandlers getDeleteClick();
public HasClickHandlers getDeleteAllClick();
public HasEnable getDeleteEnable();
- public void reloadData();
- public void removeMessages(List<Message> messages);
public List<Message> getSelectedMessages();
- public void reset();
public HasDialog getConfirmDeleteDialog();
public HasDialog getConfirmDeleteAllDialog();
public HasClickHandlers getConfirmDeleteDialogClick();
public HasClickHandlers getConfirmDeleteAllDialogClick();
- public void selectAllMessages();
- public void deselectAllMessages();
public HasClickHandlers getSelectAllClick();
public HasClickHandlers getSelectNoneClick();
public HasClickHandlers getMarkSeenClick();
@@ -1273,16 +1259,9 @@ public class IMAPMessageListActivity ext
public HasEnable getMarkSeenEnable();
public HasEnable getMarkUnseenEnable();
public HasClickHandlers getRefreshClick();
- public void redraw();
- public void goToPage(int page);
- public int getCurrentPage();
- public int getRowsPerPageIndex();
public HasChangeHandlers getRowsPerPageChange();
public HasClickHandlers getSearchClick();
public HasValue<String> getSearchValue();
- public void fillSearchOracle(List<Message> messages);
- public void setExpandLoading(boolean expanding);
-
}
<<<<<<< HEAD
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java?rev=1522210&r1=1522209&r2=1522210&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
Thu Sep 12 03:29:50 2013
@@ -26,6 +26,7 @@
package org.apache.hupa.client.activity;
import org.apache.hupa.client.HupaConstants;
+<<<<<<< HEAD
import org.apache.hupa.client.place.FolderPlace;
import org.apache.hupa.client.rf.LoginUserRequest;
import org.apache.hupa.client.ui.HupaLayoutable;
@@ -69,8 +70,9 @@ import org.apache.hupa.client.place.Mail
>>>>>>> Make chechsession and login work with RF, with refactoring fetch
>>>>>>> folders.
import org.apache.hupa.client.HupaConstants;
import org.apache.hupa.client.place.DefaultPlace;
+=======
+>>>>>>> scrub code
import org.apache.hupa.client.place.MailFolderPlace;
-import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.client.rf.LoginUserRequest;
import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.shared.data.ImapFolderImpl;
@@ -87,6 +89,7 @@ import org.apache.hupa.shared.rpc.LoginU
=======
>>>>>>> Make chechsession and login work with RF, with refactoring fetch
>>>>>>> folders.
+<<<<<<< HEAD
import com.google.gwt.activity.shared.AbstractActivity;
<<<<<<< HEAD
<<<<<<< HEAD
@@ -111,12 +114,15 @@ import com.google.gwt.core.client.GWT;
>>>>>>> decorate the theme
=======
>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks &
>>>>>>> Simply injection code
+=======
+>>>>>>> scrub code
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.shared.EventBus;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import com.google.gwt.place.shared.PlaceController;
<<<<<<< HEAD
@@ -126,6 +132,8 @@ import com.google.gwt.user.client.Window
=======
>>>>>>> introduce the top activity
=======
+=======
+>>>>>>> scrub code
import com.google.gwt.user.client.Window;
>>>>>>> alert people "invilid login" for the wrong username and/or password,
>>>>>>> which should be improved with a gentle way
import com.google.gwt.user.client.ui.AcceptsOneWidget;
@@ -140,6 +148,7 @@ import com.google.web.bindery.requestfac
import com.google.web.bindery.requestfactory.shared.ServerFailure;
public class LoginActivity extends AppBaseActivity {
+<<<<<<< HEAD
@Inject private HupaLayoutable hupaLayout;
@@ -219,6 +228,8 @@ public class LoginActivity extends Abstr
=======
@Inject private HupaRequestFactory requestFactory;
>>>>>>> Make chechsession and login work with RF, with refactoring fetch
>>>>>>> folders.
+=======
+>>>>>>> scrub code
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
@@ -247,15 +258,20 @@ public class LoginActivity extends Abstr
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
=======
display.setLoading(false);
+<<<<<<< HEAD
>>>>>>> fix bugs, including 1)folders appending on west panel; 2)unread email
>>>>>>> folder's been frozen exception; 3)back, logout, ...buttons wired
>>>>>>> behavior.
+=======
+>>>>>>> scrub code
}
public void bind() {
- display.getLoginClick().addClickHandler(new ClickHandler() {
+ registerHandler(display.getLoginClick().addClickHandler(new
ClickHandler() {
public void onClick(ClickEvent event) {
- doLogin();// FIXME double run if press "ENTER"
key in the login page
+ doLogin();// FIXME double run if press "ENTER"
key in the login
+ // page
}
+<<<<<<< HEAD
});
<<<<<<< HEAD
<<<<<<< HEAD
@@ -274,12 +290,16 @@ public class LoginActivity extends Abstr
=======
display.getResetClick().addClickHandler(new ClickHandler() {
+=======
+ }));
+ registerHandler(display.getResetClick().addClickHandler(new
ClickHandler() {
+>>>>>>> scrub code
public void onClick(ClickEvent event) {
doReset();
}
-
- });
+ }));
eventBus.addHandler(SessionExpireEvent.TYPE, new
SessionExpireEventHandler() {
+<<<<<<< HEAD
<<<<<<< HEAD
public void onSessionExpireEvent(SessionExpireEvent event) {
@@ -300,6 +320,12 @@ public class LoginActivity extends Abstr
=======
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
+=======
+ public void onSessionExpireEvent(SessionExpireEvent
event) {
+ eventBus.fireEvent(new
FlashEvent(constants.sessionTimedOut(), 4000));
+ }
+ });
+>>>>>>> scrub code
}
private void doLogin() {
@@ -307,6 +333,7 @@ public class LoginActivity extends Abstr
String pass = display.getPasswordValue().getValue().trim();
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
if (user.isEmpty() || pass.isEmpty())
return;
display.setLoading(true);
@@ -328,13 +355,15 @@ public class LoginActivity extends Abstr
=======
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
+=======
+>>>>>>> scrub code
if (user.isEmpty() || pass.isEmpty())
return;
-
display.setLoading(true);
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
// HupaRequestFactory rf = GWT.create(HupaRequestFactory.class);
@@ -437,26 +466,31 @@ public class LoginActivity extends Abstr
>>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
=======
+=======
+>>>>>>> scrub code
LoginUserRequest loginRequest = requestFactory.loginRequest();
loginRequest.login(user, pass).fire(new Receiver<User>() {
@Override
public void onSuccess(User response) {
placeController.goTo(new
MailFolderPlace().with(response, useDefaultInboxFolder(response), null));
- eventBus.fireEvent(new LoginEvent(response));
+ eventBus.fireEvent(new LoginEvent(response));
}
@Override
- public void onFailure(ServerFailure error){
- Window.alert(error.getMessage());//TODO a more
gentle way
+ public void onFailure(ServerFailure error) {
+ Window.alert(error.getMessage());// TODO a more
gentle way
display.setLoading(false);
doReset();
-// placeController.goTo(new DefaultPlace());
+ // placeController.goTo(new DefaultPlace());
}
});
+<<<<<<< HEAD
>>>>>>> Make chechsession and login work with RF, with refactoring fetch
>>>>>>> folders.
+=======
+>>>>>>> scrub code
}
-
- private ImapFolder useDefaultInboxFolder(User user){
+
+ private ImapFolder useDefaultInboxFolder(User user) {
return new
ImapFolderImpl(user.getSettings().getInboxFolderName());
}
@@ -473,6 +507,7 @@ public class LoginActivity extends Abstr
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
@Inject private Displayable display;
@Inject private HupaConstants constants;
@@ -491,24 +526,27 @@ public class LoginActivity extends Abstr
public interface Display {
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
=======
+=======
+ @Inject private Displayable display;
+ @Inject private HupaConstants constants;
+
+>>>>>>> scrub code
public interface Displayable extends WidgetDisplayable {
>>>>>>> Change to new mvp framework - first step
public HasClickHandlers getLoginClick();
-
public HasClickHandlers getResetClick();
-
public HasValue<String> getUserNameValue();
-
public HasValue<String> getPasswordValue();
-
public Focusable getUserNameFocus();
-
public void setLoading(boolean loading);
+<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
=======
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
+=======
+>>>>>>> scrub code
public Widget asWidget();
}
}
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=1522210&r1=1522209&r2=1522210&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:50 2013
@@ -45,6 +45,7 @@ import java.util.List;
<<<<<<< HEAD
<<<<<<< HEAD
import org.apache.hupa.client.place.MessageSendPlace;
+<<<<<<< HEAD
import org.apache.hupa.client.rf.SendForwardMessageRequest;
import org.apache.hupa.client.rf.SendMessageRequest;
import org.apache.hupa.client.rf.SendReplyMessageRequest;
@@ -85,6 +86,8 @@ import org.apache.hupa.client.place.Mess
=======
=======
import org.apache.hupa.client.rf.HupaRequestFactory;
+=======
+>>>>>>> scrub code
import org.apache.hupa.client.rf.SendForwardMessageRequest;
import org.apache.hupa.client.rf.SendMessageRequest;
import org.apache.hupa.client.rf.SendReplyMessageRequest;
@@ -238,6 +241,7 @@ import com.google.web.bindery.requestfac
public class MessageSendActivity extends AppBaseActivity {
+<<<<<<< HEAD
private List<MessageAttachment> attachments = new
ArrayList<MessageAttachment>();
private Type type = Type.NEW;
private ImapFolder folder;
@@ -259,6 +263,8 @@ public class MessageSendActivity extends
=======
>>>>>>> 1. improve the inbox folder place.
+=======
+>>>>>>> scrub code
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
bind();
@@ -271,6 +277,7 @@ public class MessageSendActivity extends
<<<<<<< HEAD
public MessageSendActivity with(MessageSendPlace place) {
+<<<<<<< HEAD
=======
=======
>>>>>>> 1. improve the inbox folder place.
@@ -296,6 +303,8 @@ public class MessageSendActivity extends
>>>>>>> 1. improve the inbox folder place.
=======
>>>>>>> 1. improve the inbox folder place.
+=======
+>>>>>>> scrub code
this.user = place.getUser();
this.folder = place.getFolder();
this.oldmessage = place.getMessage();
@@ -627,15 +636,12 @@ public class MessageSendActivity extends
eventBus.fireEvent(new BackEvent());
}
}));
-
registrations.add(display.getUploader().addOnStatusChangedHandler(onStatusChangedHandler));
registrations.add(display.getUploader().addOnFinishUploadHandler(onFinishUploadHandler));
registrations.add(display.getUploader().addOnCancelUploadHandler(onCancelUploadHandler));
-
reset();
}
- SendMessageRequest sendReq;
protected ClickHandler sendClickHandler = new ClickHandler() {
public void onClick(ClickEvent event) {
if (validate()) {
@@ -1143,7 +1149,20 @@ public class MessageSendActivity extends
}
};
+<<<<<<< HEAD
>>>>>>> forward and reply message to use RF
+=======
+ @Inject private Displayable display;
+ private List<MessageAttachment> attachments = new
ArrayList<MessageAttachment>();
+ private Type type = Type.NEW;
+ private ImapFolder folder;
+ private Message oldmessage;
+ protected SmtpMessage message;
+ private MessageDetails oldDetails;
+ private User user;
+ private SendMessageRequest sendReq;
+
+>>>>>>> scrub code
public interface Displayable extends WidgetDisplayable {
public HasText getFromText();
public HasText getToText();
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java?rev=1522210&r1=1522209&r2=1522210&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java
Thu Sep 12 03:29:50 2013
@@ -61,7 +61,6 @@ import org.apache.hupa.shared.data.User;
>>>>>>> introduce the top activity
=======
import org.apache.hupa.client.place.DefaultPlace;
-import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.client.rf.IdleRequest;
import org.apache.hupa.client.rf.LogoutUserRequest;
import org.apache.hupa.client.ui.WidgetDisplayable;
@@ -95,11 +94,14 @@ import org.apache.hupa.shared.rpc.Logout
=======
>>>>>>> Make chechsession and login work with RF, with refactoring fetch
>>>>>>> folders.
+<<<<<<< HEAD
import com.google.gwt.activity.shared.AbstractActivity;
<<<<<<< HEAD
>>>>>>> introduce the top activity
=======
>>>>>>> introduce the top activity
+=======
+>>>>>>> scrub code
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
@@ -107,6 +109,7 @@ import com.google.gwt.event.dom.client.H
import com.google.gwt.event.shared.EventBus;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.HasText;
@@ -121,6 +124,8 @@ public class TopActivity extends AppBase
=======
>>>>>>> introduce the top activity
import com.google.gwt.place.shared.PlaceController;
+=======
+>>>>>>> scrub code
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.HasText;
@@ -138,7 +143,7 @@ import com.google.inject.Provider;
import com.google.web.bindery.requestfactory.shared.Receiver;
>>>>>>> other RFs
-public class TopActivity extends AbstractActivity {
+public class TopActivity extends AppBaseActivity {
private static final int IDLE_INTERVAL = 150000;
<<<<<<< HEAD
@@ -161,6 +166,7 @@ public class TopActivity extends Abstrac
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
checkSession();
>>>>>>> introduce the top activity
@@ -173,6 +179,8 @@ public class TopActivity extends Abstrac
=======
// checkSession();
>>>>>>> other RFs
+=======
+>>>>>>> scrub code
}
private void bind() {
@@ -186,6 +194,7 @@ public class TopActivity extends Abstrac
}
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
});
eventBus.addHandler(LogoutEvent.TYPE, new LogoutEventHandler() {
=======
@@ -199,6 +208,10 @@ public class TopActivity extends Abstrac
>>>>>>> introduce the top activity
=======
>>>>>>> introduce the top activity
+=======
+ });
+ eventBus.addHandler(LogoutEvent.TYPE, new LogoutEventHandler() {
+>>>>>>> scrub code
public void onLogout(LogoutEvent event) {
User u = event.getUser();
String username = null;
@@ -229,6 +242,7 @@ public class TopActivity extends Abstrac
public void onClick(ClickEvent event) {
showMain(user);
}
+<<<<<<< HEAD
}));
eventBus.addHandler(ServerStatusEvent.TYPE, new
ServerStatusEventHandler() {
=======
@@ -244,34 +258,33 @@ public class TopActivity extends Abstrac
}
>>>>>>> introduce the top activity
+=======
+>>>>>>> scrub code
});
- display.getLogoutClick().addClickHandler(new ClickHandler() {
-
+ registerHandler(display.getLogoutClick().addClickHandler(new
ClickHandler() {
public void onClick(ClickEvent event) {
doLogout();
}
-
- });
- display.getContactsClick().addClickHandler(new ClickHandler() {
-
+ }));
+ registerHandler(display.getContactsClick().addClickHandler(new
ClickHandler() {
public void onClick(ClickEvent event) {
showContacts();
}
-
- });
- display.getMainClick().addClickHandler(new ClickHandler() {
-
+ }));
+ registerHandler(display.getMainClick().addClickHandler(new
ClickHandler() {
public void onClick(ClickEvent event) {
showMain(user);
}
-
- });
+ }));
eventBus.addHandler(ServerStatusEvent.TYPE, new
ServerStatusEventHandler() {
+<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> introduce the top activity
=======
>>>>>>> introduce the top activity
+=======
+>>>>>>> scrub code
public void onServerStatusChange(ServerStatusEvent
event) {
if (event.getStatus() != serverStatus) {
GWT.log("Server status has hanged from
" + serverStatus + " to" + event.getStatus(), null);
@@ -281,6 +294,7 @@ public class TopActivity extends Abstrac
}
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
});
eventBus.addHandler(FlashEvent.TYPE, new FlashEventHandler() {
public void onFlash(FlashEvent event) {
@@ -300,13 +314,13 @@ public class TopActivity extends Abstrac
=======
>>>>>>> introduce the top activity
+=======
+>>>>>>> scrub code
});
eventBus.addHandler(FlashEvent.TYPE, new FlashEventHandler() {
-
public void onFlash(FlashEvent event) {
display.showMessage(event.getMessage(),
event.getMillisec());
}
-
});
}
@@ -393,6 +407,7 @@ public class TopActivity extends Abstrac
private Timer noopTimer = new IdleTimer();
<<<<<<< HEAD
+<<<<<<< HEAD
@Inject
<<<<<<< HEAD
public TopActivity(Displayable display, EventBus eventBus,
PlaceController placeController,
@@ -422,6 +437,14 @@ public class TopActivity extends Abstrac
>>>>>>> introduce the top activity
=======
>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks &
>>>>>>> Simply injection code
+=======
+
+ @Inject private Displayable display;
+ @Inject private HupaConstants constants;
+ private User user;
+ private ServerStatus serverStatus = ServerStatus.Available;
+
+>>>>>>> scrub code
public interface Displayable extends WidgetDisplayable {
public HasClickHandlers getLogoutClick();
public HasClickHandlers getContactsClick();
@@ -437,6 +460,7 @@ public class TopActivity extends Abstrac
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private class IdleTimer extends Timer {
boolean running = false;
@@ -479,6 +503,8 @@ public class TopActivity extends Abstrac
private User user;
private ServerStatus serverStatus = ServerStatus.Available;
+=======
+>>>>>>> scrub code
private class IdleTimer extends Timer {
boolean running = false;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java?rev=1522210&r1=1522209&r2=1522210&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
Thu Sep 12 03:29:50 2013
@@ -274,7 +274,7 @@ import org.apache.hupa.client.rf.GetMess
import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.client.rf.ImapFolderRequest;
import org.apache.hupa.client.rf.RenameFolderRequest;
-import org.apache.hupa.client.ui.WidgetContainerDisplayable;
+import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.client.widgets.IMAPTreeItem;
import org.apache.hupa.shared.data.ImapFolderImpl;
@@ -380,11 +380,14 @@ import org.apache.hupa.widgets.event.Edi
import org.apache.hupa.widgets.ui.HasEditable;
import org.apache.hupa.widgets.ui.HasEnable;
+<<<<<<< HEAD
import com.google.gwt.activity.shared.AbstractActivity;
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>>
+=======
+>>>>>>> scrub code
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
@@ -394,10 +397,8 @@ import com.google.gwt.event.logical.shar
import com.google.gwt.event.logical.shared.SelectionHandler;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.place.shared.Place;
-import com.google.gwt.place.shared.PlaceController;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.Tree;
import com.google.gwt.user.client.ui.TreeItem;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -423,7 +424,7 @@ import com.google.web.bindery.requestfac
import com.google.web.bindery.requestfactory.shared.ServerFailure;
>>>>>>> Succeed creating new folder
-public class WestActivity extends AbstractActivity {
+public class WestActivity extends AppBaseActivity {
<<<<<<< HEAD
private final Displayable display;
@@ -472,6 +473,7 @@ public class WestActivity extends Abstra
container.setWidget(display.asWidget());
}
+<<<<<<< HEAD
@Inject private Displayable display;
@Inject private EventBus eventBus;
@Inject private PlaceController placeController;
@@ -598,6 +600,8 @@ public class WestActivity extends Abstra
private Place currentPlace;
+=======
+>>>>>>> scrub code
public void setCurrentPlace(Place place) {
this.currentPlace = place;
}
@@ -852,14 +856,13 @@ System.out.println("1111111"+response);
private void bind() {
>>>>>>> try to change fetch messages to use RF
eventBus.addHandler(LoadMessagesEvent.TYPE, new
LoadMessagesEventHandler() {
-
public void onLoadMessagesEvent(LoadMessagesEvent
loadMessagesEvent) {
showMessageTable(loadMessagesEvent.getUser(),
loadMessagesEvent.getFolder(),
loadMessagesEvent.getSearchValue());
}
-
});
eventBus.addHandler(ExpandMessageEvent.TYPE, new
ExpandMessageEventHandler() {
+<<<<<<< HEAD
<<<<<<< HEAD
public void onExpandMessage(ExpandMessageEvent event) {
@@ -910,6 +913,8 @@ System.out.println("1111111"+response);
>>>>>>> Make chechsession and login work with RF, with refactoring fetch
>>>>>>> folders.
}
=======
+=======
+>>>>>>> scrub code
public void onExpandMessage(ExpandMessageEvent event) {
final boolean decreaseUnseen;
final Message message = event.getMessage();
@@ -935,99 +940,81 @@ System.out.println("1111111"+response);
action.setFolder(folder);
action.setUid(message.getUid());
req.get(action).fire(new
Receiver<GetMessageDetailsResult>() {
-
@Override
public void
onSuccess(GetMessageDetailsResult response) {
-
- /*TODO
- if (decreaseUnseen) {
- eventBus.fireEvent(new
DecreaseUnseenEvent(user, folder));
- }*/
+ /*
+ * TODO if (decreaseUnseen) {
eventBus.fireEvent(new
+ * DecreaseUnseenEvent(user,
folder)); }
+ */
display.setLoadingMessage(false);
placeController.goTo(messagePlaceProvider.get().with(user, folder, message,
response.getMessageDetails()));
}
});
}
+<<<<<<< HEAD
>>>>>>> try to change fetch messages to use RF
+=======
+>>>>>>> scrub code
});
eventBus.addHandler(NewMessageEvent.TYPE, new
NewMessageEventHandler() {
-
public void onNewMessageEvent(NewMessageEvent event) {
showNewMessage();
}
-
});
eventBus.addHandler(SentMessageEvent.TYPE, new
SentMessageEventHandler() {
-
public void onSentMessageEvent(SentMessageEvent ev) {
showMessageTable(user, folder, searchValue);
}
-
});
eventBus.addHandler(ForwardMessageEvent.TYPE, new
ForwardMessageEventHandler() {
-
public void onForwardMessageEvent(ForwardMessageEvent
event) {
showForwardMessage(event);
}
-
});
eventBus.addHandler(ReplyMessageEvent.TYPE, new
ReplyMessageEventHandler() {
-
public void onReplyMessageEvent(ReplyMessageEvent
event) {
showReplyMessage(event);
}
-
});
eventBus.addHandler(FolderSelectionEvent.TYPE, new
FolderSelectionEventHandler() {
-
public void onFolderSelectionEvent(FolderSelectionEvent
event) {
user = event.getUser();
folder = event.getFolder();
showMessageTable(user, event.getFolder(),
searchValue);
}
-
});
eventBus.addHandler(BackEvent.TYPE, new BackEventHandler() {
-
public void onBackEvent(BackEvent event) {
showMessageTable(user, folder, searchValue);
}
-
});
eventBus.addHandler(ExpandMessageEvent.TYPE, new
ExpandMessageEventHandler() {
-
public void onExpandMessage(ExpandMessageEvent event) {
if (editableTreeItem != null &&
editableTreeItem.isEdit()) {
editableTreeItem.cancelEdit();
}
}
-
});
eventBus.addHandler(NewMessageEvent.TYPE, new
NewMessageEventHandler() {
-
public void onNewMessageEvent(NewMessageEvent event) {
if (editableTreeItem != null &&
editableTreeItem.isEdit()) {
editableTreeItem.cancelEdit();
}
}
-
});
eventBus.addHandler(DecreaseUnseenEvent.TYPE, new
DecreaseUnseenEventHandler() {
-
public void onDecreaseUnseenEvent(DecreaseUnseenEvent
event) {
display.decreaseUnseenMessageCount(event.getFolder(), event.getAmount());
}
-
});
eventBus.addHandler(IncreaseUnseenEvent.TYPE, new
IncreaseUnseenEventHandler() {
-
public void onIncreaseUnseenEvent(IncreaseUnseenEvent
event) {
display.increaseUnseenMessageCount(event.getFolder(), event.getAmount());
}
-
});
+<<<<<<< HEAD
display.getTree().addSelectionHandler(new
SelectionHandler<TreeItem>() {
<<<<<<< HEAD
@@ -1051,12 +1038,16 @@ System.out.println("1111111"+response);
eventBus.fireEvent(new LoadMessagesEvent(user, folder));
}
=======
+=======
+ registerHandler(display.getTree().addSelectionHandler(new
SelectionHandler<TreeItem>() {
+>>>>>>> scrub code
public void onSelection(SelectionEvent<TreeItem> event)
{
tItem = (IMAPTreeItem) event.getSelectedItem();
if (tItem.isEdit())
return;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
folder = (ImapFolder) tItem.getUserObject();
eventBus.fireEvent(new LoadMessagesEvent(user,
folder));
}
@@ -1109,19 +1100,24 @@ System.out.println("1111111"+response);
// messagesRequest =
requestFactory.messagesRequest();
// folder = messagesRequest.edit(editableFolder);
>>>>>>> make it usable by removing a function that showing the unread message
>>>>>>> number dynamically.
+=======
+ // ImapFolder editableFolder = (ImapFolder)
+ // tItem.getUserObject();
+ //
+ // messagesRequest =
requestFactory.messagesRequest();
+ // folder =
messagesRequest.edit(editableFolder);
+>>>>>>> scrub code
- folder = (ImapFolder) tItem.getUserObject();
+ folder = (ImapFolder) tItem.getUserObject();
// FIXME not good to find
eventBus.fireEvent(new LoadMessagesEvent(user,
folder));
<<<<<<< HEAD
>>>>>>> fix the frozen autobean issue, yet another occur
=======
}
-
- });
+ }));
// FIXME why same?
- display.getTree().addSelectionHandler(new
SelectionHandler<TreeItem>() {
-
+ registerHandler(display.getTree().addSelectionHandler(new
SelectionHandler<TreeItem>() {
public void onSelection(SelectionEvent<TreeItem> event)
{
tItem = (IMAPTreeItem) event.getSelectedItem();
if (tItem.isEdit())
@@ -1136,6 +1132,7 @@ System.out.println("1111111"+response);
display.getRenameEnable().setEnabled(true);
}
}
+<<<<<<< HEAD
});
<<<<<<< HEAD
@@ -1189,20 +1186,20 @@ System.out.println("1111111"+response);
>>>>>>> forward and reply message to use RF
display.getRenameClick().addClickHandler(new ClickHandler() {
+=======
+ }));
+ registerHandler(display.getRenameClick().addClickHandler(new
ClickHandler() {
+>>>>>>> scrub code
public void onClick(ClickEvent event) {
tItem.startEdit();
}
-
- });
- display.getDeleteClick().addClickHandler(new ClickHandler() {
-
+ }));
+ registerHandler(display.getDeleteClick().addClickHandler(new
ClickHandler() {
public void onClick(ClickEvent event) {
display.getDeleteConfirmDialog().show();
}
-
- });
- display.getDeleteConfirmClick().addClickHandler(new
ClickHandler() {
-
+ }));
+
registerHandler(display.getDeleteConfirmClick().addClickHandler(new
ClickHandler() {
public void onClick(ClickEvent event) {
DeleteFolderRequest req =
requestFactory.deleteFolderRequest();
final DeleteFolderAction action =
req.create(DeleteFolderAction.class);
@@ -1218,10 +1215,8 @@ System.out.println("1111111"+response);
}
});
}
-
- });
- display.getNewClick().addClickHandler(new ClickHandler() {
-
+ }));
+ registerHandler(display.getNewClick().addClickHandler(new
ClickHandler() {
public void onClick(ClickEvent event) {
editableTreeItem = display.createFolder(new
EditHandler() {
public void onEditEvent(EditEvent
event) {
@@ -1246,21 +1241,16 @@ System.out.println("1111111"+response);
});
}
}
-
});
}
-
- });
+ }));
eventBus.addHandler(MessagesReceivedEvent.TYPE, new
MessagesReceivedEventHandler() {
-
public void onMessagesReceived(MessagesReceivedEvent
event) {
ImapFolder f = event.getFolder();
display.updateTreeItem(f);
}
-
});
eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() {
-
public void onLogin(LoginEvent event) {
user = event.getUser();
// folder = (IMAPFolderProxy)new
@@ -1268,6 +1258,7 @@ System.out.println("1111111"+response);
searchValue = null;
// showMessageTable(user, folder, searchValue);
}
+<<<<<<< HEAD
<<<<<<< HEAD
public void onMessagesReceived(MessagesReceivedEvent event) {
@@ -1290,6 +1281,9 @@ System.out.println("1111111"+response);
});
>>>>>>> try to change fetch messages to use RF
+=======
+ });
+>>>>>>> scrub code
exportJSMethods(this);
}
@@ -1374,9 +1368,20 @@ System.out.println("1111111"+response);
event.getMessage(), event.getMessageDetails(),
event.getReplyAll() ? Type.REPLY_ALL : Type.REPLY));
}
- public interface Displayable extends WidgetContainerDisplayable {
+ @Inject private Displayable display;
+ @Inject private Provider<IMAPMessagePlace> IMAPMessagePlaceProvider;
+ @Inject private Provider<MessageSendPlace> messageSendPlaceProvider;
+ @Inject private Provider<IMAPMessagePlace> messagePlaceProvider;
+ private User user;
+ private ImapFolder folder;
+ private IMAPTreeItem tItem;
+ private HasEditable editableTreeItem;
+ private String searchValue;
+ private Place currentPlace;
+ public interface Displayable extends WidgetDisplayable {
public HasSelectionHandlers<TreeItem> getTree();
+<<<<<<< HEAD
<<<<<<< HEAD
private void showReplyMessage(ReplyMessageEvent event) {
@@ -1445,23 +1450,19 @@ System.out.println("1111111"+response);
public void bindTreeItems(List<IMAPTreeItem> treeList);
>>>>>>> try to change fetch messages to use RF
+=======
+ public void bindTreeItems(List<IMAPTreeItem> treeList);
+>>>>>>> scrub code
public HasClickHandlers getRenameClick();
-
public HasClickHandlers getDeleteClick();
-
public HasClickHandlers getNewClick();
-
public HasDialog getDeleteConfirmDialog();
-
public HasClickHandlers getDeleteConfirmClick();
-
public HasEnable getRenameEnable();
-
public HasEnable getDeleteEnable();
-
public HasEnable getNewEnable();
-
public void updateTreeItem(ImapFolder folder);
+<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@@ -1481,9 +1482,12 @@ System.out.println("1111111"+response);
public void deleteSelectedFolder();
>>>>>>> try to change fetch messages to use RF
+=======
+ public void deleteSelectedFolder();
+>>>>>>> scrub code
public HasEditable createFolder(EditHandler handler);
-
public void increaseUnseenMessageCount(ImapFolder folder, int
amount);
+<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
@@ -1513,9 +1517,11 @@ System.out.println("1111111"+response);
public void setUser(User user);
=======
+=======
+>>>>>>> scrub code
public void decreaseUnseenMessageCount(ImapFolder folder, int
amount);
-
public void setLoadingFolders(boolean loading);
+<<<<<<< HEAD
>>>>>>> try to change fetch messages to use RF
public void setLoadingMessage(boolean loading);
@@ -1526,8 +1532,10 @@ System.out.println("1111111"+response);
=======
>>>>>>> Change to new mvp framework - first step
=======
+=======
+ public void setLoadingMessage(boolean loading);
+>>>>>>> scrub code
public void setUser(User user);
-
}
>>>>>>> try to change fetch messages to use RF
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java?rev=1522210&r1=1522209&r2=1522210&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
Thu Sep 12 03:29:50 2013
@@ -732,32 +732,6 @@ public class WestView extends Composite
}
}
- /*
- * (non-Javadoc)
- * @see
net.customware.gwt.presenter.client.widget.WidgetContainerDisplay#addWidget(com.google.gwt.user.client.ui.Widget)
- */
- public void addWidget(Widget widget) {
- showWidget(widget);
- }
-
- /*
- * (non-Javadoc)
- * @see
net.customware.gwt.presenter.client.widget.WidgetContainerDisplay#removeWidget(com.google.gwt.user.client.ui.Widget)
- */
- public void removeWidget(Widget widget) {
- centerWidget = null;
- center.remove(widget);
- }
-
- /*
- * (non-Javadoc)
- * @see
net.customware.gwt.presenter.client.widget.WidgetContainerDisplay#showWidget(com.google.gwt.user.client.ui.Widget)
- */
- public void showWidget(Widget widget) {
- centerWidget = widget;
- center.setWidget(centerWidget);
- }
-
/*
* (non-Javadoc)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
