Author: dongxu
Date: Thu Sep 12 03:44:35 2013
New Revision: 1522241
URL: http://svn.apache.org/r1522241
Log:
track the folder list tree model issue of invalid session, TODO how to retrieve
folders data using GIN
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.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/evo/HupaEvo.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/ioc/AppGinjector.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
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/HupaLayout.ui.xml
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522241&r1=1522240&r2=1522241&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
Thu Sep 12 03:44:35 2013
@@ -331,18 +331,16 @@ public class HupaController {
checkSession.isValid().fire(new Receiver<Boolean>() {
@Override
public void onSuccess(Boolean sessionValid) {
- // RootLayoutPanel.get().clear();
- // RootLayoutPanel.get().add(hupaLayout.get());
if (!sessionValid) {
-
RootLayoutPanel.get().clear();
-
RootLayoutPanel.get().add(loginLayout.get());//
- HupaController.this.placeController
- .goTo(new
DefaultPlace());
+
RootLayoutPanel.get().add(loginLayout.get());
+ log.fine("session invalid");
+// HupaController.this.placeController
+// .goTo(new
DefaultPlace());
} else {
RootLayoutPanel.get().clear();
-
RootLayoutPanel.get().add(hupaLayout.get());//
+
RootLayoutPanel.get().add(hupaLayout.get());
}
}
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=1522241&r1=1522240&r2=1522241&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 03:44:35 2013
@@ -32,13 +32,7 @@ import com.google.inject.name.Named;
public class ActivityManagerInitializer {
@Inject
- public ActivityManagerInitializer(AppLayout appPanelView,
- @Named("TopRegion") ActivityManager topActivityManager,
- @Named("WestRegion") ActivityManager
westActivityManager,
- @Named("MainContentRegion") ActivityManager
mainContentActivityManager) {
- topActivityManager.setDisplay(appPanelView.getNorthContainer());
- westActivityManager.setDisplay(appPanelView.getWestContainer());
-
mainContentActivityManager.setDisplay(appPanelView.getCenterContainer());
+ public ActivityManagerInitializer(AppLayout appPanelView) {
}
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java?rev=1522241&r1=1522240&r2=1522241&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java
Thu Sep 12 03:44:35 2013
@@ -32,7 +32,7 @@ public class HupaEvo implements EntryPoi
public void onModuleLoad() {
handleExceptionsAsync();
replaceLoading();
- AppController appController = injector.getAppController();
+ AppController appController = null;//injector.getAppController();
appController.start();
}
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=1522241&r1=1522240&r2=1522241&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:44:35 2013
@@ -658,8 +658,12 @@ public class AppGinModule extends Abstra
StatusActivityMapper activityMapper, EventBus eventBus)
{
return new ActivityManager(activityMapper, eventBus);
}
+<<<<<<< HEAD
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
+=======
+/*
+>>>>>>> track the folder list tree model issue of invalid session, TODO how to
retrieve folders data using GIN
@Provides
@Singleton
@Named("TopRegion")
@@ -785,6 +789,7 @@ public class AppGinModule extends Abstra
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
return new ActivityManager(activityMapper, eventBus);
}
+<<<<<<< HEAD
<<<<<<< HEAD
// @Provides
@@ -797,6 +802,9 @@ public class AppGinModule extends Abstra
=======
>>>>>>> add SuppressWarnings("depraction")
+=======
+*/
+>>>>>>> track the folder list tree model issue of invalid session, TODO how to
retrieve folders data using GIN
@Provides
@Singleton
public PlaceController getPlaceController(EventBus eventBus) {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java?rev=1522241&r1=1522240&r2=1522241&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinjector.java
Thu Sep 12 03:44:35 2013
@@ -62,6 +62,7 @@ import com.google.gwt.inject.client.Ginj
public interface AppGinjector extends Ginjector {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
// AppController getAppController();
HupaController getHupaController();
=======
@@ -72,6 +73,9 @@ public interface AppGinjector extends Gi
<<<<<<< HEAD
>>>>>>> Change to new mvp framework - first step
=======
+=======
+// AppController getAppController();
+>>>>>>> track the folder list tree model issue of invalid session, TODO how to
retrieve folders data using GIN
HupaController getHupaController();
>>>>>>> move new theme ui from experiment to hupa evo
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522241&r1=1522240&r2=1522241&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
Thu Sep 12 03:44:35 2013
@@ -224,12 +224,12 @@ import com.google.inject.Inject;
public class FolderListView extends Composite implements
FolderListActivity.Displayable {
@UiField(provided = true)
- FoldersCellTree cellTree;
+ CellTree cellTree;
@Inject
public FolderListView(final FoldersTreeViewModel viewModel, final
EventBus eventBus) {
CellTree.Resources res =
GWT.create(CellTree.BasicResources.class);
- cellTree = new FoldersCellTree(viewModel, res);
+ cellTree = new CellTree(viewModel, null, res);
cellTree.setAnimationEnabled(true);
initWidget(binder.createAndBindUi(this));
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml?rev=1522241&r1=1522240&r2=1522241&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.ui.xml
Thu Sep 12 03:44:35 2013
@@ -17,10 +17,15 @@
=======
=======
xmlns:g='urn:import:com.google.gwt.user.client.ui'
+<<<<<<< HEAD
xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
>>>>>>> make folder list in west panel partly work
+=======
+ xmlns:hupa='urn:import:org.apache.hupa.client.ui'
+ xmlns:c='urn:import:com.google.gwt.user.cellview.client'>
+>>>>>>> track the folder list tree model issue of invalid session, TODO how to
retrieve folders data using GIN
<g:SimplePanel ui:field="FolderListView">
- <hupa:FoldersCellTree ui:field="cellTree"/>
+ <c:CellTree ui:field="cellTree"/>
</g:SimplePanel>
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
</ui:UiBinder>
\ No newline at end of file
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=1522241&r1=1522240&r2=1522241&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:44:35 2013
@@ -97,8 +97,7 @@ public class FoldersTreeViewModel implem
}
@Override
- protected void onRangeChanged(HasData<ImapFolder> display) {
- System.out.print(rf == null);
+ protected void onRangeChanged(HasData<ImapFolder> display)
{//TODO how to deal with init, here folder should be inject from some place
rather null
rf.fetchFoldersRequest().fetch(folder).fire(new
Receiver<List<ImapFolder>>() {
@Override
public void onSuccess(List<ImapFolder>
response) {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522241&r1=1522240&r2=1522241&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
Thu Sep 12 03:44:35 2013
@@ -116,6 +116,7 @@
<g:layer width="177px"
left="10px">
<g:SimplePanel
ui:field="logoContainer"/>
</g:layer>
+<<<<<<< HEAD
<g:layer width="301px"
right="0">
<<<<<<< HEAD
<<<<<<< HEAD
@@ -149,6 +150,9 @@
</g:SimplePanel>
>>>>>>> remove some warnings and create the AbstractPlace that can give place
>>>>>>> infomation
=======
+=======
+ <g:layer width="287px"
right="0">
+>>>>>>> track the folder list tree model issue of invalid session, TODO how to
retrieve folders data using GIN
<g:LayoutPanel
ui:field="navigationContainer"/><!-- why can not be SimplePanel here -->
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
</g:layer>
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java?rev=1522241&r1=1522240&r2=1522241&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/AbstractService.java
Thu Sep 12 03:44:35 2013
@@ -92,7 +92,7 @@ public abstract class AbstractService {
>>>>>>> fix issue 5,6,8:
=======
if (user == null) {
- throw new InvalidSessionException("User not found in session with
id " + httpSessionProvider.get().getId());
+ throw new InvalidSessionException(getClass()+"User not found in
session with id " + httpSessionProvider.get().getId());
} else {
return user;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
