Author: dongxu
Date: Thu Sep 12 04:19:47 2013
New Revision: 1522331
URL: http://svn.apache.org/r1522331
Log:
fixed issue#32
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/activity/ComposeActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.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/_CenterPanel.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=1522331&r1=1522330&r2=1522331&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 04:19:47 2013
@@ -309,7 +309,7 @@ public class HupaController {
if(((ComposePlace)place).getParameters() != null){
hupaLayout.switchToCompose();
}else{
- this.placeController.goTo(new
DefaultPlace("@"));
+ this.placeController.goTo(new
MailFolderPlace("Mock-Inbox"));
}
} else {
hupaLayout.switchToMessage();
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522331&r1=1522330&r2=1522331&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
Thu Sep 12 04:19:47 2013
@@ -433,9 +433,6 @@ public class ComposeActivity extends App
@Override
public void onStop(){
super.onStop();
- if(!noContent()){
- placeController.goTo(new DefaultPlace("@"));
- }
}
private boolean noContent() {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.java?rev=1522331&r1=1522330&r2=1522331&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ComposeActivityMapper.java
Thu Sep 12 04:19:47 2013
@@ -46,21 +46,21 @@ public class ComposeActivityMapper imple
public Activity getActivity(final Place place) {
if (!(place instanceof ComposePlace))
return null;
- return composeActivityProvider.get().with((ComposePlace)place);
-// return new ActivityAsyncProxy() {
-// @Override
-// protected void doAsync(RunAsyncCallback callback) {
-// GWT.runAsync(callback);
-// }
-//
-// @Override
-// protected Activity createInstance() {
-// ComposePlace composePlace = (ComposePlace)
place;
-// if (composePlace.getParameters() == null) {
-// placeController.goTo(new
MailFolderPlace(""));
-// }
-// return
composeActivityProvider.get().with(composePlace);
-// }
-// };
+ final ComposePlace composePlace = (ComposePlace)place;
+ if(composePlace.getParameters() == null) return null;
+// if(composePlace.getParameters() == null){
+// placeController.goTo(new MailFolderPlace("Mock-Inbox"));
+// }
+ return new ActivityAsyncProxy() {
+ @Override
+ protected void doAsync(RunAsyncCallback callback) {
+ GWT.runAsync(callback);
+ }
+
+ @Override
+ protected Activity createInstance() {
+ return
composeActivityProvider.get().with(composePlace);
+ }
+ };
}
}
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=1522331&r1=1522330&r2=1522331&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 04:19:47 2013
@@ -246,21 +246,22 @@ public class FolderListView extends Comp
public FolderListView(final FoldersTreeViewModel viewModel,
final EventBus eventBus, @Assisted Place place) {
initWidget(binder.createAndBindUi(this));
- if (place instanceof ComposePlace) {
- contactPanel = new HTMLPanel("contacts list");
- if (thisView.getWidget() != null
- && thisView.getWidget() instanceof
CellTree) {
- thisView.remove(cellTree);
- }
- thisView.add(contactPanel);
- } else {
+// if (place instanceof ComposePlace) {
+// contactPanel = new HTMLPanel("contacts list");
+// if (thisView.getWidget() != null
+// && thisView.getWidget() instanceof
CellTree) {
+// thisView.remove(cellTree);
+// }
+// thisView.add(contactPanel);
+// } else {
cellTree = new RightCellTree(viewModel);
cellTree.setAnimationEnabled(true);
- if (thisView.getWidget() != null
- && thisView.getWidget() instanceof
HTMLPanel) {
- thisView.remove(contactPanel);
- }
+// if (thisView.getWidget() != null
+// && thisView.getWidget() instanceof
HTMLPanel) {
+// thisView.remove(contactPanel);
+// }
thisView.add(cellTree);
+<<<<<<< HEAD
}
<<<<<<< HEAD
cellTree.setAnimationEnabled(true);
@@ -268,6 +269,9 @@ public class FolderListView extends Comp
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
=======
>>>>>>> make compose panel left another widget rather than cell tree
+=======
+// }
+>>>>>>> fixed issue#32
}
interface FolderListUiBinder extends UiBinder<SimplePanel,
FolderListView> {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java?rev=1522331&r1=1522330&r2=1522331&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java
Thu Sep 12 04:19:47 2013
@@ -68,7 +68,7 @@ public class _CenterPanel extends Compos
// TODO make it display to remove this method and the corresponding code
public void temporarilyHiddenTheUnimplementedContactPanel(boolean
hidden) {
- thisPanel.setWidgetHidden(outlinePanel, hidden);
+// thisPanel.setWidgetHidden(outlinePanel, hidden);
}
public AcceptsOneWidget getFolderListView() {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
