show/hide attachment's panel according to the attachments size
git-svn-id: https://svn.apache.org/repos/asf/james/hupa/trunk@1522426 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java b/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
index c3392f5..419f6ab 100644
--- a/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
+++ b/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
@@ -233,8 +233,14 @@
@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 @@
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 @@
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));
diff --git a/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java b/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java
index 34db4a7..cbdf8da 100644
--- a/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java
+++ b/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java
@@ -64,8 +64,11 @@
//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 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
@Override
public void fillMessageContent(String messageDetail) {
messageContentHTML.setHTML(messageDetail);
@@ -385,18 +389,28 @@
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 @@
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
}
diff --git a/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml b/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
index cb4c8f3..4199863 100644
--- a/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
+++ b/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
@@ -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>
