Author: dongxu Date: Thu Sep 12 04:28:55 2013 New Revision: 1522352 URL: http://svn.apache.org/r1522352 Log: scrub code
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522352&r1=1522351&r2=1522352&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java Thu Sep 12 04:28:55 2013 @@ -32,7 +32,11 @@ import org.apache.hupa.client.place.Fold ======= ======= import org.apache.hupa.client.HupaController; +<<<<<<< HEAD >>>>>>> fixed issue#61; add loading to mark, unmark. +======= +import org.apache.hupa.client.place.ComposePlace; +>>>>>>> scrub code import org.apache.hupa.client.place.MailFolderPlace; >>>>>>> fixed issue#59, coupled with fixing some UI refreshment issues in >>>>>>> toolsbar import org.apache.hupa.client.rf.SetFlagRequest; @@ -220,6 +224,7 @@ public class ToolBarActivity extends App >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers ======= private void bindTo(EventBus eventBus) { + registerHandler(display.getMark().addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { Widget source = (Widget) event.getSource(); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java?rev=1522352&r1=1522351&r2=1522352&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java Thu Sep 12 04:28:55 2013 @@ -475,10 +475,10 @@ public class ToolBarView extends Composi } @UiHandler("compose") - void handleClick(ClickEvent e) { + void handleCompose(ClickEvent e){ placeController.goTo(new ComposePlace("new").with(parameters)); } - + @UiHandler("reply") void handleReplyClick(ClickEvent e) { placeController.goTo(new ComposePlace("reply").with(parameters)); @@ -633,6 +633,7 @@ public class ToolBarView extends Composi <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD @Override public HasClickHandlers getRefresh() { return refresh; @@ -647,4 +648,7 @@ public class ToolBarView extends Composi >>>>>>> dynamical style tool bar ======= >>>>>>> add enable tool bar buttons toggling event, with being related to >>>>>>> issue #31 +======= + +>>>>>>> scrub code } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org