Author: dongxu
Date: Thu Sep 12 03:16:04 2013
New Revision: 1522181
URL: http://svn.apache.org/r1522181
Log:
add SuppressWarnings("depraction")
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java?rev=1522181&r1=1522180&r2=1522181&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
Thu Sep 12 03:16:04 2013
@@ -204,11 +204,15 @@ import com.google.inject.name.Named;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
@SuppressWarnings("deprecation")
=======
>>>>>>> Change to new mvp framework - first step
=======
>>>>>>> Change to new mvp framework - first step
+=======
+@SuppressWarnings("deprecation")
+>>>>>>> add SuppressWarnings("depraction")
public class AppGinModule extends AbstractGinModule {
public static Logger logger =
Logger.getLogger(AppGinModule.class.getName());
@@ -574,6 +578,7 @@ public class AppGinModule extends Abstra
return new ActivityManager(activityMapper, eventBus);
}
+<<<<<<< HEAD
// @Provides
// @Singleton
// protected DispatchAsync provideDispatchAsync(ExceptionHandler
@@ -582,6 +587,8 @@ public class AppGinModule extends Abstra
// }
>>>>>>> Make chechsession and login work with RF, with refactoring fetch
>>>>>>> folders.
+=======
+>>>>>>> add SuppressWarnings("depraction")
@Provides
@Singleton
public PlaceController getPlaceController(EventBus eventBus) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
