Author: dongxu
Date: Thu Sep 12 04:14:41 2013
New Revision: 1522315
URL: http://svn.apache.org/r1522315
Log:
scrub code
Modified:
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/ActivityManagerInitializer.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
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=1522315&r1=1522314&r2=1522315&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 04:14:41 2013
@@ -26,6 +26,7 @@
package org.apache.hupa.client.activity;
import org.apache.hupa.client.HupaConstants;
+<<<<<<< HEAD
import org.apache.hupa.client.rf.IdleRequest;
import org.apache.hupa.client.rf.LogoutUserRequest;
import org.apache.hupa.client.ui.WidgetDisplayable;
@@ -61,6 +62,8 @@ import org.apache.hupa.shared.data.User;
>>>>>>> introduce the top activity
=======
import org.apache.hupa.client.place.DefaultPlace;
+=======
+>>>>>>> scrub code
import org.apache.hupa.client.rf.IdleRequest;
import org.apache.hupa.client.rf.LogoutUserRequest;
import org.apache.hupa.client.ui.WidgetDisplayable;
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=1522315&r1=1522314&r2=1522315&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 04:14:41 2013
@@ -26,6 +26,7 @@
package org.apache.hupa.client.activity;
import org.apache.hupa.client.activity.MessageSendActivity.Type;
+<<<<<<< HEAD
import org.apache.hupa.client.place.FolderPlace;
import org.apache.hupa.client.place.MessageSendPlace;
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
@@ -269,6 +270,8 @@ import java.util.List;
>>>>>>> refactoring.
import org.apache.hupa.client.activity.MessageSendActivity.Type;
import org.apache.hupa.client.place.IMAPMessagePlace;
+=======
+>>>>>>> scrub code
import org.apache.hupa.client.place.MailFolderPlace;
import org.apache.hupa.client.place.MessageSendPlace;
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java?rev=1522315&r1=1522314&r2=1522315&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java
Thu Sep 12 04:14:41 2013
@@ -21,9 +21,7 @@ package org.apache.hupa.client.evo;
import org.apache.hupa.client.ui.AppLayout;
-import com.google.gwt.activity.shared.ActivityManager;
import com.google.inject.Inject;
-import com.google.inject.name.Named;
/**
* This class is responsible for ActivityManager instantiations through GIN, it
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?rev=1522315&r1=1522314&r2=1522315&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
Thu Sep 12 04:14:41 2013
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.hupa.client.place.MailFolderPlace;
import org.apache.hupa.client.rf.HupaRequestFactory;
-import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.LoadMessagesEvent;
@@ -32,8 +31,6 @@ import org.apache.hupa.shared.events.Log
import com.google.gwt.cell.client.AbstractCell;
import com.google.gwt.cell.client.ValueUpdater;
-import com.google.gwt.core.client.Scheduler;
-import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.dom.client.Element;
import com.google.gwt.dom.client.NativeEvent;
import com.google.gwt.event.dom.client.ClickEvent;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
