Author: dongxu Date: Thu Sep 12 04:58:10 2013 New Revision: 1522423 URL: http://svn.apache.org/r1522423 Log: fixed issue#87, and remove deprecated west view related codes
Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/CachingWestActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/WestActivityMapper.java 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/ioc/AppGinModule.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=1522423&r1=1522422&r2=1522423&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:58:10 2013 @@ -105,6 +105,7 @@ public class TopBarActivity extends AppB RootLayoutPanel.get().add(loginLayout.get()); pc.goTo(new DefaultPlace("")); Window.Location.reload(); +<<<<<<< HEAD } @Override @@ -228,13 +229,16 @@ public class TopBarActivity extends AppB RootLayoutPanel.get().clear(); RootLayoutPanel.get().add(loginLayout.get()); TopBarActivity.this.pc.goTo(new DefaultPlace("@")); +======= +>>>>>>> fixed issue#87, and remove deprecated west view related codes } @Override public void onFailure(ServerFailure error) { RootLayoutPanel.get().clear(); RootLayoutPanel.get().add(loginLayout.get()); - TopBarActivity.this.pc.goTo(new DefaultPlace("@")); + pc.goTo(new DefaultPlace("")); + Window.Location.reload(); } }); } 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=1522423&r1=1522422&r2=1522423&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:58:10 2013 @@ -167,7 +167,6 @@ import org.apache.hupa.client.activity.S import org.apache.hupa.client.activity.ToolBarActivity; import org.apache.hupa.client.activity.TopActivity; import org.apache.hupa.client.activity.TopBarActivity; -import org.apache.hupa.client.activity.WestActivity; import org.apache.hupa.client.mapper.AppPlaceHistoryMapper; <<<<<<< HEAD <<<<<<< HEAD @@ -303,7 +302,6 @@ import org.apache.hupa.client.ui.StatusV import org.apache.hupa.client.ui.ToolBarView; import org.apache.hupa.client.ui.TopBarView; import org.apache.hupa.client.ui.TopView; -import org.apache.hupa.client.ui.WestView; import com.google.gwt.activity.shared.ActivityManager; <<<<<<< HEAD @@ -622,8 +620,11 @@ public class AppGinModule extends Abstra >>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite, >>>>>>> don't use contact instead of folders list ======= bind(FolderListActivity.Displayable.class).to(FolderListView.class).in(Singleton.class); +<<<<<<< HEAD >>>>>>> fixed issue#61; add loading to mark, unmark. bind(WestActivity.Displayable.class).to(WestView.class).in(Singleton.class); +======= +>>>>>>> fixed issue#87, and remove deprecated west view related codes bind(IMAPMessageListActivity.Displayable.class).to(IMAPMessageListView.class); bind(MessageSendActivity.Displayable.class).to(MessageSendView.class); <<<<<<< HEAD @@ -669,7 +670,6 @@ public class AppGinModule extends Abstra ======= >>>>>>> remove the duplicate bind of LoginActivity bind(TopActivity.class).in(Singleton.class); - bind(WestActivity.class).in(Singleton.class); bind(IMAPMessageListActivity.class).in(Singleton.class); bind(MessageSendActivity.class).in(Singleton.class); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org