Author: dongxu
Date: Thu Sep 12 04:21:15 2013
New Revision: 1522335
URL: http://svn.apache.org/r1522335
Log:
scrub code
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522335&r1=1522334&r2=1522335&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
Thu Sep 12 04:21:15 2013
@@ -253,7 +253,6 @@ import org.apache.hupa.client.place.Mail
>>>>>>> make reload message content work, use the same place with folder list,
>>>>>>> while separated with slash, that looks like Gmail's
=======
import java.util.List;
-import java.util.logging.Level;
import org.apache.hupa.client.place.DefaultPlace;
import org.apache.hupa.client.place.MailFolderPlace;
@@ -283,8 +282,8 @@ import com.google.gwt.event.shared.Event
import com.google.gwt.place.shared.PlaceController;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.view.client.CellPreviewEvent;
-import com.google.gwt.view.client.RangeChangeEvent;
import com.google.gwt.view.client.CellPreviewEvent.Handler;
+import com.google.gwt.view.client.RangeChangeEvent;
import com.google.inject.Inject;
import com.google.web.bindery.requestfactory.shared.Receiver;
import com.google.web.bindery.requestfactory.shared.ServerFailure;
@@ -298,6 +297,7 @@ public class MessageListActivity extends
private String searchValue;
private User user;
private boolean pending;
+
@Override
public void start(AcceptsOneWidget container, final EventBus eventBus) {
container.setWidget(display.asWidget());
@@ -319,14 +319,15 @@ public class MessageListActivity extends
req.get(action).fire(new
Receiver<GetMessageDetailsResult>() {
@Override
public void
onSuccess(GetMessageDetailsResult response) {
- eventBus.fireEvent(new
ExpandMessageEvent(user, folder, event.getValue(),
response.getMessageDetails()));
+ eventBus.fireEvent(new
ExpandMessageEvent(user, folder, event.getValue(), response
+
.getMessageDetails()));
placeController.goTo(new MailFolderPlace(f.getFullName() + "/" +
event.getValue().getUid()));
}
@Override
public void
onFailure(ServerFailure error) {
if (error.isFatal()) {
-//
log.log(Level.SEVERE, error.getMessage());
+ //
log.log(Level.SEVERE, error.getMessage());
// TODO write
the error message to
// status bar.
throw new
RuntimeException(error.getMessage());
@@ -347,32 +348,6 @@ public class MessageListActivity extends
fetch(event.getNewRange().getStart());
}
});
- eventBus.addHandler(LoadMessagesEvent.TYPE, new
LoadMessagesEventHandler() {
- public void onLoadMessagesEvent(LoadMessagesEvent
loadMessagesEvent) {
- user = loadMessagesEvent.getUser();
- folder = loadMessagesEvent.getFolder();
- searchValue =
loadMessagesEvent.getSearchValue();
- fetch(0);
-
- }
- });
- eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() {
- public void onLogin(LoginEvent event) {
- user = event.getUser();
- folder = new
ImapFolderImpl(user.getSettings().getInboxFolderName());
- searchValue = null;
- if (!pending) {
- pending = true;
- Scheduler.get().scheduleFinally(new
ScheduledCommand() {
- @Override
- public void execute() {
- pending = false;
- fetch(0);
- }
- });
- }
- }
- });
}
@@ -406,8 +381,34 @@ public class MessageListActivity extends
});
}
-
private void bindTo(EventBus eventBus) {
+ eventBus.addHandler(LoadMessagesEvent.TYPE, new
LoadMessagesEventHandler() {
+ public void onLoadMessagesEvent(LoadMessagesEvent
loadMessagesEvent) {
+ user = loadMessagesEvent.getUser();
+ folder = loadMessagesEvent.getFolder();
+ searchValue =
loadMessagesEvent.getSearchValue();
+ fetch(0);
+
+ }
+ });
+ eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() {
+ public void onLogin(LoginEvent event) {
+ user = event.getUser();
+ folder = new
ImapFolderImpl(user.getSettings().getInboxFolderName());
+ searchValue = null;
+ if (!pending) {
+ pending = true;
+ Scheduler.get().scheduleFinally(new
ScheduledCommand() {
+ @Override
+ public void execute() {
+ pending = false;
+ fetch(0);
+ }
+ });
+ }
+ }
+ });
+
}
public MessageListActivity with(MailFolderPlace place) {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java?rev=1522335&r1=1522334&r2=1522335&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
Thu Sep 12 04:21:15 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.client.ui;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import java.util.ArrayList;
import java.util.List;
<<<<<<< HEAD
@@ -74,42 +75,24 @@ import org.apache.hupa.client.place.Mail
>>>>>>> make reload message content work, use the same place with folder list,
>>>>>>> while separated with slash, that looks like Gmail's
import org.apache.hupa.client.rf.FetchMessagesRequest;
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
+=======
+import org.apache.hupa.client.activity.MessageListActivity;
+>>>>>>> scrub code
import org.apache.hupa.client.rf.HupaRequestFactory;
-import org.apache.hupa.shared.data.ImapFolderImpl;
-import org.apache.hupa.shared.domain.FetchMessagesAction;
-import org.apache.hupa.shared.domain.FetchMessagesResult;
-import org.apache.hupa.shared.domain.GetMessageDetailsAction;
-import org.apache.hupa.shared.domain.GetMessageDetailsResult;
-import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
-import org.apache.hupa.shared.domain.User;
-import org.apache.hupa.shared.events.ExpandMessageEvent;
-import org.apache.hupa.shared.events.LoadMessagesEvent;
-import org.apache.hupa.shared.events.LoadMessagesEventHandler;
-import org.apache.hupa.shared.events.LoginEvent;
-import org.apache.hupa.shared.events.LoginEventHandler;
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
import com.google.gwt.core.client.GWT;
-import com.google.gwt.core.client.Scheduler;
-import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.place.shared.PlaceController;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.cellview.client.DataGrid;
import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.view.client.CellPreviewEvent;
-import com.google.gwt.view.client.CellPreviewEvent.Handler;
-import com.google.gwt.view.client.RangeChangeEvent;
import com.google.inject.Inject;
-import com.google.web.bindery.requestfactory.shared.Receiver;
-import com.google.web.bindery.requestfactory.shared.ServerFailure;
public class MessageListView extends Composite implements
MessageListActivity.Displayable {
- private static final Logger log =
Logger.getLogger(MessageListView.class.getName());
-
@UiField(provided = true) MessagesCellTable grid;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java?rev=1522335&r1=1522334&r2=1522335&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
Thu Sep 12 04:21:15 2013
@@ -531,7 +531,7 @@ import com.google.inject.Inject;
public class MessagesCellTable extends DataGrid<Message> {
public static final int PAGE_SIZE = 25;
- @Inject ToolBarActivity.Displayable display;
+ @Inject ToolBarActivity.Displayable toolBarDisplay;
private HupaImageBundle imageBundle;
CheckboxColumn checkboxCol = new CheckboxColumn();
@@ -657,7 +657,7 @@ public class MessagesCellTable extends D
@Override
public void update(int index, Message object,
Boolean value) {
selectionModel.setSelected(object,
value);
- display.disableMessageTools();
+ toolBarDisplay.disableMessageTools();
}
});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
