Author: dongxu
Date: Thu Sep 12 04:26:28 2013
New Revision: 1522347
URL: http://svn.apache.org/r1522347
Log:
upgrade maven-processor-plugin to the latest 2.2.4; change the middle-man in
MessageListActivityMapper to string instead of the whole MessageFolderPlace
Modified:
james/hupa/trunk/client/pom.xml
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/MessageListActivity.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/mapper/ComposeActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
Modified: james/hupa/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1522347&r1=1522346&r2=1522347&view=diff
==============================================================================
--- james/hupa/trunk/client/pom.xml (original)
+++ james/hupa/trunk/client/pom.xml Thu Sep 12 04:26:28 2013
@@ -327,7 +327,7 @@
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
- <version>2.0.5</version>
+ <version>2.2.4</version>
<executions>
<execution>
<id>process</id>
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=1522347&r1=1522346&r2=1522347&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:26:28 2013
@@ -334,11 +334,11 @@ public class HupaController {
Place place = event.getNewPlace();
if (place instanceof ComposePlace) {
- if (((ComposePlace) place).getParameters() != null) {
+// if (((ComposePlace) place).getParameters() != null) {
hupaLayout.switchToCompose();
- } else {
- this.placeController.goTo(new
MailFolderPlace("Mock-Inbox"));
- }
+// } else {
+// this.placeController.goTo(new
MailFolderPlace("Mock-Inbox"));
+// }
} else {
hupaLayout.switchToMessage();
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522347&r1=1522346&r2=1522347&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
Thu Sep 12 04:26:28 2013
@@ -301,7 +301,7 @@ public class MessageListActivity extends
@Inject private PlaceController placeController;
@Inject private ToolBarActivity.Displayable toolBar;
@Inject private TopBarActivity.Displayable topBar;
- private ImapFolder folder;
+ private String folderName;
private String searchValue;
private User user;
private boolean pending;
@@ -318,13 +318,13 @@ public class MessageListActivity extends
GetMessageDetailsRequest req =
requestFactory.messageDetailsRequest();
GetMessageDetailsAction action =
req.create(GetMessageDetailsAction.class);
final ImapFolder f =
req.create(ImapFolder.class);
- f.setFullName(folder.getFullName());
+ f.setFullName(folderName);
action.setFolder(f);
action.setUid(event.getValue().getUid());
req.get(action).fire(new
Receiver<GetMessageDetailsResult>() {
@Override
public void
onSuccess(GetMessageDetailsResult response) {
- eventBus.fireEvent(new
ExpandMessageEvent(user, folder, event.getValue(), response
+ eventBus.fireEvent(new
ExpandMessageEvent(user, new ImapFolderImpl(folderName), event.getValue(),
response
.getMessageDetails()));
placeController.goTo(new MailFolderPlace(f.getFullName() + "/" +
event.getValue().getUid()));
}
@@ -368,7 +368,7 @@ public class MessageListActivity extends
FetchMessagesRequest req = requestFactory.messagesRequest();
FetchMessagesAction action =
req.create(FetchMessagesAction.class);
final ImapFolder f = req.create(ImapFolder.class);
- f.setFullName(folder.getFullName());
+ f.setFullName(folderName);
action.setFolder(f);
action.setOffset(display.getGrid().getPageSize());
action.setSearchString(searchValue);
@@ -404,7 +404,7 @@ public class MessageListActivity extends
eventBus.addHandler(LoadMessagesEvent.TYPE, new
LoadMessagesEventHandler() {
public void onLoadMessagesEvent(LoadMessagesEvent
loadMessagesEvent) {
user = loadMessagesEvent.getUser();
- folder = loadMessagesEvent.getFolder();
+ folderName =
loadMessagesEvent.getFolder().getFullName();
searchValue =
loadMessagesEvent.getSearchValue();
fetch(0);
@@ -413,8 +413,8 @@ public class MessageListActivity extends
}
- public MessageListActivity with(MailFolderPlace place) {
- setFolder(new ImapFolderImpl(place.getFullName()));
+ public MessageListActivity with(String folderName) {
+ this.folderName = folderName;
return this;
}
@@ -443,10 +443,6 @@ public class MessageListActivity extends
Set<Message> getSelectedMessages();
}
- public void setFolder(ImapFolder folder) {
- this.folder = folder;
- }
-
private void antiSelectMessages(Collection<Message> c) {
for (Message msg : c) {
display.getGrid().getSelectionModel().setSelected(msg,
false);
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=1522347&r1=1522346&r2=1522347&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 04:26:28 2013
@@ -19,8 +19,6 @@
package org.apache.hupa.client.evo;
-import org.apache.hupa.client.ioc.AppGinjector;
-
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.GWT.UncaughtExceptionHandler;
@@ -32,8 +30,8 @@ public class HupaEvo implements EntryPoi
public void onModuleLoad() {
handleExceptionsAsync();
replaceLoading();
- AppController appController = null;//injector.getAppController();
- appController.start();
+// AppController appController = null;//injector.getAppController();
+// appController.start();
}
private void handleExceptionsAsync(){
@@ -48,6 +46,6 @@ public class HupaEvo implements EntryPoi
DOM.removeChild(RootPanel.getBodyElement(),
DOM.getElementById("loading"));
}
- private final AppGinjector injector = GWT.create(AppGinjector.class);
+// private final AppGinjector injector = GWT.create(AppGinjector.class);
}
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=1522347&r1=1522346&r2=1522347&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:26:28 2013
@@ -21,8 +21,6 @@ package org.apache.hupa.client.mapper;
import org.apache.hupa.client.activity.ComposeActivity;
import org.apache.hupa.client.place.ComposePlace;
-import org.apache.hupa.client.place.DefaultPlace;
-import org.apache.hupa.client.place.MailFolderPlace;
import com.google.gwt.activity.shared.Activity;
import com.google.gwt.activity.shared.ActivityMapper;
@@ -47,7 +45,7 @@ public class ComposeActivityMapper imple
if (!(place instanceof ComposePlace))
return null;
final ComposePlace composePlace = (ComposePlace)place;
- if(composePlace.getParameters() == null) return null;
+// if(composePlace.getParameters() == null) return null;
// if(composePlace.getParameters() == null){
// placeController.goTo(new MailFolderPlace("Mock-Inbox"));
// }
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java?rev=1522347&r1=1522346&r2=1522347&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MainContentActivityMapper.java
Thu Sep 12 04:26:28 2013
@@ -20,7 +20,6 @@
package org.apache.hupa.client.mapper;
import org.apache.hupa.client.activity.IMAPMessageActivity;
-import org.apache.hupa.client.activity.IMAPMessageListActivity;
import org.apache.hupa.client.activity.LoginActivity;
import org.apache.hupa.client.activity.MessageSendActivity;
import org.apache.hupa.client.place.DefaultPlace;
@@ -37,14 +36,13 @@ import com.google.inject.Provider;
public class MainContentActivityMapper implements ActivityMapper {
private final Provider<LoginActivity> loginActivityProvider;
- private final Provider<IMAPMessageListActivity>
messageListActivityProvider;
private final Provider<MessageSendActivity> messageSendActivityProvider;
private final Provider<IMAPMessageActivity> messageActivityProvider;
@Inject
- public MainContentActivityMapper(Provider<IMAPMessageListActivity>
messageListActivityProvider,
- Provider<LoginActivity>
loginActivityProvider,Provider<MessageSendActivity>
messageSendActivityProvider,Provider<IMAPMessageActivity>
messageActivityProvider) {
- this.messageListActivityProvider = messageListActivityProvider;
+ public MainContentActivityMapper(Provider<LoginActivity>
loginActivityProvider,
+ Provider<MessageSendActivity>
messageSendActivityProvider,
+ Provider<IMAPMessageActivity> messageActivityProvider) {
this.loginActivityProvider = loginActivityProvider;
this.messageSendActivityProvider = messageSendActivityProvider;
this.messageActivityProvider = messageActivityProvider;
@@ -52,13 +50,14 @@ public class MainContentActivityMapper i
public Activity getActivity(Place place) {
if (place instanceof MailFolderPlace) {
-// return
messageListActivityProvider.get().with((MailFolderPlace)place);
+ // return
+ //
messageListActivityProvider.get().with((MailFolderPlace)place);
} else if (place instanceof DefaultPlace) {
return loginActivityProvider.get();
- } else if(place instanceof MessageSendPlace){
- return
messageSendActivityProvider.get().with((MessageSendPlace)place);
- } else if(place instanceof IMAPMessagePlace){
- return
messageActivityProvider.get().with((IMAPMessagePlace)place);
+ } else if (place instanceof MessageSendPlace) {
+ return
messageSendActivityProvider.get().with((MessageSendPlace) place);
+ } else if (place instanceof IMAPMessagePlace) {
+ return
messageActivityProvider.get().with((IMAPMessagePlace) place);
}
return null;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java?rev=1522347&r1=1522346&r2=1522347&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListActivityMapper.java
Thu Sep 12 04:26:28 2013
@@ -57,8 +57,7 @@ public class MessageListActivityMapper i
private final Provider<MessageListActivity> messageListActivityProvider;
@Inject
- public MessageListActivityMapper(
- Provider<MessageListActivity>
messageListActivityProvider) {
+ public MessageListActivityMapper(Provider<MessageListActivity>
messageListActivityProvider) {
this.messageListActivityProvider = messageListActivityProvider;
}
@@ -104,8 +103,7 @@ public class MessageListActivityMapper i
@Override
protected Activity createInstance() {
- return
messageListActivityProvider.get().with(
- (MailFolderPlace)
place);
+ return
messageListActivityProvider.get().with(((MailFolderPlace) place).getFullName());
}
};
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java?rev=1522347&r1=1522346&r2=1522347&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
Thu Sep 12 04:26:28 2013
@@ -103,10 +103,10 @@ public class IMAPMessagePlace extends Ab
private ImapFolder folder;
>>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can
>>>>>>> display folders in west view with RequestFactory now.
private User user;
- private String messageId;
+// private String messageId;
public IMAPMessagePlace(String token) {
- this.messageId = token;
+// this.messageId = token;
}
public IMAPMessagePlace(MessageDetails messageDetails){
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java?rev=1522347&r1=1522346&r2=1522347&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java
Thu Sep 12 04:26:28 2013
@@ -25,12 +25,15 @@ import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.CssResource;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import com.google.gwt.safehtml.shared.SafeHtml;
>>>>>>> add loading and notification bar(finishing the folder list click
>>>>>>> event), related to the issue#18
=======
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
>>>>>>> make the notification be able to cope with link
+=======
+>>>>>>> upgrade maven-processor-plugin to the latest 2.2.4; change the
middle-man in MessageListActivityMapper to string instead of the whole
MessageFolderPlace
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Composite;
Modified:
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java?rev=1522347&r1=1522346&r2=1522347&view=diff
==============================================================================
---
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
(original)
+++
james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
Thu Sep 12 04:26:28 2013
@@ -150,6 +150,7 @@ public class MockUploader implements IUp
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public void setValidExtensions(String... ext) {
=======
public void setValidExtensions(String[] ext) {
@@ -157,6 +158,9 @@ public class MockUploader implements IUp
=======
public void setValidExtensions(String[] ext) {
>>>>>>> first commit
+=======
+ public void setValidExtensions(String... ext) {
+>>>>>>> upgrade maven-processor-plugin to the latest 2.2.4; change the
middle-man in MessageListActivityMapper to string instead of the whole
MessageFolderPlace
// TODO Auto-generated method stub
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
