Author: dongxu Date: Thu Sep 12 03:48:47 2013 New Revision: 1522252 URL: http://svn.apache.org/r1522252 Log: make message content work as expected partly
Modified: 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 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/mapper/MessageContentActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml 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=1522252&r1=1522251&r2=1522252&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 03:48:47 2013 @@ -20,6 +20,7 @@ package org.apache.hupa.client.activity; <<<<<<< HEAD +<<<<<<< HEAD import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -161,21 +162,40 @@ public class MessageContentActivity exte }; }-*/; ======= +======= +import org.apache.hupa.client.place.IMAPMessagePlace; +>>>>>>> make message content work as expected partly import org.apache.hupa.client.ui.WidgetDisplayable; +import org.apache.hupa.shared.domain.MessageDetails; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Inject; public class MessageContentActivity extends AppBaseActivity { + + MessageDetails messageDetails; @Override public void start(AcceptsOneWidget container, EventBus eventBus) { + display.fillMessageContent(messageDetails.getText()); + System.out.println("+++"+messageDetails.getText()); container.setWidget(display.asWidget()); } @Inject private Displayable display; +<<<<<<< HEAD public interface Displayable extends WidgetDisplayable {} >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= + public interface Displayable extends WidgetDisplayable { + void fillMessageContent(String messageContent); + } + + public MessageContentActivity with(IMAPMessagePlace messageContentPlace){ + messageDetails = messageContentPlace.getMessageDetails(); + return this; + } +>>>>>>> make message content work as expected partly } 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=1522252&r1=1522251&r2=1522252&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 03:48:47 2013 @@ -265,7 +265,7 @@ import com.google.web.bindery.requestfac public class MessageListActivity extends AppBaseActivity { -// @Inject private Provider<IMAPMessagePlace> messagePlaceProvider; + // @Inject private Provider<IMAPMessagePlace> messagePlaceProvider; private User user; private String searchValue; @@ -282,46 +282,38 @@ public class MessageListActivity extends searchValue = null; } }); - eventBus.addHandler(ExpandMessageEvent.TYPE, - new ExpandMessageEventHandler() { - public void onExpandMessage(ExpandMessageEvent event) { - // final boolean decreaseUnseen; - final Message message = event.getMessage(); - // check if the message was already seen in the past - if (event.getMessage().getFlags() - .contains(IMAPFlag.SEEN) == false) { - // decreaseUnseen = true;//TODO 1209 - } else { - // decreaseUnseen = false; - } - - GetMessageDetailsRequest req = requestFactory - .messageDetailsRequest(); - GetMessageDetailsAction action = req - .create(GetMessageDetailsAction.class); - final ImapFolder f = req.create(ImapFolder.class); - // event.getFolder().setFolderTo(f); - cloneFolder(f, event.getFolder()); - action.setFolder(f); - action.setUid(message.getUid()); - req.get(action).fire( - new Receiver<GetMessageDetailsResult>() { - @Override - public void onSuccess( - GetMessageDetailsResult response) { - /* - * TODO if (decreaseUnseen) { - * eventBus.fireEvent(new - * DecreaseUnseenEvent(user, folder)); } - */ - placeController - .goTo(new IMAPMessagePlace( - String.valueOf(message - .getUid()))); - } - }); + eventBus.addHandler(ExpandMessageEvent.TYPE, new ExpandMessageEventHandler() { + public void onExpandMessage(ExpandMessageEvent event) { + // final boolean decreaseUnseen; + final Message message = event.getMessage(); + // check if the message was already seen in the past + if (event.getMessage().getFlags().contains(IMAPFlag.SEEN) == false) { + // decreaseUnseen = true;//TODO 1209 + } else { + // decreaseUnseen = false; + } + + GetMessageDetailsRequest req = requestFactory.messageDetailsRequest(); + GetMessageDetailsAction action = req.create(GetMessageDetailsAction.class); + final ImapFolder f = req.create(ImapFolder.class); + // event.getFolder().setFolderTo(f); + cloneFolder(f, event.getFolder()); + action.setFolder(f); + action.setUid(message.getUid()); + req.get(action).fire(new Receiver<GetMessageDetailsResult>() { + @Override + public void onSuccess(GetMessageDetailsResult response) { + /* + * TODO if (decreaseUnseen) { eventBus.fireEvent(new + * DecreaseUnseenEvent(user, folder)); } + */ + placeController.goTo(new IMAPMessagePlace(String.valueOf(message.getUid())).with(user, f, + message, response.getMessageDetails())); + } }); + } + }); } private void cloneFolder(ImapFolder desc, ImapFolder src) { @@ -334,12 +326,17 @@ public class MessageListActivity extends desc.setUnseenMessageCount(src.getUnseenMessageCount()); } +<<<<<<< HEAD @Inject private Displayable display; <<<<<<< HEAD public interface Displayable extends WidgetDisplayable {} >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers ======= +======= + @Inject + private Displayable display; +>>>>>>> make message content work as expected partly public interface Displayable extends WidgetDisplayable { } 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=1522252&r1=1522251&r2=1522252&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:48:47 2013 @@ -486,9 +486,9 @@ public class AppGinModule extends Abstra bind(ToolBarActivity.class).in(Singleton.class); bind(FolderListActivity.class).in(Singleton.class); bind(MessageListActivity.class).in(Singleton.class); - bind(MessageListFooterActivity.class).in(Singleton.class); - bind(MessageContentActivity.class).in(Singleton.class); - bind(StatusActivity.class).in(Singleton.class); +// bind(MessageListFooterActivity.class).in(Singleton.class); +// bind(MessageContentActivity.class).in(Singleton.class); +// bind(StatusActivity.class).in(Singleton.class); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java?rev=1522252&r1=1522251&r2=1522252&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java Thu Sep 12 03:48:47 2013 @@ -71,16 +71,27 @@ public class MessageContentActivityMappe private final Provider<MessageContentActivity> messageContentActivityProvider; @Inject - public MessageContentActivityMapper( - Provider<MessageContentActivity> messageContentActivityProvider) { + public MessageContentActivityMapper(Provider<MessageContentActivity> messageContentActivityProvider) { this.messageContentActivityProvider = messageContentActivityProvider; } public Activity getActivity(Place place) { +<<<<<<< HEAD if(place instanceof DefaultPlace)return null; else if (place instanceof MailFolderPlace) return null; else if (place instanceof IMAPMessagePlace) return messageContentActivityProvider.get(); return messageContentActivityProvider.get(); >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= + if (place instanceof DefaultPlace) + return null; + else if (place instanceof MailFolderPlace) + return null; + else if (place instanceof IMAPMessagePlace) { + System.out.println("+++___+_+_+_"+((IMAPMessagePlace) place).getMessageDetails().getText()); + return messageContentActivityProvider.get().with((IMAPMessagePlace) place); + } + return null; +>>>>>>> make message content work as expected partly } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java?rev=1522252&r1=1522251&r2=1522252&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java Thu Sep 12 03:48:47 2013 @@ -22,6 +22,7 @@ package org.apache.hupa.client.ui; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import java.util.List; import org.apache.hupa.client.HupaCSS; @@ -73,40 +74,26 @@ import java.util.List; import org.apache.hupa.client.HupaCSS; import org.apache.hupa.client.HupaConstants; +======= +>>>>>>> make message content work as expected partly import org.apache.hupa.client.activity.MessageContentActivity; -import org.apache.hupa.client.bundles.HupaImageBundle; -import org.apache.hupa.client.widgets.CommandsBar; -import org.apache.hupa.client.widgets.MessageHeaders; -import org.apache.hupa.shared.SConsts; -import org.apache.hupa.shared.Util; -import org.apache.hupa.shared.domain.Message; -import org.apache.hupa.shared.domain.MessageAttachment; -import org.apache.hupa.widgets.ui.Loading; -import org.cobogw.gwt.user.client.ui.Button; import com.google.gwt.core.client.GWT; +<<<<<<< HEAD import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.HasClickHandlers; >>>>>>> prepare for message content panel +======= +>>>>>>> make message content work as expected partly import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.Element; -import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; -import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.ScrollPanel; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; +<<<<<<< HEAD public class MessageContentView extends Composite implements MessageContentActivity.Displayable { @@ -256,15 +243,25 @@ public class MessageContentView extends msgArea.setHTML(content); } +======= +public class MessageContentView extends Composite implements MessageContentActivity.Displayable { +>>>>>>> make message content work as expected partly + @UiField + HTML messageContent; +<<<<<<< HEAD >>>>>>> prepare for message content panel +======= + @Inject +>>>>>>> make message content work as expected partly public MessageContentView() { initWidget(binder.createAndBindUi(this)); } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD @Override public void fillMessageContent(String messageDetail) { messageContentHTML.setHTML(messageDetail); @@ -347,10 +344,17 @@ public class MessageContentView extends ======= UiBinder<VerticalPanel, MessageContentView> { >>>>>>> prepare for message content panel +======= + interface MessageContentUiBinder extends UiBinder<ScrollPanel, MessageContentView> { +>>>>>>> make message content work as expected partly } - private static MessageContentUiBinder binder = GWT - .create(MessageContentUiBinder.class); + private static MessageContentUiBinder binder = GWT.create(MessageContentUiBinder.class); + + @Override + public void fillMessageContent(String messageDetail) { + messageContent.setHTML(messageDetail); + } >>>>>>> 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/MessageContentView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml?rev=1522252&r1=1522251&r2=1522252&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml Thu Sep 12 03:48:47 2013 @@ -13,6 +13,7 @@ xmlns:g='urn:import:com.google.gwt.user.client.ui'> <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <ui:image field="buttons" src="res/buttons.png" /> <ui:style> .messageContent { @@ -101,4 +102,9 @@ ======= <g:VerticalPanel ui:field="messageContainer" /> >>>>>>> prepare for message content panel +======= + <g:ScrollPanel> + <g:HTML ui:field="messageContent" /> + </g:ScrollPanel> +>>>>>>> make message content work as expected partly </ui:UiBinder> \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org