You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2013/09/12 05:17:01 UTC
svn commit: r1522183 - in /james/hupa/trunk/client/src:
main/java/org/apache/hupa/client/ main/java/org/apache/hupa/client/mvp/
main/java/org/apache/hupa/client/mvp/place/
main/java/org/apache/hupa/client/ui/
test/java/org/apache/hupa/client/guice/ tes...
Author: dongxu
Date: Thu Sep 12 03:17:01 2013
New Revision: 1522183
URL: http://svn.apache.org/r1522183
Log:
delete some deprecated code
Removed:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HandlerRegistrationAdapter.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaCallback.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/AppView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/ContactsPresenter.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/ContactsView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/NameAwareWidgetDisplay.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/ContactsPresenterPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/HupaPlaceManager.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/IMAPMessagePresenterPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/LoginPresenterPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/place/MessageSendPresenterPlace.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/ContactsPresenterTest.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mvp/MessageSendPresenterTest.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/guice/GuiceMvpTestModule.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java?rev=1522183&r1=1522182&r2=1522183&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageView.java Thu Sep 12 03:17:01 2013
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.hupa.client.HupaCSS;
import org.apache.hupa.client.HupaConstants;
import org.apache.hupa.client.bundles.HupaImageBundle;
-import org.apache.hupa.client.mvp.IMAPMessagePresenter.Display;
import org.apache.hupa.client.widgets.CommandsBar;
import org.apache.hupa.client.widgets.MessageHeaders;
import org.apache.hupa.shared.SConsts;
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=1522183&r1=1522182&r2=1522183&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 03:17:01 2013
@@ -480,46 +480,17 @@ package org.apache.hupa.client.ui;
import java.util.Date;
import org.apache.hupa.client.bundles.HupaImageBundle;
-import org.apache.hupa.client.rf.FetchMessagesRequest;
-import org.apache.hupa.client.rf.HupaRequestFactory;
-import org.apache.hupa.shared.data.ImapFolderImpl;
-import org.apache.hupa.shared.data.MessageImpl;
-import org.apache.hupa.shared.domain.FetchMessagesAction;
-import org.apache.hupa.shared.domain.FetchMessagesResult;
-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.DecreaseUnseenEvent;
-import org.apache.hupa.shared.events.ExpandMessageEvent;
-import org.apache.hupa.shared.events.FolderSelectionEvent;
-import org.apache.hupa.shared.events.FolderSelectionEventHandler;
-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;
-import org.apache.hupa.shared.events.LogoutEvent;
-import org.apache.hupa.shared.events.LogoutEventHandler;
-import org.apache.hupa.shared.events.MessagesReceivedEvent;
import com.google.gwt.cell.client.CheckboxCell;
import com.google.gwt.cell.client.DateCell;
import com.google.gwt.cell.client.ImageResourceCell;
import com.google.gwt.cell.client.TextCell;
-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.i18n.client.DateTimeFormat;
import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.user.cellview.client.CellTable;
import com.google.gwt.user.cellview.client.Column;
-import com.google.gwt.user.cellview.client.SimplePager;
-import com.google.gwt.view.client.ListDataProvider;
-import com.google.gwt.view.client.RangeChangeEvent;
-import com.google.gwt.view.client.SelectionChangeEvent;
-import com.google.gwt.view.client.SingleSelectionModel;
import com.google.inject.Inject;
-import com.google.web.bindery.requestfactory.shared.Receiver;
-import com.google.web.bindery.requestfactory.shared.ServerFailure;
public class MessagesCellTable extends CellTable<Message> {
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java?rev=1522183&r1=1522182&r2=1522183&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java Thu Sep 12 03:17:01 2013
@@ -88,7 +88,6 @@ import org.apache.hupa.client.HupaMessag
import org.apache.hupa.client.activity.WestActivity;
import org.apache.hupa.client.bundles.IMAPTreeImages;
import org.apache.hupa.client.dnd.PagingScrollTableRowDragController;
-import org.apache.hupa.client.mvp.IMAPMessageListView;
import org.apache.hupa.client.widgets.ConfirmDialogBox;
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.client.widgets.IMAPTreeItem;
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=1522183&r1=1522182&r2=1522183&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:01 2013
@@ -30,10 +30,9 @@ import net.customware.gwt.presenter.clie
import net.customware.gwt.presenter.client.EventBus;
import org.apache.hupa.client.HupaMessages;
-import org.apache.hupa.client.mock.MockMessageSendDisplay;
-import org.apache.hupa.client.mvp.ContactsPresenter;
-import org.apache.hupa.client.mvp.MessageSendPresenter;
+import org.apache.hupa.client.activity.MessageSendActivity;
import org.apache.hupa.client.rf.HupaRequestFactory;
+import org.apache.hupa.client.ui.MessageSendView;
import org.easymock.EasyMock;
import com.google.gwt.event.shared.SimpleEventBus;
@@ -74,8 +73,8 @@ public class GuiceMvpTestModule extends
HupaMessages messages = EasyMock.createNiceMock(HupaMessages.class);
bind(HupaMessages.class).toInstance(messages);
- bindDisplay(ContactsPresenter.Display.class);
- bind(MessageSendPresenter.Display.class).to(MockMessageSendDisplay.class);
+// bindDisplay(ContactsPresenter.Display.class);
+ bind(MessageSendActivity.Displayable.class).to(MessageSendView.class);
bind(com.google.gwt.event.shared.EventBus.class)
.to(SimpleEventBus.class)
Modified: james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java?rev=1522183&r1=1522182&r2=1522183&view=diff
==============================================================================
--- james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java (original)
+++ james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java Thu Sep 12 03:17:01 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.client.mock;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import gwtupload.client.IUploader;
import org.apache.hupa.client.activity.ComposeActivity.Displayable;
@@ -31,6 +32,14 @@ import org.apache.hupa.widgets.ui.HasEna
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+import gwtupload.client.IUploader;
+
+import org.apache.hupa.client.activity.MessageSendActivity.Displayable;
+import org.apache.hupa.shared.rpc.ContactsResult.Contact;
+import org.apache.hupa.widgets.ui.HasEnable;
+
+>>>>>>> delete some deprecated code
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.user.client.ui.Focusable;
import com.google.gwt.user.client.ui.HasHTML;
@@ -46,6 +55,7 @@ public class MockMessageSendDisplay impl
>>>>>>> first commit
import com.google.gwt.user.client.ui.Widget;
+<<<<<<< HEAD
import gwtupload.client.IUploader;
import org.apache.hupa.client.mvp.MessageSendPresenter.Display;
@@ -57,6 +67,9 @@ public class MockMessageSendDisplay impl
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+public class MockMessageSendDisplay implements Displayable {
+>>>>>>> delete some deprecated code
HasClickHandlers backClick = new MockWidget();
HasText bccText = new MockWidget();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org