Author: vjrj_ Date: 2011-07-10 00:25:58 +0200 (Sun, 10 Jul 2011) New Revision: 1445 Modified: trunk/.classpath trunk/pom.xml trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java Log: Closed issue #44 (SpaceSelector clicked twice) and #47 (updated to Guice 3.0) Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-07-09 21:39:54 UTC (rev 1444) +++ trunk/.classpath 2011-07-09 22:25:58 UTC (rev 1445) @@ -44,10 +44,10 @@ <classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/guava/guava-gwt/r09/guava-gwt-r09.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/guice/3.0-rc2/guice-3.0-rc2.jar" sourcepath="M2_REPO/com/google/inject/guice/3.0-rc2/guice-3.0-rc2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/guice/3.0/guice-3.0.jar" sourcepath="M2_REPO/com/google/inject/guice/3.0/guice-3.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-assisted-inject/2.0/guice-assisted-inject-2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-persist/3.0-rc2/guice-persist-3.0-rc2.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-persist/3.0-rc2/guice-persist-3.0-rc2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-servlet/3.0-rc2/guice-servlet-3.0-rc2.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-servlet/3.0-rc2/guice-servlet-3.0-rc2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-persist/3.0/guice-persist-3.0.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-persist/3.0/guice-persist-3.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/adamtacy/gwt-fx/r464/gwt-fx-r464.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-gin/1.0-r137/gwt-gin-1.0-r137.jar"/> <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-09 21:39:54 UTC (rev 1444) +++ trunk/pom.xml 2011-07-09 22:25:58 UTC (rev 1445) @@ -213,19 +213,19 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <!-- <version>2.1-SNAPSHOT-r1160</version> --> - <version>3.0-rc2</version> + <version>3.0</version> </dependency> <!-- <dependency> <groupId>com.googlecode.gwt.inject</groupId> <artifactId>gin</artifactId> <version>gin-1.1-SNAPSHOT</version> </dependency> --> <dependency> <groupId>com.google.inject.extensions</groupId> <artifactId>guice-servlet</artifactId> - <version>3.0-rc2</version> + <version>3.0</version> </dependency> <dependency> <groupId>com.google.inject.extensions</groupId> <artifactId>guice-persist</artifactId> - <version>3.0-rc2</version> + <version>3.0</version> </dependency> <dependency> <groupId>com.extjs</groupId> Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-07-09 21:39:54 UTC (rev 1444) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-07-09 22:25:58 UTC (rev 1445) @@ -114,24 +114,28 @@ @Override public void onClick(final ClickEvent event) { stateManager.gotoHistoryToken(homeToken); + setDown(Space.homeSpace); } }); view.getUserBtn().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { stateManager.gotoHistoryToken(userToken); + setDown(Space.userSpace); } }); view.getGroupBtn().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { stateManager.gotoHistoryToken(groupToken); + setDown(Space.groupSpace); } }); view.getPublicBtn().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { stateManager.gotoHistoryToken(publicToken); + setDown(Space.publicSpace); } }); eventBus.addHandler(WindowFocusEvent.getType(), new WindowFocusEvent.WindowFocusHandler() { @@ -152,30 +156,21 @@ private void onGroupSpaceSelect() { armor.selectGroupSpace(); backManager.restoreBackImage(); - getView().setHomeBtnDown(false); - getView().setUserBtnDown(false); - getView().setGroupBtnDown(true); - getView().setPublicBtnDown(false); + setDown(Space.groupSpace); currentSpace = Space.groupSpace; } private void onHomeSpaceSelect() { armor.selectHomeSpace(); backManager.clearBackImage(); - getView().setHomeBtnDown(true); - getView().setUserBtnDown(false); - getView().setGroupBtnDown(false); - getView().setPublicBtnDown(false); + setDown(Space.homeSpace); currentSpace = Space.homeSpace; } private void onPublicSpaceSelect() { armor.selectPublicSpace(); backManager.restoreBackImage(); - getView().setHomeBtnDown(false); - getView().setUserBtnDown(false); - getView().setGroupBtnDown(false); - getView().setPublicBtnDown(true); + setDown(Space.publicSpace); currentSpace = Space.publicSpace; } @@ -234,10 +229,7 @@ if (session.isLogged()) { armor.selectUserSpace(); backManager.clearBackImage(); - getView().setHomeBtnDown(false); - getView().setUserBtnDown(true); - getView().setGroupBtnDown(false); - getView().setPublicBtnDown(false); + setDown(Space.userSpace); currentSpace = Space.userSpace; } else { signIn.get().setErrorMessage(i18n.t("Sign in or create an account to access to your inbox"), @@ -252,6 +244,13 @@ RevealRootContentEvent.fire(this, this); } + private void setDown(final Space space) { + getView().setHomeBtnDown(space.equals(Space.homeSpace)); + getView().setUserBtnDown(space.equals(Space.userSpace)); + getView().setGroupBtnDown(space.equals(Space.groupSpace)); + getView().setPublicBtnDown(space.equals(Space.publicSpace)); + } + private void showTooltipNow() { if (currentSpace != null) { switch (currentSpace) {