svn commit: r1522311 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/TopBarActivity.java ui/ComposeView.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 04:12:56 2013
New Revision: 1522311

URL: http://svn.apache.org/r1522311
Log:
ignore the cc or bcc addresses when they are hidden elements

Modified:
    
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
    
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java?rev=1522311&r1=1522310&r2=1522311&view=diff
==============================================================================
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
 Thu Sep 12 04:12:56 2013
@@ -170,7 +170,7 @@ public class TopBarActivity extends AppB
        public void start(AcceptsOneWidget container, EventBus eventBus) {
                container.setWidget(display.asWidget());
                bindTo(eventBus);
-               if (user != null) {
+               if (user != null && isOccupied()) {
                        display.getUserLabel().add(new HTML(user.getName()));
                }
        }
@@ -217,6 +217,10 @@ public class TopBarActivity extends AppB
                }
        }
 
+       private boolean isOccupied() {
+               return display.getUserLabel().getWidgetCount() < 1;
+       }
+
        public interface Displayable extends WidgetDisplayable {
                HasClickHandlers getLogoutClick();
 

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java?rev=1522311&r1=1522310&r2=1522311&view=diff
==============================================================================
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
 Thu Sep 12 04:12:56 2013
@@ -317,6 +317,16 @@ public class ComposeView extends Composi
 
        MyFancyLookingButton button = new MyFancyLookingButton();
 
+       HasText emptyText = new HasText() {
+               @Override
+               public String getText() {
+                       return "";
+               }
+               @Override
+               public void setText(String text) {
+               }
+       };
+
        @Override
        public HasText getTo() {
                return toSuggest;
@@ -324,12 +334,18 @@ public class ComposeView extends Composi
 
        @Override
        public HasText getCc() {
-               return ccSuggest;
+               if (isShowing(ROW_CC))
+                       return ccSuggest;
+               else
+                       return emptyText;
        }
 
        @Override
        public HasText getBcc() {
-               return bccSuggest;
+               if (isShowing(ROW_BCC))
+                       return bccSuggest;
+               else
+                       return emptyText;
        }
 
        @Override



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org