Author: dongxu Date: Thu Sep 12 04:59:28 2013 New Revision: 1522426 URL: http://svn.apache.org/r1522426 Log: show/hide attachment's panel according to the attachments size
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/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=1522426&r1=1522425&r2=1522426&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:59:28 2013 @@ -233,8 +233,14 @@ public class MessageContentActivity exte @Override public void onSuccess(GetMessageDetailsResult response) { display.fillMessageContent(response.getMessageDetails().getText()); - display.setAttachments(response.getMessageDetails().getMessageAttachments(), fullName, - Long.parseLong(uid)); + List<MessageAttachment> attaches = response.getMessageDetails().getMessageAttachments(); + if (attaches == null || attaches.isEmpty()) { + display.showAttachmentPanel(false); + } else { + display.showAttachmentPanel(true); + display.setAttachments(response.getMessageDetails().getMessageAttachments(), fullName, + Long.parseLong(uid)); + } } @Override @@ -287,6 +293,7 @@ public class MessageContentActivity exte void fillMessageContent(String messageContent); void clearContent(); void setAttachments(List<MessageAttachment> attachements, String folder, long uid); + void showAttachmentPanel(boolean is); } public Activity with(TokenWrapper tokenWrapper) { @@ -302,7 +309,6 @@ public class MessageContentActivity exte 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)); 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=1522426&r1=1522425&r2=1522426&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 04:59:28 2013 @@ -64,8 +64,11 @@ public class MessageContentView extends //TODO should use a scrolled panel which can contain multiple children @UiField FlowPanel attachments; @UiField DockLayoutPanel thisPanel; +<<<<<<< HEAD @UiField Anchor rawButton; @UiField SimplePanel rawPanel; +======= +>>>>>>> show/hide attachment's panel according to the attachments size @Inject ======= @@ -290,6 +293,7 @@ public class MessageContentView extends <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD @Override public void fillMessageContent(String messageDetail) { messageContentHTML.setHTML(messageDetail); @@ -385,18 +389,28 @@ public class MessageContentView extends private static MessageContentUiBinder binder = GWT.create(MessageContentUiBinder.class); +======= +>>>>>>> show/hide attachment's panel according to the attachments size @Override public void fillMessageContent(String messageDetail) { messageContentHTML.setHTML(messageDetail); messageContent.add(messageContentHTML); } + + @Override + public void showAttachmentPanel(boolean is){ + if(is){ + thisPanel.setWidgetSize(attachments, 216); + }else{ + thisPanel.setWidgetSize(attachments, 0); + } + } <<<<<<< HEAD >>>>>>> make login page as one part of the overall layout & splite layout to >>>>>>> little one ======= @Override public void setAttachments(List<MessageAttachment> attachements, final String folder, final long uid) { - attachments.clear(); final Element downloadIframe = RootPanel.get("__download").getElement(); if (attachements != null) { @@ -440,5 +454,13 @@ public class MessageContentView extends messageContentHTML.setHTML(""); } +<<<<<<< HEAD >>>>>>> fixed issue#76 with adding delete handler event +======= + + interface Binder extends UiBinder<DockLayoutPanel, MessageContentView> { + } + + private static Binder binder = GWT.create(Binder.class); +>>>>>>> show/hide attachment's panel according to the attachments size } 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=1522426&r1=1522425&r2=1522426&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 04:59:28 2013 @@ -133,11 +133,11 @@ </g:HTMLPanel> </g:north> <g:center> - <g:DockLayoutPanel unit="PX"> + <g:DockLayoutPanel unit="PX" ui:field="thisPanel"> <g:center> <g:ScrollPanel ui:field="messageContent" addStyleNames="{style.messageContent}" /> </g:center> - <g:east size="216"> + <g:east size="0"> <g:FlowPanel ui:field="attachments" addStyleNames="{style.attachBox}"> </g:FlowPanel> </g:east> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org