Author: dongxu Date: Thu Sep 12 04:03:34 2013 New Revision: 1522293 URL: http://svn.apache.org/r1522293 Log: cope with issue #36, the default place and and the mail folder place, we would always come up with the default place whenever giving a empty string token
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java 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/evo/AppController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java james/hupa/trunk/client/src/main/webapp/Hupa.html Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522293&r1=1522292&r2=1522293&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 04:03:34 2013 @@ -262,9 +262,13 @@ public class HupaController { RootLayoutPanel.get().add(hupaLayout.get()); ======= bindCss(); +<<<<<<< HEAD checkSession(); >>>>>>> integrate them as a whole one - first: make the default place work +======= +>>>>>>> cope with issue #36, the default place and and the mail folder place, we would always come up with the default place whenever giving a empty string token placeHistoryHandler.handleCurrentHistory(); + checkSession(); } private void bindCss() { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java?rev=1522293&r1=1522292&r2=1522293&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/AppBaseActivity.java Thu Sep 12 04:03:34 2013 @@ -65,6 +65,7 @@ public abstract class AppBaseActivity ex @Override public void onStop() { +<<<<<<< HEAD for (HandlerRegistration registration : registrations) { <<<<<<< HEAD if(registration != null){ @@ -88,6 +89,12 @@ public abstract class AppBaseActivity ex registration.removeHandler(); } registrations.clear(); +======= +// for (HandlerRegistration registration : registrations) { +// registration.removeHandler(); +// } +// registrations.clear(); +>>>>>>> cope with issue #36, the default place and and the mail folder place, we would always come up with the default place whenever giving a empty string token } <<<<<<< HEAD >>>>>>> fix issue 10 @@ -97,10 +104,6 @@ public abstract class AppBaseActivity ex registrations.add(handlerRegistration); } - public String mayStop() { - return null; - } - public void onCancel() { } >>>>>>> scrub code Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java?rev=1522293&r1=1522292&r2=1522293&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java Thu Sep 12 04:03:34 2013 @@ -487,11 +487,11 @@ public class LoginActivity extends Abstr RootLayoutPanel.get().add(hupaLayout.get()); placeController.goTo(new MailFolderPlace(response.getSettings().getDraftsFolderName())); eventBus.fireEvent(new LoginEvent(response)); + display.setLoading(false); } @Override public void onFailure(ServerFailure error) { Window.alert(error.getMessage());// TODO a more gentle way - display.setLoading(false); doReset(); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java?rev=1522293&r1=1522292&r2=1522293&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java Thu Sep 12 04:03:34 2013 @@ -370,6 +370,7 @@ public class TopActivity extends AppBase <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD // placeController.goTo(new DefaultPlace()); ======= >>>>>>> introduce the top activity @@ -378,6 +379,9 @@ public class TopActivity extends AppBase ======= placeController.goTo(new DefaultPlace()); >>>>>>> other RFs +======= +// placeController.goTo(new DefaultPlace()); +>>>>>>> cope with issue #36, the default place and and the mail folder place, we would always come up with the default place whenever giving a empty string token } private void showContacts() { 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=1522293&r1=1522292&r2=1522293&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:03:34 2013 @@ -199,7 +199,7 @@ public class TopBarActivity extends AppB RootLayoutPanel.get().clear(); RootLayoutPanel.get().add(loginLayout.get()); TopBarActivity.this.placeController - .goTo(new DefaultPlace()); + .goTo(new DefaultPlace("@")); } @Override @@ -207,7 +207,7 @@ public class TopBarActivity extends AppB RootLayoutPanel.get().clear(); RootLayoutPanel.get().add(loginLayout.get()); TopBarActivity.this.placeController - .goTo(new DefaultPlace()); + .goTo(new DefaultPlace("@")); } }); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java?rev=1522293&r1=1522292&r2=1522293&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/evo/AppController.java Thu Sep 12 04:03:34 2013 @@ -79,7 +79,7 @@ public class AppController { @Override public void onSuccess(Boolean sessionValid) { if (!sessionValid) { - AppController.this.placeController.goTo(new DefaultPlace()); +// AppController.this.placeController.goTo(new DefaultPlace()); } } }); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java?rev=1522293&r1=1522292&r2=1522293&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java Thu Sep 12 04:03:34 2013 @@ -872,8 +872,12 @@ public class AppGinModule extends Abstra EventBus eventBus) { PlaceHistoryHandler historyHandler = new PlaceHistoryHandler( historyMapper); +<<<<<<< HEAD >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers historyHandler.register(placeController, eventBus, new DefaultPlace()); +======= + historyHandler.register(placeController, eventBus, new DefaultPlace("@")); +>>>>>>> cope with issue #36, the default place and and the mail folder place, we would always come up with the default place whenever giving a empty string token return historyHandler; } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java?rev=1522293&r1=1522292&r2=1522293&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java Thu Sep 12 04:03:34 2013 @@ -68,6 +68,7 @@ import com.google.gwt.place.shared.Prefi public class DefaultPlace extends AbstractPlace { +<<<<<<< HEAD @Prefix("!") public static class Tokenizer implements PlaceTokenizer<DefaultPlace> { @@ -92,5 +93,30 @@ public class DefaultPlace extends Abstra >>>>>>> Change to new mvp framework - first step ======= >>>>>>> remove some warnings and create the AbstractPlace that can give place >>>>>>> infomation +======= + String token; + + public DefaultPlace(String token) { + this.token = token; + } + + public String getToken() { + return token; + } + + @Prefix("!") + public static class Tokenizer implements PlaceTokenizer<DefaultPlace> { + + @Override + public DefaultPlace getPlace(String token) { + return new DefaultPlace(token); + } + + @Override + public String getToken(DefaultPlace place) { + return place.getToken(); + } + } +>>>>>>> cope with issue #36, the default place and and the mail folder place, we would always come up with the default place whenever giving a empty string token } Modified: james/hupa/trunk/client/src/main/webapp/Hupa.html URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.html?rev=1522293&r1=1522292&r2=1522293&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/webapp/Hupa.html (original) +++ james/hupa/trunk/client/src/main/webapp/Hupa.html Thu Sep 12 04:03:34 2013 @@ -147,8 +147,8 @@ <!-- We need this because passwords in forms rendered by js are not saved in browsers --> <div id="login"> <form id="loginForm" action="hupa/clear.cache.gif" method="post"> - <input autocomplete="on" autocapitalize="off" id="email" name="email" type="text"> - <input autocomplete="on" autocapitalize="off" id="password" name="password" type="password"> + <input autocomplete="on" autocapitalize="off" id="email" name="email" type="text" value="demo"> + <input autocomplete="on" autocapitalize="off" id="password" name="password" type="password" value="demo"> </form> </div> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org