Author: dongxu
Date: Thu Sep 12 05:00:33 2013
New Revision: 1522429
URL: http://svn.apache.org/r1522429
Log:
hide the show raw message button when not displaying a message and remove
deprecated code
Removed:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/ActivityManagerInitializer.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/HupaEvo.java
Modified:
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/ui/MessageContentView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java?rev=1522429&r1=1522428&r2=1522429&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 05:00:33 2013
@@ -51,9 +51,13 @@ import com.google.gwt.user.client.ui.Lab
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.ScrollPanel;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.user.client.ui.SimplePanel;
=======
>>>>>>> change the message content view with scrollbar
+=======
+import com.google.gwt.user.client.ui.SimplePanel;
+>>>>>>> hide the show raw message button when not displaying a message and
remove deprecated code
import com.google.inject.Inject;
public class MessageContentView extends Composite implements
MessageContentActivity.Displayable {
@@ -68,6 +72,7 @@ public class MessageContentView extends
<<<<<<< HEAD
@UiField Anchor rawButton;
@UiField SimplePanel rawPanel;
+<<<<<<< HEAD
=======
>>>>>>> show/hide attachment's panel according to the attachments size
=======
@@ -257,6 +262,8 @@ public class MessageContentView extends
public HasClickHandlers getBackButtonClick() {
return backButton;
}
+=======
+>>>>>>> hide the show raw message button when not displaying a message and
remove deprecated code
public HasClickHandlers getShowRawMessageClick() {
return showRawButton;
@@ -474,5 +481,13 @@ public class MessageContentView extends
public HasClickHandlers getRaw() {
return rawButton;
}
+<<<<<<< HEAD
>>>>>>> fixed issue#86, use opening a new window button to show the raw
>>>>>>> message in a new window
+=======
+
+ @Override
+ public HasVisibility getRawPanel() {
+ return rawPanel;
+ }
+>>>>>>> hide the show raw message button when not displaying a message and
remove deprecated code
}
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=1522429&r1=1522428&r2=1522429&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 05:00:33 2013
@@ -156,7 +156,7 @@
<g:DockLayoutPanel unit="PX" ui:field="thisPanel">
<g:north size="30">
<g:FlowPanel
addStyleNames="{style.previewheader} {style.messageheader}">
- <g:SimplePanel
addStyleNames="{style.moreHeaders}">
+ <g:SimplePanel
ui:field="rawPanel" addStyleNames="{style.moreHeaders}">
<g:Anchor
ui:field="rawButton" addStyleNames="{style.inner}">Raw
</g:Anchor>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
