Author: dongxu
Date: Thu Sep 12 03:17:58 2013
New Revision: 1522185
URL: http://svn.apache.org/r1522185
Log:
remove gwt-representer dependency of client
Modified:
james/hupa/trunk/client/pom.xml
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceMvpTestModule.java
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1522185&r1=1522184&r2=1522185&view=diff
==============================================================================
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Thu Sep 12 03:17:58 2013
@@ -87,10 +87,6 @@
<artifactId>gwt-dispatch</artifactId>
</dependency>
<dependency>
- <groupId>net.customware.gwt.presenter</groupId>
- <artifactId>gwt-presenter</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.code.gwt-dnd</groupId>
<artifactId>gwt-dnd</artifactId>
</dependency>
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java?rev=1522185&r1=1522184&r2=1522185&view=diff
==============================================================================
---
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java
(original)
+++
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/HupaMvpTestCase.java
Thu Sep 12 03:17:58 2013
@@ -18,27 +18,25 @@
****************************************************************/
package org.apache.hupa.client;
-import com.google.gwt.junit.GWTMockUtilities;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-
-import com.sun.mail.imap.IMAPStore;
+import javax.mail.Session;
+import javax.servlet.http.HttpSession;
import junit.framework.TestCase;
-import net.customware.gwt.presenter.client.EventBus;
-
+import org.apache.hupa.client.guice.GuiceClientTestModule;
import org.apache.hupa.client.guice.GuiceMvpTestModule;
import org.apache.hupa.server.IMAPStoreCache;
-import org.apache.hupa.client.guice.GuiceClientTestModule;
import org.apache.hupa.server.preferences.UserPreferencesStorage;
import org.apache.hupa.server.utils.SessionUtils;
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.domain.User;
-import javax.mail.Session;
-import javax.servlet.http.HttpSession;
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.junit.GWTMockUtilities;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+import com.sun.mail.imap.IMAPStore;
/**
* Base class for testing presenters in hupa.
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceMvpTestModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceMvpTestModule.java?rev=1522185&r1=1522184&r2=1522185&view=diff
==============================================================================
---
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceMvpTestModule.java
(original)
+++
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceMvpTestModule.java
Thu Sep 12 03:17:58 2013
@@ -25,9 +25,6 @@ import net.customware.gwt.dispatch.serve
import net.customware.gwt.dispatch.shared.Action;
import net.customware.gwt.dispatch.shared.DispatchException;
import net.customware.gwt.dispatch.shared.Result;
-import net.customware.gwt.presenter.client.DefaultEventBus;
-import net.customware.gwt.presenter.client.Display;
-import net.customware.gwt.presenter.client.EventBus;
import org.apache.hupa.client.HupaMessages;
import org.apache.hupa.client.activity.MessageSendActivity;
@@ -35,6 +32,7 @@ import org.apache.hupa.client.rf.HupaReq
import org.apache.hupa.client.ui.MessageSendView;
import org.easymock.EasyMock;
+import com.google.gwt.event.shared.EventBus;
import com.google.gwt.event.shared.SimpleEventBus;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.inject.AbstractModule;
@@ -66,7 +64,7 @@ public class GuiceMvpTestModule extends
bind(DispatchAsync.class).toInstance(dispatchAsyncInstance);
}
- bind(EventBus.class).to(DefaultEventBus.class);
+ bind(EventBus.class).to(SimpleEventBus.class);
bind(DispatchTestAsync.class);
@@ -95,11 +93,6 @@ public class GuiceMvpTestModule extends
}
}
- protected <D extends Display> void bindDisplay(final Class<D> display) {
- final D mockDisplay = EasyMock.createNiceMock(display);
- bind(display).toInstance(mockDisplay);
- }
-
static class DispatchTestService implements StandardDispatchService {
private Dispatch dispatch;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
