Author: dongxu
Date: Thu Sep 12 02:56:01 2013
New Revision: 1522155
URL: http://svn.apache.org/r1522155
Log:
fix issue 2&3. Handle exceptions thrown in async blocks & Simply injection code
Modified:
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/evo/HupaEvo.java
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=1522155&r1=1522154&r2=1522155&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 02:56:01 2013
@@ -136,18 +136,9 @@ public class IMAPMessageActivity extend
}
- @Inject
- public IMAPMessageActivity(Displayable display, EventBus eventBus,
PlaceController placeController,
- CachingDispatchAsync dispatcher){
- this.display = display;
- this.dispatcher = dispatcher;
- this.eventBus = eventBus;
- this.placeController = placeController;
-
-
- }
private MessageDetails messageDetails;
private Message message;
+<<<<<<< HEAD
private CachingDispatchAsync dispatcher;
<<<<<<< HEAD
<<<<<<< HEAD
@@ -160,12 +151,15 @@ public class IMAPMessageActivity extend
private IMAPFolderProxy folder;
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder
>>>>>>> services RF being working, but there are issues on RF's find* method,
>>>>>>> I think.
=======
+=======
+>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks &
Simply injection code
private ImapFolder folder;
>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can
>>>>>>> display folders in west view with RequestFactory now.
private User user;
- private final Displayable display;
- private final EventBus eventBus;
- private final PlaceController placeController;
+ @Inject private CachingDispatchAsync dispatcher;
+ @Inject private Displayable display;
+ @Inject private EventBus eventBus;
+ @Inject private PlaceController placeController;
public interface Displayable extends WidgetDisplayable{
public void setHeaders(Message msg);
public void setAttachments(List<MessageAttachment> attachements,
String folder, long uid);
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=1522155&r1=1522154&r2=1522155&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 02:56:01 2013
@@ -523,6 +523,7 @@ public class IMAPMessageListActivity ext
private ShowMessageTableListener tableListener = new
ShowMessageTableListener();
+<<<<<<< HEAD
private final Displayable display;
private final EventBus eventBus;
private final PlaceController placeController;
@@ -530,16 +531,14 @@ public class IMAPMessageListActivity ext
<<<<<<< HEAD
private DispatchAsync dispatcher;
private final Provider<MessageSendPlace> messageSendPlaceProvider;
+=======
+ @Inject private Displayable display;
+ @Inject private EventBus eventBus;
+ @Inject private PlaceController placeController;
+ @Inject private DispatchAsync dispatcher;
+ @Inject private Provider<MessageSendPlace> messageSendPlaceProvider;
+>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks &
Simply injection code
- @Inject
- public IMAPMessageListActivity(Displayable display, EventBus eventBus,
PlaceController placeController,
- DispatchAsync dispatcher,Provider<MessageSendPlace>
messageSendPlaceProvider){
- this.display = display;
- this.eventBus = eventBus;
- this.placeController = placeController;
- this.dispatcher = dispatcher;
- this.messageSendPlaceProvider = messageSendPlaceProvider;
- }
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
bind();
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=1522155&r1=1522154&r2=1522155&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 02:56:01 2013
@@ -75,6 +75,7 @@ import com.google.gwt.activity.shared.Ab
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.core.client.GWT;
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
=======
@@ -90,6 +91,8 @@ import com.google.gwt.core.client.GWT;
=======
import com.google.gwt.core.client.GWT;
>>>>>>> decorate the theme
+=======
+>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks &
Simply injection 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;
@@ -124,6 +127,7 @@ import com.google.inject.Inject;
public class LoginActivity extends AbstractActivity {
+<<<<<<< HEAD
private final Displayable display;
private final EventBus eventBus;
private final PlaceController placeController;
@@ -181,6 +185,13 @@ public class LoginActivity extends Abstr
>>>>>>> Change to new mvp framework - first step
}
>>>>>>> change the LOGIN progress using native MVP instead of gwt-presenter
+=======
+ @Inject private Displayable display;
+ @Inject private EventBus eventBus;
+ @Inject private PlaceController placeController;
+ @Inject private DispatchAsync dispatcher;
+ @Inject private HupaConstants constants;
+>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks &
Simply injection code
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
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=1522155&r1=1522154&r2=1522155&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 02:56:01 2013
@@ -150,7 +150,6 @@ public class MessageSendActivity extends
public class MessageSendActivity extends AbstractActivity {
- private DispatchAsync dispatcher;
private ArrayList<MessageAttachment> attachments = new
ArrayList<MessageAttachment>();
private Type type = Type.NEW;
<<<<<<< HEAD
@@ -171,9 +170,11 @@ public class MessageSendActivity extends
protected SMTPMessage message = null;
@SuppressWarnings("unused")
private MessageDetails oldDetails;
- private final Displayable display;
- private final EventBus eventBus;
- private final PlaceController placeController;
+
+ @Inject private DispatchAsync dispatcher;
+ @Inject private Displayable display;
+ @Inject private EventBus eventBus;
+ @Inject private PlaceController placeController;
private MessageSendPlace place;
@@ -191,6 +192,7 @@ public class MessageSendActivity extends
}
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public MessageSendActivity with(MessageSendPlace place) {
=======
@@ -205,6 +207,8 @@ public class MessageSendActivity extends
this.placeController = placeController;
}
+=======
+>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks &
Simply injection code
public MessageSendActivity with(MessageSendPlace place){
this.place = place;
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=1522155&r1=1522154&r2=1522155&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 02:56:01 2013
@@ -119,11 +119,14 @@ import com.google.inject.Provider;
public class TopActivity extends AbstractActivity {
private static final int IDLE_INTERVAL = 150000;
+<<<<<<< HEAD
HupaConstants constants;
<<<<<<< HEAD
>>>>>>> introduce the top activity
=======
>>>>>>> introduce the top activity
+=======
+>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks &
Simply injection code
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
container.setWidget(display.asWidget());
@@ -337,6 +340,7 @@ public class TopActivity extends Abstrac
=======
private Timer noopTimer = new IdleTimer();
+<<<<<<< HEAD
@Inject
<<<<<<< HEAD
public TopActivity(Displayable display, EventBus eventBus,
PlaceController placeController,
@@ -364,6 +368,8 @@ public class TopActivity extends Abstrac
>>>>>>> introduce the top activity
=======
>>>>>>> introduce the top activity
+=======
+>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks &
Simply injection code
public interface Displayable extends WidgetDisplayable {
public HasClickHandlers getLogoutClick();
public HasClickHandlers getContactsClick();
@@ -378,6 +384,7 @@ public class TopActivity extends Abstrac
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private class IdleTimer extends Timer {
boolean running = false;
@@ -406,6 +413,15 @@ public class TopActivity extends Abstrac
private final Provider<DefaultPlace> defaultPlaceProvider;
>>>>>>>
+=======
+ @Inject private Displayable display;
+ @Inject private EventBus eventBus;
+ @Inject private PlaceController placeController;
+ @Inject private DispatchAsync dispatcher;
+ @Inject private Provider<DefaultPlace> defaultPlaceProvider;
+ @Inject private HupaConstants constants;
+
+>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks &
Simply injection code
private User user;
private ServerStatus serverStatus = ServerStatus.Available;
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=1522155&r1=1522154&r2=1522155&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 02:56:01 2013
@@ -401,6 +401,7 @@ import com.google.web.bindery.requestfac
public class WestActivity extends AbstractActivity {
+<<<<<<< HEAD
private final Displayable display;
private final EventBus eventBus;
private final PlaceController placeController;
@@ -438,8 +439,24 @@ public class WestActivity extends Abstra
>>>>>>>
=======
>>>>>>> 1. improve the inbox folder place.
+=======
+ @Override
+ public void start(AcceptsOneWidget container, EventBus eventBus) {
+ display.setUser(user);
+ loadTreeItems();
+ bind();
+ container.setWidget(display.asWidget());
+ }
+
+ @Inject private DispatchAsync dispatcher;
+ @Inject private Displayable display;
+ @Inject private EventBus eventBus;
+ @Inject private PlaceController placeController;
+ @Inject private Provider<IMAPMessagePlace> IMAPMessagePlaceProvider;
+ @Inject private Provider<MessageSendPlace> messageSendPlaceProvider;
+ @Inject private Provider<IMAPMessagePlace> messagePlaceProvider;
+>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks &
Simply injection code
- private DispatchAsync dispatcher;
private User user;
private ImapFolder folder;
private IMAPTreeItem tItem;
@@ -451,6 +468,7 @@ public class WestActivity extends Abstra
public void setCurrentPlace(Place place){
this.currentPlace = place;
}
+<<<<<<< HEAD
@Inject
public WestActivity(Displayable display, EventBus eventBus,
PlaceController placeController,
@@ -511,6 +529,9 @@ public class WestActivity extends Abstra
this.user = user;
>>>>>>> Change to new mvp framework - first step
=======
+=======
+
+>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks &
Simply injection code
public WestActivity with(MailFolderPlace place){
this.currentPlace = place;
this.user = place.getUser();
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java?rev=1522155&r1=1522154&r2=1522155&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java
Thu Sep 12 02:56:01 2013
@@ -4,21 +4,31 @@ import org.apache.hupa.client.ioc.AppGin
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.core.client.GWT.UncaughtExceptionHandler;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.ui.RootPanel;
public class HupaEvo implements EntryPoint {
-
- private final AppGinjector injector = GWT.create(AppGinjector.class);
@Override
public void onModuleLoad() {
+ handleExceptionsAsync();
removeLoading();
AppController appController = injector.getAppController();
appController.start();
}
+
+ private void handleExceptionsAsync(){
+ GWT.setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
+ public void onUncaughtException(Throwable e) {
+ e.printStackTrace();
+ }
+ });
+ }
private void removeLoading() {
DOM.removeChild(RootPanel.getBodyElement(),
DOM.getElementById("loading"));
}
+ private final AppGinjector injector = GWT.create(AppGinjector.class);
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
