Author: dongxu
Date: Thu Sep 12 03:45:01 2013
New Revision: 1522242
URL: http://svn.apache.org/r1522242
Log:
make folder list panel work as expected
Removed:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersCellTree.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.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/LoginActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java?rev=1522242&r1=1522241&r2=1522242&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
Thu Sep 12 03:45:01 2013
@@ -487,6 +487,7 @@ public class LoginActivity extends Abstr
public void onSuccess(User response) {
RootLayoutPanel.get().clear();
RootLayoutPanel.get().add(hupaLayout.get());
+ placeController.goTo(new MailFolderPlace());
// placeController.goTo(new
MailFolderPlace().with(response, useDefaultInboxFolder(response), null));
// eventBus.fireEvent(new LoginEvent(response));
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java?rev=1522242&r1=1522241&r2=1522242&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java
Thu Sep 12 03:45:01 2013
@@ -21,12 +21,17 @@ package org.apache.hupa.client.mapper;
import org.apache.hupa.client.activity.FolderListActivity;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.place.SettingPlace;
import com.google.gwt.activity.shared.Activity;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.RunAsyncCallback;
=======
+=======
+import org.apache.hupa.client.place.DefaultPlace;
+import org.apache.hupa.client.place.MailFolderPlace;
+>>>>>>> make folder list panel work as expected
import com.google.gwt.activity.shared.Activity;
import com.google.gwt.activity.shared.ActivityMapper;
@@ -66,6 +71,8 @@ public class FolderListActivityMapper im
=======
public Activity getActivity(Place place) {
+ if(place instanceof DefaultPlace)return null;
+ else if (place instanceof MailFolderPlace)
folderListActivityProvider.get();
return folderListActivityProvider.get();
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
}
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=1522242&r1=1522241&r2=1522242&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 03:45:01 2013
@@ -92,20 +92,15 @@ public class FoldersTreeViewModel implem
ImapFolder folder;
@Override
- public void addDataDisplay(HasData<ImapFolder> display) {
- super.addDataDisplay(display);
- }
-
- @Override
- protected void onRangeChanged(HasData<ImapFolder> display)
{//TODO how to deal with init, here folder should be inject from some place
rather null
+ protected void onRangeChanged(HasData<ImapFolder> display) {
+ System.out.println(display.getVisibleItemCount() +
"---"
+display.getRowCount()+"="+display.getVisibleItems()+"="+display.getVisibleRange());
rf.fetchFoldersRequest().fetch(folder).fire(new
Receiver<List<ImapFolder>>() {
@Override
public void onSuccess(List<ImapFolder>
response) {
if (response == null || response.size()
== 0) {
updateRowCount(-1, true);
- } else{
+ } else
updateRowData(0, response);
- }
}
});
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=1522242&r1=1522241&r2=1522242&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:45:01 2013
@@ -47,6 +47,7 @@ public class WestView extends Composite
protected User user;
private CellTree cellTree;
+<<<<<<< HEAD
@Inject
public WestView(final EventBus eventBus) {
@@ -184,9 +185,11 @@ public class WestView extends Composite
protected User user;
private FoldersCellTree cellTree;
>>>>>>> refactoring.
+=======
+>>>>>>> make folder list panel work as expected
@Inject
- public WestView(final FoldersTreeViewModel viewModel, final EventBus
eventBus) {
+ public WestView(final EventBus eventBus) {
selectionModel.addSelectionChangeHandler(new
SelectionChangeEvent.Handler() {
@SuppressWarnings("unchecked")
@Override
@@ -781,7 +784,7 @@ public class WestView extends Composite
// viewModel.setSelectionModel(selectionModel);
CellTree.Resources res =
GWT.create(CellTree.BasicResources.class);
-// cellTree = new FoldersCellTree(viewModel, res);
+ cellTree = new CellTree(null, res);
cellTree.setAnimationEnabled(true);
initWidget(cellTree);
>>>>>>> refactoring.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
