Author: dongxu
Date: Thu Sep 12 04:21:44 2013
New Revision: 1522336
URL: http://svn.apache.org/r1522336
Log:
fixed issue#11, write a subclass of SplitLayoutPanel to override its onResize
but failed, use the native one, and then refactor some names
Removed:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/AbstractActivityMapper.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.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/mapper/LogoActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopBarActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522336&r1=1522335&r2=1522336&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
Thu Sep 12 04:21:44 2013
@@ -171,8 +171,6 @@ import org.apache.hupa.shared.domain.Mes
import org.apache.hupa.shared.domain.SetFlagAction;
import org.apache.hupa.shared.events.ExpandMessageEvent;
import org.apache.hupa.shared.events.ExpandMessageEventHandler;
-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;
@@ -190,13 +188,18 @@ public class ToolBarActivity extends App
@Inject private Displayable display;
@Inject private MessagesCellTable table;
- protected ImapFolder folder;
+ private String folderName;
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
container.setWidget(display.asWidget());
bindTo(eventBus);
}
+
+ public ToolBarActivity with(String folder){
+ this.folderName = folder;
+ return this;
+ }
<<<<<<< HEAD
@Inject private Displayable display;
@@ -211,13 +214,6 @@ public class ToolBarActivity extends App
display.setParameters(new
Parameters(e.getUser(), null, null, null));
}
});
- eventBus.addHandler(LoadMessagesEvent.TYPE, new
LoadMessagesEventHandler() {
- public void onLoadMessagesEvent(LoadMessagesEvent e) {
- display.disableMessageTools();
- display.setParameters(new
Parameters(e.getUser(), e.getFolder(), null, null));
- folder = e.getFolder();
- }
- });
eventBus.addHandler(ExpandMessageEvent.TYPE, new
ExpandMessageEventHandler() {
public void onExpandMessage(ExpandMessageEvent event) {
display.enableMessageTools();
@@ -257,12 +253,13 @@ public class ToolBarActivity extends App
for (Message msg : table.getVisibleItems()) {
if (table.getSelectionModel().isSelected(msg)) {
uids.add(msg.getUid());
+ table.markRead(msg, read);
}
}
SetFlagRequest req = this.requestFactory.setFlagRequest();
SetFlagAction action = req.create(SetFlagAction.class);
ImapFolder f = req.create(ImapFolder.class);
- f.setFullName(folder.getFullName());
+ f.setFullName(folderName);
action.setFolder(f);
action.setFlag(IMAPFlag.SEEN);
action.setValue(read);
@@ -270,8 +267,7 @@ public class ToolBarActivity extends App
req.set(action).fire(new Receiver<GenericResult>() {
@Override
public void onSuccess(GenericResult response) {
- table.redraw();
- table.onResize();
+ table.refresh();
}
});
}
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=1522336&r1=1522335&r2=1522336&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 04:21:44 2013
@@ -59,6 +59,7 @@ import com.google.inject.Provider;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public class FolderListActivityMapper extends _HupaActivityMapper {
=======
public class FolderListActivityMapper implements ActivityMapper {
@@ -66,6 +67,9 @@ public class FolderListActivityMapper im
=======
public class FolderListActivityMapper extends AbstractActivityMapper {
>>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite,
>>>>>>> don't use contact instead of folders list
+=======
+public class FolderListActivityMapper extends MainActivityMapper {
+>>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its
onResize but failed, use the native one, and then refactor some names
private final Provider<FolderListActivity> folderListActivityProvider;
@Inject
@@ -83,8 +87,12 @@ public class FolderListActivityMapper ex
return null;
=======
@Override
+<<<<<<< HEAD
Activity getAppActivity(final Place place) {
>>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite,
>>>>>>> don't use contact instead of folders list
+=======
+ Activity asyncLoadActivity(final Place place) {
+>>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its
onResize but failed, use the native one, and then refactor some names
return new ActivityAsyncProxy() {
@Override
protected void doAsync(RunAsyncCallback callback) {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LogoActivityMapper.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LogoActivityMapper.java?rev=1522336&r1=1522335&r2=1522336&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LogoActivityMapper.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LogoActivityMapper.java
Thu Sep 12 04:21:44 2013
@@ -42,6 +42,7 @@ import com.google.inject.Provider;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public class LogoActivityMapper extends _HupaActivityMapper {
=======
public class LogoActivityMapper implements ActivityMapper {
@@ -49,6 +50,9 @@ public class LogoActivityMapper implemen
=======
public class LogoActivityMapper extends AbstractActivityMapper {
>>>>>>> try to fix some issues by reorganize the activity mapper and place
>>>>>>> controller
+=======
+public class LogoActivityMapper extends MainActivityMapper {
+>>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its
onResize but failed, use the native one, and then refactor some names
private final Provider<LogoActivity> logoActivityProvider;
@Inject
@@ -79,8 +83,12 @@ public class LogoActivityMapper extends
=======
=======
@Override
+<<<<<<< HEAD
public Activity getAppActivity(Place place) {
>>>>>>> try to fix some issues by reorganize the activity mapper and place
>>>>>>> controller
+=======
+ public Activity asyncLoadActivity(Place place) {
+>>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its
onResize but failed, use the native one, and then refactor some names
return new ActivityAsyncProxy() {
@Override
protected void doAsync(RunAsyncCallback callback) {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java?rev=1522336&r1=1522335&r2=1522336&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java
Thu Sep 12 04:21:44 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.client.mapper;
import org.apache.hupa.client.activity.ToolBarActivity;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.place.FolderPlace;
import org.apache.hupa.client.place.MessagePlace;
import org.apache.hupa.client.place.SettingPlace;
@@ -40,6 +41,11 @@ import com.google.gwt.activity.shared.Ac
<<<<<<< HEAD
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
=======
+=======
+import org.apache.hupa.client.place.MailFolderPlace;
+
+import com.google.gwt.activity.shared.Activity;
+>>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its
onResize but failed, use the native one, and then refactor some names
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.RunAsyncCallback;
>>>>>>> support code split
@@ -48,6 +54,7 @@ import com.google.inject.Inject;
import com.google.inject.Provider;
<<<<<<< HEAD
+<<<<<<< HEAD
public class ToolBarActivityMapper extends _HupaActivityMapper {
private final Provider<ToolBarActivity> toolBarActivityProvider;
@@ -87,12 +94,16 @@ public class ToolBarActivityMapper exten
};
=======
public class ToolBarActivityMapper implements ActivityMapper {
+=======
+public class ToolBarActivityMapper extends MainActivityMapper {
+>>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its
onResize but failed, use the native one, and then refactor some names
private final Provider<ToolBarActivity> toolBarActivityProvider;
@Inject
public ToolBarActivityMapper(Provider<ToolBarActivity>
toolActivityProvider) {
this.toolBarActivityProvider = toolActivityProvider;
}
+<<<<<<< HEAD
public Activity getActivity(Place place) {
<<<<<<< HEAD
@@ -103,6 +114,12 @@ public class ToolBarActivityMapper imple
=======
if(place instanceof DefaultPlace) return null;
>>>>>>> try to fix some issues by reorganize the activity mapper and place
>>>>>>> controller
+=======
+
+ @Override
+ Activity asyncLoadActivity(Place place) {
+ final String token = ((MailFolderPlace)place).getFullName();
+>>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its
onResize but failed, use the native one, and then refactor some names
return new ActivityAsyncProxy() {
@Override
protected void doAsync(RunAsyncCallback callback) {
@@ -111,7 +128,7 @@ public class ToolBarActivityMapper imple
@Override
protected Activity createInstance() {
- return toolBarActivityProvider.get();
+ return
toolBarActivityProvider.get().with(token);
}
};
>>>>>>> support code split
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopBarActivityMapper.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopBarActivityMapper.java?rev=1522336&r1=1522335&r2=1522336&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopBarActivityMapper.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/TopBarActivityMapper.java
Thu Sep 12 04:21:44 2013
@@ -42,6 +42,7 @@ import com.google.inject.Provider;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public class TopBarActivityMapper extends _HupaActivityMapper {
=======
public class TopBarActivityMapper implements ActivityMapper {
@@ -49,6 +50,9 @@ public class TopBarActivityMapper implem
=======
public class TopBarActivityMapper extends AbstractActivityMapper {
>>>>>>> try to fix some issues by reorganize the activity mapper and place
>>>>>>> controller
+=======
+public class TopBarActivityMapper extends MainActivityMapper {
+>>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its
onResize but failed, use the native one, and then refactor some names
private final Provider<TopBarActivity> topBarActivityProvider;
@Inject
@@ -80,11 +84,15 @@ public class TopBarActivityMapper extend
=======
@Override
<<<<<<< HEAD
+<<<<<<< HEAD
Activity getAppActivity(Place place) {
>>>>>>> try to fix some issues by reorganize the activity mapper and place
>>>>>>> controller
=======
Activity getAppActivity(final Place place) {
>>>>>>> fixed issue#46 and issue#32
+=======
+ Activity asyncLoadActivity(final Place place) {
+>>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its
onResize but failed, use the native one, and then refactor some names
return new ActivityAsyncProxy() {
@Override
protected void doAsync(RunAsyncCallback callback) {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java?rev=1522336&r1=1522335&r2=1522336&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
Thu Sep 12 04:21:44 2013
@@ -636,6 +636,7 @@ public class MessagesCellTable extends D
return row.getFlags().contains(IMAPFlag.SEEN);
}
public void markRead(final Message message, final boolean read) {
+
setRowStyles(new RowStyles<Message>() {
@Override
public String getStyleNames(Message row, int rowIndex) {
@@ -646,7 +647,7 @@ public class MessagesCellTable extends D
}
}
});
- redraw();
+ flush();
}
public class CheckboxColumn extends Column<Message, Boolean> {
@@ -714,5 +715,11 @@ public class MessagesCellTable extends D
}
}
+ public void refresh() {
+ redraw();
+ onResize();
+ flush();
+ }
+
}
>>>>>>> fix some bugs related to RF, and try to use new CellView to replace
>>>>>>> gwt-incubator
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
