Author: dongxu
Date: Thu Sep 12 04:53:54 2013
New Revision: 1522411
URL: http://svn.apache.org/r1522411
Log:
fixed issue#84, actually, in evo, there has been several deprecated classed,
include WestActivity, which is replaced by FolderListActivity
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/activity/MessageContentActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.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=1522411&r1=1522410&r2=1522411&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:53:54 2013
@@ -362,7 +362,7 @@ public class HupaController {
hupaLayout.switchTo(HupaLayout.LAYOUT_COMPOSE);
} else {
//FIXME when gmail mode
- this.placeController.goTo(new
FolderPlace("Mock-Inbox"));
+ this.placeController.goTo(new
FolderPlace("INBOX"));
}
} else if (place instanceof SettingPlace) {
hupaLayout.switchTo(HupaLayout.LAYOUT_SETTING);
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=1522411&r1=1522410&r2=1522411&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:53:54 2013
@@ -612,6 +612,14 @@ public class ComposeActivity extends App
registerHandler(display.getUploader().addOnStatusChangedHandler(onStatusChangedHandler));
registerHandler(display.getUploader().addOnFinishUploadHandler(onFinishUploadHandler));
registerHandler(display.getUploader().addOnCancelUploadHandler(onCancelUploadHandler));
+
+ eventBus.addHandler(MailToEvent.TYPE, new MailToEventHandler(){
+
+ @Override
+ public void onMailTo(MailToEvent event) {
+ display.getTo().setText(event.getMailto());
+ }});
+
}
<<<<<<< HEAD
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java?rev=1522411&r1=1522410&r2=1522411&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
Thu Sep 12 04:53:54 2013
@@ -31,6 +31,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.place.ComposePlace;
import org.apache.hupa.client.place.MessagePlace.TokenWrapper;
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
@@ -187,15 +188,23 @@ import org.apache.hupa.client.rf.GetMess
import org.apache.hupa.client.ui.WidgetDisplayable;
=======
>>>>>>> replace with IsWidget
+=======
+import org.apache.hupa.client.place.ComposePlace;
+import org.apache.hupa.client.place.MessagePlace.TokenWrapper;
+import org.apache.hupa.client.rf.GetMessageDetailsRequest;
+import org.apache.hupa.client.ui.ToolBarView.Parameters;
+>>>>>>> fixed issue#84, actually, in evo, there has been several deprecated
classed, include WestActivity, which is replaced by FolderListActivity
import org.apache.hupa.shared.domain.GetMessageDetailsAction;
import org.apache.hupa.shared.domain.GetMessageDetailsResult;
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.MessageAttachment;
import org.apache.hupa.shared.events.DeleteClickEvent;
import org.apache.hupa.shared.events.DeleteClickEventHandler;
+import org.apache.hupa.shared.events.MailToEvent;
import com.google.gwt.activity.shared.Activity;
import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.IsWidget;
import com.google.inject.Inject;
@@ -224,7 +233,8 @@ public class MessageContentActivity exte
@Override
public void onSuccess(GetMessageDetailsResult
response) {
display.fillMessageContent(response.getMessageDetails().getText());
-
display.setAttachments(response.getMessageDetails().getMessageAttachments(),
fullName, Long.parseLong(uid));
+
display.setAttachments(response.getMessageDetails().getMessageAttachments(),
fullName,
+ Long.parseLong(uid));
}
@Override
@@ -238,6 +248,7 @@ public class MessageContentActivity exte
});
}
container.setWidget(display.asWidget());
+ exportJSMethods(this);
}
<<<<<<< HEAD
@@ -283,5 +294,34 @@ public class MessageContentActivity exte
uid = tokenWrapper.getUid();
return this;
}
+<<<<<<< HEAD
>>>>>>> make message content work as expected partly
+=======
+
+ public void openLink(String url) {
+ Window.open(url, "_blank", "");
+ }
+
+
+ public void mailTo(String mailto) {
+ pc.goTo(new ComposePlace("new").with(new Parameters(null, null,
null, null)));
+ eventBus.fireEvent(new MailToEvent(mailto));
+ }
+
+ private native void exportJSMethods(MessageContentActivity activity)
+ /*-{
+ $wnd.openLink = function(url) {
+ try {
+
activi...@org.apache.hupa.client.activity.MessageContentActivity::openLink(Ljava/lang/String;)
(url);
+ } catch(e) {}
+ return false;
+ };
+ $wnd.mailTo = function(mail) {
+ try {
+
activi...@org.apache.hupa.client.activity.MessageContentActivity::mailTo(Ljava/lang/String;)
(mail);
+ } catch(e) {}
+ return false;
+ };
+ }-*/;
+>>>>>>> fixed issue#84, actually, in evo, there has been several deprecated
classed, include WestActivity, which is replaced by FolderListActivity
}
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=1522411&r1=1522410&r2=1522411&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:53:54 2013
@@ -302,7 +302,6 @@ import org.apache.hupa.shared.events.Exp
import org.apache.hupa.shared.events.RefreshMessagesEvent;
import org.apache.hupa.shared.events.RefreshMessagesEventHandler;
import org.apache.hupa.shared.events.RefreshUnreadEvent;
-import org.apache.hupa.shared.events.RefreshUnreadEventHandler;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
