Author: dongxu
Date: Thu Sep 12 03:34:02 2013
New Revision: 1522219
URL: http://svn.apache.org/r1522219
Log:
refactoring.
Added:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersCellTree.java
- copied, changed from r1522218,
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderTree.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
- copied, changed from r1522218,
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderTreeViewModel.java
Removed:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderTree.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderTreeViewModel.java
Modified:
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/ioc/AppGinModule.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WestView.java
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=1522219&r1=1522218&r2=1522219&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 03:34:02 2013
@@ -253,6 +253,7 @@ public class WestActivity extends AppBas
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add
>>>>>>> license headers to all new files
package org.apache.hupa.client.activity;
+<<<<<<< HEAD
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -264,49 +265,33 @@ import java.util.List;
<<<<<<< HEAD
=======
>>>>>>> try to change fetch messages to use RF
+=======
+>>>>>>> refactoring.
import org.apache.hupa.client.activity.MessageSendActivity.Type;
import org.apache.hupa.client.place.IMAPMessagePlace;
import org.apache.hupa.client.place.MailFolderPlace;
import org.apache.hupa.client.place.MessageSendPlace;
-import org.apache.hupa.client.rf.CreateFolderRequest;
-import org.apache.hupa.client.rf.DeleteFolderRequest;
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
-import org.apache.hupa.client.rf.HupaRequestFactory;
-import org.apache.hupa.client.rf.ImapFolderRequest;
-import org.apache.hupa.client.rf.RenameFolderRequest;
import org.apache.hupa.client.ui.WidgetDisplayable;
-import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.client.widgets.IMAPTreeItem;
-import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
-import org.apache.hupa.shared.domain.CreateFolderAction;
-import org.apache.hupa.shared.domain.DeleteFolderAction;
-import org.apache.hupa.shared.domain.GenericResult;
import org.apache.hupa.shared.domain.GetMessageDetailsAction;
import org.apache.hupa.shared.domain.GetMessageDetailsResult;
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
-import org.apache.hupa.shared.domain.MessageDetails;
-import org.apache.hupa.shared.domain.RenameFolderAction;
import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.BackEvent;
import org.apache.hupa.shared.events.BackEventHandler;
-import org.apache.hupa.shared.events.DecreaseUnseenEvent;
-import org.apache.hupa.shared.events.DecreaseUnseenEventHandler;
import org.apache.hupa.shared.events.ExpandMessageEvent;
import org.apache.hupa.shared.events.ExpandMessageEventHandler;
import org.apache.hupa.shared.events.FolderSelectionEvent;
import org.apache.hupa.shared.events.FolderSelectionEventHandler;
import org.apache.hupa.shared.events.ForwardMessageEvent;
import org.apache.hupa.shared.events.ForwardMessageEventHandler;
-import org.apache.hupa.shared.events.IncreaseUnseenEvent;
-import org.apache.hupa.shared.events.IncreaseUnseenEventHandler;
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.MessagesReceivedEvent;
-import org.apache.hupa.shared.events.MessagesReceivedEventHandler;
import org.apache.hupa.shared.events.NewMessageEvent;
import org.apache.hupa.shared.events.NewMessageEventHandler;
import org.apache.hupa.shared.events.ReplyMessageEvent;
@@ -314,6 +299,7 @@ import org.apache.hupa.shared.events.Rep
import org.apache.hupa.shared.events.SentMessageEvent;
import org.apache.hupa.shared.events.SentMessageEventHandler;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.rpc.CreateFolder;
import org.apache.hupa.shared.rpc.DeleteFolder;
import org.apache.hupa.shared.rpc.GenericResult;
@@ -377,10 +363,12 @@ import org.apache.hupa.shared.rpc.Rename
>>>>>>> try to change fetch messages to use RF
import org.apache.hupa.widgets.event.EditEvent;
import org.apache.hupa.widgets.event.EditHandler;
+=======
+>>>>>>> refactoring.
import org.apache.hupa.widgets.ui.HasEditable;
-import org.apache.hupa.widgets.ui.HasEnable;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.activity.shared.AbstractActivity;
<<<<<<< HEAD
<<<<<<< HEAD
@@ -395,16 +383,18 @@ import com.google.gwt.event.dom.client.H
import com.google.gwt.event.logical.shared.HasSelectionHandlers;
import com.google.gwt.event.logical.shared.SelectionEvent;
import com.google.gwt.event.logical.shared.SelectionHandler;
+=======
+>>>>>>> refactoring.
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.place.shared.Place;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.TreeItem;
import com.google.inject.Inject;
import com.google.inject.Provider;
<<<<<<< HEAD
<<<<<<< HEAD
import com.google.web.bindery.requestfactory.shared.Receiver;
+<<<<<<< HEAD
=======
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.logical.shared.HasSelectionHandlers;
@@ -423,6 +413,8 @@ import com.google.web.bindery.requestfac
=======
import com.google.web.bindery.requestfactory.shared.ServerFailure;
>>>>>>> Succeed creating new folder
+=======
+>>>>>>> refactoring.
public class WestActivity extends AppBaseActivity {
@@ -540,8 +532,6 @@ public class WestActivity extends AppBas
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
- display.setUser(user);
- loadTreeItems();
bind();
container.setWidget(display.asWidget());
}
@@ -612,6 +602,7 @@ public class WestActivity extends AppBas
return this;
}
+<<<<<<< HEAD
protected void loadTreeItems() {
display.setLoadingFolders(true);
HupaRequestFactory rf = GWT.create(HupaRequestFactory.class);
@@ -855,6 +846,8 @@ System.out.println("1111111"+response);
return tList;
}
+=======
+>>>>>>> refactoring.
private void cloneFolder(ImapFolder desc, ImapFolder src) {
desc.setChildren(src.getChildren());
desc.setDelimiter(src.getDelimiter());
@@ -937,7 +930,6 @@ System.out.println("1111111"+response);
decreaseUnseen = false;
}
- display.setLoadingMessage(true);
GetMessageDetailsRequest req =
requestFactory.messageDetailsRequest();
GetMessageDetailsAction action =
req.create(GetMessageDetailsAction.class);
final ImapFolder f =
req.create(ImapFolder.class);
@@ -952,7 +944,6 @@ System.out.println("1111111"+response);
* TODO if (decreaseUnseen) {
eventBus.fireEvent(new
* DecreaseUnseenEvent(user,
folder)); }
*/
-
display.setLoadingMessage(false);
placeController.goTo(messagePlaceProvider.get().with(user, f, message,
response.getMessageDetails()));
}
@@ -1010,6 +1001,7 @@ System.out.println("1111111"+response);
}
}
});
+<<<<<<< HEAD
eventBus.addHandler(DecreaseUnseenEvent.TYPE, new
DecreaseUnseenEventHandler() {
public void onDecreaseUnseenEvent(DecreaseUnseenEvent
event) {
display.decreaseUnseenMessageCount(event.getFolder(), event.getAmount());
@@ -1256,13 +1248,12 @@ System.out.println("1111111"+response);
display.updateTreeItem(f);
}
});
+=======
+>>>>>>> refactoring.
eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() {
public void onLogin(LoginEvent event) {
user = event.getUser();
- // folder = (IMAPFolderProxy)new
- //
IMAPFolder(user.getSettings().getInboxFolderName());;
searchValue = null;
- // showMessageTable(user, folder, searchValue);
}
<<<<<<< HEAD
@@ -1350,12 +1341,10 @@ System.out.println("1111111"+response);
// FIXME goto?
placeController.goTo(new MailFolderPlace().with(user, folder,
searchValue));
- //
placeController.goTo(mailInboxPlaceProvider.get().with(user));
- // placeController.goTo(new
- // MailInboxPlace(folder.getName()).with(user));
}
<<<<<<< HEAD
+<<<<<<< HEAD
private void showMessage(User user, ImapFolder folder, Message message,
MessageDetails details) {
placeController.goTo(IMAPMessagePlaceProvider.get());
>>>>>>> try to change fetch messages to use RF
@@ -1366,6 +1355,8 @@ System.out.println("1111111"+response);
// }
>>>>>>> fixed issue #16
+=======
+>>>>>>> refactoring.
private void showNewMessage() {
placeController.goTo(this.messageSendPlaceProvider.get().with(user, null, null,
null, Type.NEW));
}
@@ -1381,7 +1372,6 @@ System.out.println("1111111"+response);
}
@Inject private Displayable display;
-// @Inject private Provider<IMAPMessagePlace> IMAPMessagePlaceProvider;
@Inject private Provider<MessageSendPlace> messageSendPlaceProvider;
@Inject private Provider<IMAPMessagePlace> messagePlaceProvider;
private User user;
@@ -1392,6 +1382,7 @@ System.out.println("1111111"+response);
private Place currentPlace;
public interface Displayable extends WidgetDisplayable {
+<<<<<<< HEAD
public HasSelectionHandlers<TreeItem> getTree();
<<<<<<< HEAD
@@ -1548,6 +1539,8 @@ System.out.println("1111111"+response);
public void setLoadingMessage(boolean loading);
>>>>>>> scrub code
public void setUser(User user);
+=======
+>>>>>>> refactoring.
}
>>>>>>> try to change fetch messages to use RF
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=1522219&r1=1522218&r2=1522219&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:34:02 2013
@@ -164,7 +164,8 @@ import org.apache.hupa.client.place.Defa
import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.client.ui.AppLayout;
import org.apache.hupa.client.ui.AppLayoutImpl;
-import org.apache.hupa.client.ui.FolderTreeViewModel;
+import org.apache.hupa.client.ui.FoldersTreeViewModel;
+import org.apache.hupa.client.ui.FoldersCellTree;
import org.apache.hupa.client.ui.IMAPMessageListView;
<<<<<<< HEAD
<<<<<<< HEAD
@@ -198,11 +199,15 @@ import com.google.gwt.place.shared.Place
import com.google.gwt.place.shared.PlaceHistoryMapper;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.user.cellview.client.CellTree;
=======
>>>>>>> Change to new mvp framework - first step
=======
>>>>>>> Change to new mvp framework - first step
+=======
+import com.google.gwt.user.cellview.client.CellTree;
+>>>>>>> refactoring.
import com.google.inject.Provides;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
@@ -433,7 +438,8 @@ public class AppGinModule extends Abstra
bind(IMAPMessageActivity.class).in(Singleton.class);
bind(MessagesCellTable.class).in(Singleton.class);
- bind(FolderTreeViewModel.class).in(Singleton.class);
+ bind(FoldersTreeViewModel.class);
+
bind(CellTree.Resources.class).to(CellTree.BasicResources.class);
// Places
bind(PlaceHistoryMapper.class).to(AppPlaceHistoryMapper.class).in(Singleton.class);
Copied:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersCellTree.java
(from r1522218,
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderTree.java)
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersCellTree.java?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersCellTree.java&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderTree.java&r1=1522218&r2=1522219&rev=1522219&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderTree.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersCellTree.java
Thu Sep 12 03:34:02 2013
@@ -20,13 +20,13 @@
package org.apache.hupa.client.ui;
import com.google.gwt.user.cellview.client.CellTree;
-import com.google.gwt.view.client.TreeViewModel;
+import com.google.inject.Inject;
-public class FolderTree extends CellTree {
+public class FoldersCellTree extends CellTree {
- public <T> FolderTree(TreeViewModel viewModel, T rootValue, Resources
resources) {
- super(viewModel, rootValue, resources);
- // TODO Auto-generated constructor stub
- }
+ @Inject
+ public FoldersCellTree(final FoldersTreeViewModel viewModel, Resources
resources) {
+ super(viewModel, null, resources);
+ }
}
Copied:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
(from r1522218,
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderTreeViewModel.java)
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderTreeViewModel.java&r1=1522218&r2=1522219&rev=1522219&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderTreeViewModel.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java
Thu Sep 12 03:34:02 2013
@@ -23,28 +23,25 @@ import java.util.List;
import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.shared.domain.ImapFolder;
-import org.apache.hupa.shared.events.LoadMessagesEvent;
import com.google.gwt.cell.client.AbstractCell;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.view.client.AsyncDataProvider;
import com.google.gwt.view.client.HasData;
-import com.google.gwt.view.client.ProvidesKey;
-import com.google.gwt.view.client.SelectionChangeEvent;
import com.google.gwt.view.client.SingleSelectionModel;
import com.google.gwt.view.client.TreeViewModel;
import com.google.inject.Inject;
import com.google.web.bindery.requestfactory.shared.Receiver;
-public class FolderTreeViewModel implements TreeViewModel {
+public class FoldersTreeViewModel implements TreeViewModel {
@Inject protected HupaRequestFactory rf;
@Inject protected EventBus eventBus;
protected SingleSelectionModel<ImapFolder> selectionModel;
- protected void setSelectionModel(SingleSelectionModel<ImapFolder>
selectionModel){
+ public void setSelectionModel(SingleSelectionModel<ImapFolder>
selectionModel){
this.selectionModel = selectionModel;
}
@@ -54,23 +51,6 @@ public class FolderTreeViewModel impleme
*/
@Override
public <T> NodeInfo<?> getNodeInfo(T value) {
-
-// final ProvidesKey<ImapFolder> KEY_PROVIDER = new
ProvidesKey<ImapFolder>() {
-// @Override
-// public Object getKey(ImapFolder item) {
-// return item == null ? null : item.getFullName();
-// }
-// };
-// final SingleSelectionModel<ImapFolder> selectionModel = new
SingleSelectionModel<ImapFolder>(KEY_PROVIDER);
-// selectionModel.addSelectionChangeHandler(new
SelectionChangeEvent.Handler() {
-//
-// @Override
-// public void onSelectionChange(SelectionChangeEvent event) {
-// ImapFolder folder = (ImapFolder)event.getSource();
-//
-// eventBus.fireEvent(new LoadMessagesEvent(user,
folder));
-//
-// }});
return new DefaultNodeInfo<ImapFolder>(new
ImapFolderListDataProvider((ImapFolder) value),
new AbstractCell<ImapFolder>() {
@Override
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java?rev=1522219&r1=1522218&r2=1522219&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/IMAPMessageListView.java
Thu Sep 12 03:34:02 2013
@@ -124,6 +124,7 @@ import org.cobogw.gwt.user.client.ui.But
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
>>>>>>> Change to new mvp framework - first step
=======
>>>>>>> Change to new mvp framework - first step
@@ -135,6 +136,8 @@ import com.google.gwt.cell.client.TextCe
=======
import com.google.gwt.cell.client.FieldUpdater;
>>>>>>> make the messages list can be selected without bothering the checkbox
>>>>>>> column's behavior of it.
+=======
+>>>>>>> refactoring.
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
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=1522219&r1=1522218&r2=1522219&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:34:02 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.client.ui;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.activity.WestActivity;
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
@@ -85,18 +86,13 @@ import java.util.List;
import org.apache.hupa.client.HupaCSS;
import org.apache.hupa.client.HupaConstants;
import org.apache.hupa.client.HupaMessages;
+=======
+>>>>>>> refactoring.
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.widgets.ConfirmDialogBox;
-import org.apache.hupa.client.widgets.HasDialog;
-import org.apache.hupa.client.widgets.IMAPTreeItem;
-import org.apache.hupa.shared.data.ImapFolderImpl;
-import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
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.LoadMessagesEvent;
+<<<<<<< HEAD
import org.apache.hupa.shared.events.LoginEvent;
import org.apache.hupa.shared.events.LoginEventHandler;
import org.apache.hupa.shared.events.LogoutEvent;
@@ -124,38 +120,28 @@ import org.apache.hupa.widgets.ui.HasEdi
import org.apache.hupa.widgets.ui.HasEnable;
import org.apache.hupa.widgets.ui.Loading;
import org.apache.hupa.widgets.ui.RndPanel;
+=======
+>>>>>>> refactoring.
-import com.allen_sauer.gwt.dnd.client.DragContext;
-import com.allen_sauer.gwt.dnd.client.VetoDragException;
-import com.allen_sauer.gwt.dnd.client.drop.DropController;
-import com.allen_sauer.gwt.dnd.client.drop.SimpleDropController;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.HasClickHandlers;
-import com.google.gwt.event.logical.shared.HasSelectionHandlers;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.cellview.client.CellTree;
-import com.google.gwt.user.cellview.client.TreeNode;
import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DockPanel;
-import com.google.gwt.user.client.ui.FlowPanel;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Panel;
-import com.google.gwt.user.client.ui.Tree;
-import com.google.gwt.user.client.ui.TreeItem;
-import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.view.client.ProvidesKey;
import com.google.gwt.view.client.SelectionChangeEvent;
import com.google.gwt.view.client.SingleSelectionModel;
-import com.google.gwt.view.client.TreeViewModel;
import com.google.inject.Inject;
+
/**
- * MainView acts like a container of other widgets which will get displayed
after the user successfully logged in
+ * MainView acts like a container of other widgets which will get displayed
+ * after the user successfully logged in
+ *
*
- *
*/
public class WestView extends Composite implements WestActivity.Displayable {
+<<<<<<< HEAD
private DockPanel dockPanel;
private VerticalPanel north;
private HupaConstants constants;
@@ -194,12 +180,20 @@ public class WestView extends Composite
public WestView(FolderTreeViewModel viewModel, final EventBus eventBus,
PagingScrollTableRowDragController controllerProvider, HupaConstants constants,
HupaMessages messages) {
this.viewModel = viewModel;
selectionModel.addSelectionChangeHandler(new
SelectionChangeEvent.Handler() {
+=======
+ protected User user;
+ private FoldersCellTree cellTree;
+>>>>>>> refactoring.
+ @Inject
+ public WestView(final FoldersTreeViewModel viewModel, final EventBus
eventBus) {
+ selectionModel.addSelectionChangeHandler(new
SelectionChangeEvent.Handler() {
+ @SuppressWarnings("unchecked")
@Override
- public void onSelectionChange(SelectionChangeEvent event) {
- @SuppressWarnings("unchecked")
- SingleSelectionModel<ImapFolder> selectionModel
=(SingleSelectionModel<ImapFolder>) event.getSource();
+ public void onSelectionChange(SelectionChangeEvent
event) {
+ SingleSelectionModel<ImapFolder> selectionModel
= (SingleSelectionModel<ImapFolder>) event.getSource();
eventBus.fireEvent(new LoadMessagesEvent(user,
selectionModel.getSelectedObject()));
+<<<<<<< HEAD
}});
viewModel.setSelectionModel(selectionModel);
@@ -781,16 +775,28 @@ public class WestView extends Composite
}
}
}
+=======
+ }
+ });
+ viewModel.setSelectionModel(selectionModel);
+ CellTree.Resources res =
GWT.create(CellTree.BasicResources.class);
+ cellTree = new FoldersCellTree(viewModel, res);
+ cellTree.setAnimationEnabled(true);
+ initWidget(cellTree);
+>>>>>>> refactoring.
- /*
- * (non-Javadoc)
- * @see org.apache.hupa.client.mvp.NameAwareDisplay#getName()
- */
- public String getName() {
- return constants.mailTab();
- }
+ }
+
+ private final SingleSelectionModel<ImapFolder> selectionModel = new
SingleSelectionModel<ImapFolder>(
+ new ProvidesKey<ImapFolder>() {
+ @Override
+ public Object getKey(ImapFolder item) {
+ return item == null ? null : item.getFullName();
+ }
+ });
+<<<<<<< HEAD
@Override
public void setUser(User user) {
this.user = user;
@@ -799,5 +805,9 @@ public class WestView extends Composite
>>>>>>> Change to new mvp framework - first step
=======
>>>>>>> Change to new mvp framework - first step
+=======
+ public Widget asWidget() {
+ return this;
+>>>>>>> refactoring.
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
