Author: dongxu
Date: Thu Sep 12 03:55:24 2013
New Revision: 1522273
URL: http://svn.apache.org/r1522273
Log:
make reload mail folder place work, fixed issue #7
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java
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/activity/TopBarActivity.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/mapper/AppPlaceHistoryMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.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/MessageListView.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java?rev=1522273&r1=1522272&r2=1522273&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java
Thu Sep 12 03:55:24 2013
@@ -37,6 +37,7 @@ import com.google.inject.Inject;
public class FolderListActivity extends AppBaseActivity {
<<<<<<< HEAD
+<<<<<<< HEAD
@Inject private Displayable display;
@Override
@@ -59,13 +60,22 @@ public class FolderListActivity extends
void refresh();
}
=======
+=======
+ @Inject private Displayable display;
+
+>>>>>>> make reload mail folder place work, fixed issue #7
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
container.setWidget(display.asWidget());
}
+<<<<<<< HEAD
@Inject private Displayable display;
public interface Displayable extends WidgetDisplayable {}
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
+=======
+ public interface Displayable extends WidgetDisplayable {
+ }
+>>>>>>> make reload mail folder place work, fixed issue #7
}
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=1522273&r1=1522272&r2=1522273&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:55:24 2013
@@ -488,7 +488,6 @@ public class LoginActivity extends Abstr
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));
}
@Override
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java?rev=1522273&r1=1522272&r2=1522273&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
Thu Sep 12 03:55:24 2013
@@ -154,6 +154,7 @@ import com.google.gwt.user.client.ui.HTM
import com.google.gwt.user.client.ui.RootLayoutPanel;
import com.google.inject.Inject;
import com.google.web.bindery.requestfactory.shared.Receiver;
+import com.google.web.bindery.requestfactory.shared.ServerFailure;
public class TopBarActivity extends AppBaseActivity {
@@ -197,7 +198,16 @@ public class TopBarActivity extends AppB
eventBus.fireEvent(new
LogoutEvent(response.getUser()));
RootLayoutPanel.get().clear();
RootLayoutPanel.get().add(loginLayout.get());
-
TopBarActivity.this.placeController.goTo(new DefaultPlace());
+ TopBarActivity.this.placeController
+ .goTo(new
DefaultPlace());
+ }
+
+ @Override
+ public void onFailure(ServerFailure error) {
+ RootLayoutPanel.get().clear();
+
RootLayoutPanel.get().add(loginLayout.get());
+ TopBarActivity.this.placeController
+ .goTo(new
DefaultPlace());
}
});
}
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=1522273&r1=1522272&r2=1522273&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:55:24 2013
@@ -1342,7 +1342,7 @@ System.out.println("1111111"+response);
this.searchValue = searchValue;
// FIXME goto?
- placeController.goTo(new MailFolderPlace().with(user, folder,
searchValue));
+// placeController.goTo(new MailFolderPlace().with(user, folder,
searchValue));
}
<<<<<<< HEAD
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java?rev=1522273&r1=1522272&r2=1522273&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AppPlaceHistoryMapper.java
Thu Sep 12 03:55:24 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.client.mapper;
import org.apache.hupa.client.place.DefaultPlace;
import org.apache.hupa.client.place.IMAPMessagePlace;
import org.apache.hupa.client.place.MailFolderPlace;
+import org.apache.hupa.client.place.MessagePlace;
import org.apache.hupa.client.place.MessageSendPlace;
import com.google.gwt.place.shared.PlaceHistoryMapper;
@@ -29,6 +30,7 @@ import com.google.gwt.place.shared.WithT
@WithTokenizers({
DefaultPlace.Tokenizer.class,
+ MessagePlace.Tokenizer.class,
MailFolderPlace.Tokenizer.class,
MessageSendPlace.Tokenizer.class,
IMAPMessagePlace.Tokenizer.class
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java?rev=1522273&r1=1522272&r2=1522273&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java
Thu Sep 12 03:55:24 2013
@@ -35,7 +35,11 @@ public class AbstractPlace extends Place
}
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> remove some warnings and create the AbstractPlace that can give place
>>>>>>> infomation
+=======
+
+>>>>>>> make reload mail folder place work, fixed issue #7
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java?rev=1522273&r1=1522272&r2=1522273&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java
Thu Sep 12 03:55:24 2013
@@ -68,7 +68,7 @@ import com.google.gwt.place.shared.Prefi
public class DefaultPlace extends AbstractPlace {
- @Prefix("")
+ @Prefix("!")
public static class Tokenizer implements PlaceTokenizer<DefaultPlace> {
@Override
@@ -78,7 +78,7 @@ public class DefaultPlace extends Abstra
@Override
public String getToken(DefaultPlace place) {
- return "";
+ return "login";
}
}
<<<<<<< HEAD
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java?rev=1522273&r1=1522272&r2=1522273&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
Thu Sep 12 03:55:24 2013
@@ -19,6 +19,7 @@
package org.apache.hupa.client.place;
+import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
@@ -36,10 +37,6 @@ public class MailFolderPlace extends Abs
return folderName;
}
- public void setFolderName(String folderName) {
- this.folderName = folderName;
- }
-
/**
* equality test based on Class type, to let different instance of this
* Place class to be equals for CachingActivityMapper test on Place
equality
@@ -59,13 +56,10 @@ public class MailFolderPlace extends Abs
return PREFIX.hashCode();
}
- public MailFolderPlace with(User user) {
- this.user = user;
- return this;
- }
-
public MailFolderPlace with(String folderName) {
this.folderName = folderName;
+ this.folder = new ImapFolderImpl();
+ folder.setFullName(folderName);
return this;
}
@@ -104,12 +98,4 @@ public class MailFolderPlace extends Abs
public String getSearchValue() {
return searchValue;
}
-
- public MailFolderPlace with(User user, ImapFolder folder, String
searchValue) {
- this.folder = folder;
- this.searchValue = searchValue;
- this.user = user;
- this.folderName = folder.getName();
- return this;
- }
}
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=1522273&r1=1522272&r2=1522273&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:55:24 2013
@@ -48,9 +48,9 @@ import com.google.web.bindery.requestfac
public class FoldersTreeViewModel implements TreeViewModel {
- @Inject protected HupaRequestFactory rf;
- @Inject protected EventBus eventBus;
- @Inject protected PlaceController placeController;
+ @Inject private HupaRequestFactory rf;
+ @Inject private EventBus eventBus;
+ @Inject private PlaceController placeController;
@Inject private Provider<MailFolderPlace> folderPlaceProvider;
protected User user;
@@ -102,20 +102,20 @@ public class FoldersTreeViewModel implem
ImapFolder value, NativeEvent event,
ValueUpdater<ImapFolder> valueUpdater) {
eventBus.fireEvent(new LoadMessagesEvent(user,
value));
-
placeController.goTo(folderPlaceProvider.get().with(value.getName()));
+
placeController.goTo(folderPlaceProvider.get().with(
+ value.getName()));
}
}, selectionModel, null);
}
- private class ImapFolderListDataProvider extends
- AsyncDataProvider<ImapFolder> {
+ class ImapFolderListDataProvider extends AsyncDataProvider<ImapFolder> {
+
+ private ImapFolder folder;
public ImapFolderListDataProvider(ImapFolder folder) {
this.folder = folder;
}
- ImapFolder folder;
-
@Override
public void addDataDisplay(HasData<ImapFolder> display) {
super.addDataDisplay(display);
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java?rev=1522273&r1=1522272&r2=1522273&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
Thu Sep 12 03:55:24 2013
@@ -173,13 +173,13 @@ public class MessageListView extends Com
FetchMessagesAction action = messagesRequest
.create(FetchMessagesAction.class);
final ImapFolder folder1 =
messagesRequest.create(ImapFolder.class);
- folder1.setChildren(folder.getChildren());
- folder1.setDelimiter(folder.getDelimiter());
+ // folder1.setChildren(folder.getChildren());
+ // folder1.setDelimiter(folder.getDelimiter());
folder1.setFullName(folder.getFullName());
- folder1.setMessageCount(folder.getMessageCount());
- folder1.setName(folder.getName());
- folder1.setSubscribed(folder.getSubscribed());
- folder1.setUnseenMessageCount(folder.getUnseenMessageCount());
+ // folder1.setMessageCount(folder.getMessageCount());
+ // folder1.setName(folder.getName());
+ // folder1.setSubscribed(folder.getSubscribed());
+ //
folder1.setUnseenMessageCount(folder.getUnseenMessageCount());
action.setFolder(folder1);
action.setOffset(grid.getPageSize());
action.setSearchString(searchValue);
@@ -286,6 +286,8 @@ public class MessageListView extends Com
@Override
public void setFolder(ImapFolder folder) {
this.folder = folder;
+ if (folder != null)
+ fetch(0);
}
>>>>>>> prepare for place management and history controller
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
