Author: vjrj_ Date: 2011-10-13 18:10:45 +0200 (Thu, 13 Oct 2011) New Revision: 1560 Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java trunk/src/main/java/cc/kune/core/client/auth/SignIn.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUtils.java trunk/src/main/java/cc/kune/core/client/state/Session.java trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java trunk/src/main/java/cc/kune/core/client/state/StateManager.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/shared/FileConstants.java trunk/src/test/java/cc/kune/core/client/i18n/I18nUtilsTest.java trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java trunk/src/test/java/cc/kune/selenium/tools/SeleniumConstants.java Log: Minor changes... Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -42,8 +42,6 @@ import cc.kune.core.shared.dto.TimeZoneDTO; import cc.kune.core.shared.dto.UserDTO; -import com.google.gwt.core.client.Scheduler; -import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.logical.shared.CloseEvent; @@ -184,7 +182,7 @@ @Override public void onSuccess(final Void arg0) { - signInProvider.get().doSignIn(getView().getShortName(), getView().getRegisterPassword(), + signInProvider.get().doSignIn(getView().getShortName(), getView().getRegisterPassword(), true, new AsyncCallback<Void>() { @Override @@ -196,12 +194,12 @@ public void onSuccess(final Void result) { // onSignIn(userInfoDTO); NewUserRegisteredEvent.fire(getEventBus()); - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - @Override - public void execute() { - stateManager.gotoHistoryToken(session.getCurrentUserInfo().getHomePage()); - } - }); + // Scheduler.get().scheduleDeferred(new ScheduledCommand() { + // @Override + // public void execute() { + // stateManager.gotoHistoryToken(session.getCurrentUserInfo().getHomePage()); + // } + // }); getView().hide(); getView().unMask(); if (wantHomepage) { Modified: trunk/src/main/java/cc/kune/core/client/auth/SignIn.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignIn.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/main/java/cc/kune/core/client/auth/SignIn.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -25,12 +25,12 @@ public interface SignIn { - void doSignIn(String nickOrEmail, String passwd, AsyncCallback<Void> callback); + void doSignIn(String nickOrEmail, String passwd, boolean gotoHomePage, AsyncCallback<Void> callback); - void hide(); + void hide(); - void showSignInDialog(); + void setErrorMessage(String message, NotifyLevel level); - void setErrorMessage(String message, NotifyLevel level); + void showSignInDialog(); } Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -74,7 +74,7 @@ } } - protected void onSignIn(final UserInfoDTO userInfoDTO) { + protected void onSignIn(final UserInfoDTO userInfoDTO, final boolean gotoHomePage) { final String userHash = userInfoDTO.getUserHash(); cookiesManager.setAuthCookie(userHash); getView().reset(); @@ -83,7 +83,11 @@ final I18nLanguageDTO language = userInfoDTO.getLanguage(); i18n.changeCurrentLanguage(language.getCode()); session.setCurrentLanguage(language); - stateManager.redirectOrRestorePreviousToken(); + if (gotoHomePage) { + stateManager.gotoHistoryToken(userInfoDTO.getHomePage()); + } else { + stateManager.redirectOrRestorePreviousToken(); + } } protected void saveAutocompleteLoginData(final String nickOrEmail, final String password) { Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -105,7 +105,7 @@ } @Override - public void doSignIn(final String nickOrEmail, final String passwd, + public void doSignIn(final String nickOrEmail, final String passwd, final boolean gotoHomePage, final AsyncCallback<Void> extCallback) { final UserDTO user = new UserDTO(); user.setShortName(nickOrEmail); @@ -129,7 +129,7 @@ @Override public void onSuccess(final UserInfoDTO userInfoDTO) { - onSignIn(userInfoDTO); + onSignIn(userInfoDTO, gotoHomePage); extCallback.onSuccess(null); } }; @@ -197,7 +197,7 @@ final String nickOrEmail = getView().getNickOrEmail(); final String passwd = getView().getLoginPassword(); - doSignIn(nickOrEmail, passwd, new AsyncCallback<Void>() { + doSignIn(nickOrEmail, passwd, false, new AsyncCallback<Void>() { @Override public void onFailure(final Throwable caught) { Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -33,7 +33,6 @@ import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.emite.browser.client.PageAssist; -import com.calclab.suco.client.events.Listener0; import com.google.gwt.event.shared.EventBus; import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -109,32 +108,32 @@ */ private native void changeLocale(String newLocale) /*-{ - // Uncomment the "debugger;" line to see how to set debug statements in JSNI code - // When in web mode, if your browser has a JavaScript debugger attached, it will - // launch at this point in the code (when the user changes locale through the menu system). - // debugger; + // Uncomment the "debugger;" line to see how to set debug statements in JSNI code + // When in web mode, if your browser has a JavaScript debugger attached, it will + // launch at this point in the code (when the user changes locale through the menu system). + // debugger; - // Get the current location - var currLocation = $wnd.location.toString(); - // Get rid of any GWT History tokens that might be present - var noHistoryCurrLocArray = currLocation.split("#"); - var noHistoryCurrLoc = noHistoryCurrLocArray[0]; - var currHistory = noHistoryCurrLocArray[1]; - // Get rid of any locale string - var locArray = noHistoryCurrLoc.split("?"); - // Build the new href location and then send the browser there. - // $wnd.location.href = locArray[0]+"?locale="+newLocale+"#"+currHistory; - $wnd.location.href = locArray[0] + "?locale=" + newLocale + // Get the current location + var currLocation = $wnd.location.toString(); + // Get rid of any GWT History tokens that might be present + var noHistoryCurrLocArray = currLocation.split("#"); + var noHistoryCurrLoc = noHistoryCurrLocArray[0]; + var currHistory = noHistoryCurrLocArray[1]; + // Get rid of any locale string + var locArray = noHistoryCurrLoc.split("?"); + // Build the new href location and then send the browser there. + // $wnd.location.href = locArray[0]+"?locale="+newLocale+"#"+currHistory; + $wnd.location.href = locArray[0] + "?locale=" + newLocale - // extjs part: - // commented because the error: "Ext is not defined" - // we have to try other way - // var head = document.getElementsByTagName("head")[0]; - // var script = document.createElement('script'); - // script.id = 'localScript'; - // script.type = 'text/javascript'; - // script.src = "js/ext/locale/ext-lang-"+newLocale+".js"; - // head.appendChild(script); + // extjs part: + // commented because the error: "Ext is not defined" + // we have to try other way + // var head = document.getElementsByTagName("head")[0]; + // var script = document.createElement('script'); + // script.id = 'localScript'; + // script.type = 'text/javascript'; + // script.src = "js/ext/locale/ext-lang-"+newLocale+".js"; + // head.appendChild(script); }-*/; public String formatDateWithLocale(final Date date) { @@ -178,10 +177,6 @@ return siteCommonName; } - public void init(final I18nServiceAsync i18nService, final Session session, final Listener0 onReady) { - - } - private void save(final String text, final String noteForTranslators) { i18nService.getTranslation(session.getUserHash(), currentLanguageCode, text, noteForTranslators, new AsyncCallback<String>() { Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUtils.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUtils.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -1,5 +1,7 @@ package cc.kune.core.client.i18n; +import cc.kune.common.client.errors.UIException; +import cc.kune.common.client.log.Log; import cc.kune.common.client.utils.TextUtils; /** @@ -19,9 +21,18 @@ // result = result.replaceAll("[ \\.\\?,;&\\(\\)\"\\$!\\/\\'\\-%:{}\\[\\]]", // ""); result = result.replaceAll("[^a-zA-Z0-9]", ""); - return TextUtils.abbreviate( - new StringBuffer(result.length()).append(Character.toLowerCase(result.charAt(0))).append( - result.substring(1)).toString(), 0, 100, ""); + if (result.isEmpty()) { + return ""; + } + try { + return TextUtils.abbreviate( + new StringBuffer(result.length()).append(Character.toLowerCase(result.charAt(0))).append( + result.substring(1)).toString(), 0, 100, ""); + } catch (final Exception e) { + final String message = "Error trying to get i18n func-name of: " + name; + Log.error(message); + throw new UIException(message); + } } Modified: trunk/src/main/java/cc/kune/core/client/state/Session.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -56,9 +56,6 @@ import cc.kune.core.shared.dto.UserInfoDTO; import cc.kune.core.shared.dto.UserSimpleDTO; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; - public interface Session { long A_DAY = 1000 * 60 * 60 * 24; @@ -141,9 +138,6 @@ void onAppStart(boolean fireNow, AppStartEvent.AppStartHandler handler); - @Deprecated - void onInitDataReceived(Listener<InitDataDTO> listener); - /** * @param fireNow * if @true the handler is fired after added if the user is loggedin @@ -151,9 +145,6 @@ */ void onUserSignIn(boolean fireNow, UserSignInEvent.UserSignInHandler handler); - @Deprecated - void onUserSignIn(Listener<UserInfoDTO> listener); - void onUserSignInOrSignOut(boolean fireNow, UserSignInOrSignOutEvent.UserSignInOrSignOutHandler handler); /** @@ -163,9 +154,6 @@ */ void onUserSignOut(boolean fireNow, UserSignOutEvent.UserSignOutHandler handler); - @Deprecated - void onUserSignOut(Listener0 listener); - void setCurrentLanguage(final I18nLanguageDTO currentLanguage); void setCurrentState(final StateAbstractDTO currentState); Modified: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.List; -import cc.kune.common.client.errors.NotImplementedException; import cc.kune.common.client.log.Log; import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.errors.SessionExpiredEvent; @@ -46,8 +45,6 @@ import cc.kune.core.shared.dto.UserInfoDTO; import cc.kune.core.shared.dto.UserSimpleDTO; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; import com.google.gwt.core.client.GWT; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; @@ -320,11 +317,6 @@ } @Override - public void onInitDataReceived(final Listener<InitDataDTO> listener) { - throw new NotImplementedException(); - } - - @Override public void onUserSignIn(final boolean fireNow, final UserSignInHandler handler) { eventBus.addHandler(UserSignInEvent.getType(), handler); if (fireNow && isLogged() && currentUserInfo != null) { @@ -333,11 +325,6 @@ } @Override - public void onUserSignIn(final Listener<UserInfoDTO> listener) { - throw new NotImplementedException(); - } - - @Override public void onUserSignInOrSignOut(final boolean fireNow, final UserSignInOrSignOutHandler handler) { eventBus.addHandler(UserSignInOrSignOutEvent.getType(), handler); if (fireNow) { @@ -354,11 +341,6 @@ } @Override - public void onUserSignOut(final Listener0 listener) { - throw new NotImplementedException(); - } - - @Override public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) { this.currentLanguage = currentLanguage; } Modified: trunk/src/main/java/cc/kune/core/client/state/StateManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -24,66 +24,52 @@ import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener2; - public interface StateManager { - void addBeforeStateChangeListener(BeforeActionListener listener); + void addBeforeStateChangeListener(BeforeActionListener listener); - void addSiteToken(String token, HistoryTokenCallback historyTokenCallback); + void addSiteToken(String token, HistoryTokenCallback historyTokenCallback); - void gotoHistoryToken(String newToken); + void gotoHistoryToken(String newToken); - void gotoHistoryTokenButRedirectToCurrent(String signin); + void gotoHistoryTokenButRedirectToCurrent(String signin); - void gotoStateToken(StateToken newToken); + void gotoStateToken(StateToken newToken); - void gotoStateToken(StateToken token, boolean useCache); + void gotoStateToken(StateToken token, boolean useCache); - void onGroupChanged(boolean fireNow, GroupChangedEvent.GroupChangedHandler handler); + void onGroupChanged(boolean fireNow, GroupChangedEvent.GroupChangedHandler handler); - @Deprecated - void onGroupChanged(Listener2<String, String> listener); + void onSocialNetworkChanged(boolean fireNow, + SocialNetworkChangedEvent.SocialNetworkChangedHandler handler); - void onSocialNetworkChanged(boolean fireNow, SocialNetworkChangedEvent.SocialNetworkChangedHandler handler); + /** + * @param fireNow + * if true, fire handler with current state + * @param handler + */ + void onStateChanged(boolean fireNow, StateChangedEvent.StateChangedHandler handler); - @Deprecated - void onSocialNetworkChanged(Listener<StateAbstractDTO> listener); + void onToolChanged(boolean fireNow, ToolChangedEvent.ToolChangedHandler handler); - /** - * @param fireNow - * if true, fire handler with current state - * @param handler - */ - void onStateChanged(boolean fireNow, StateChangedEvent.StateChangedHandler handler); + void redirectOrRestorePreviousToken(); - @Deprecated - void onStateChanged(Listener<StateAbstractDTO> listener); + void refreshCurrentState(); - void onToolChanged(boolean fireNow, ToolChangedEvent.ToolChangedHandler handler); + void refreshCurrentStateWithoutCache(); - @Deprecated - void onToolChanged(Listener2<String, String> listener); + void removeBeforeStateChangeListener(BeforeActionListener listener); - void redirectOrRestorePreviousToken(); + void removeSiteToken(String token); - void refreshCurrentStateWithoutCache(); + void restorePreviousToken(); - void refreshCurrentState(); + void resumeTokenChange(); - void removeBeforeStateChangeListener(BeforeActionListener listener); + void setRetrievedState(StateAbstractDTO state); - void removeSiteToken(String token); + void setRetrievedStateAndGo(StateAbstractDTO state); - void restorePreviousToken(); + void setSocialNetwork(SocialNetworkDataDTO socialNet); - void resumeTokenChange(); - - void setRetrievedState(StateAbstractDTO state); - - void setRetrievedStateAndGo(StateAbstractDTO state); - - void setSocialNetwork(SocialNetworkDataDTO socialNet); - } Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -27,7 +27,6 @@ import cc.kune.common.client.actions.BeforeActionCollection; import cc.kune.common.client.actions.BeforeActionListener; -import cc.kune.common.client.errors.NotImplementedException; import cc.kune.common.client.log.Log; import cc.kune.common.client.utils.Pair; import cc.kune.core.client.init.AppStartEvent; @@ -45,8 +44,6 @@ import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener2; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.event.shared.EventBus; @@ -172,11 +169,6 @@ } - @Override - public void onGroupChanged(final Listener2<String, String> listener) { - throw new NotImplementedException(); - } - private void onHistoryChanged(final StateToken newState) { // NotifyUser.info("loading: " + newState + " because current:" + // session.getCurrentStateToken()); @@ -199,11 +191,6 @@ } @Override - public void onSocialNetworkChanged(final Listener<StateAbstractDTO> listener) { - throw new NotImplementedException(); - } - - @Override public void onStateChanged(final boolean fireNow, final StateChangedHandler handler) { eventBus.addHandler(StateChangedEvent.getType(), handler); final StateAbstractDTO currentState = session.getCurrentState(); @@ -213,11 +200,6 @@ } @Override - public void onStateChanged(final Listener<StateAbstractDTO> listener) { - throw new NotImplementedException(); - } - - @Override public void onToolChanged(final boolean fireNow, final ToolChangedHandler handler) { eventBus.addHandler(ToolChangedEvent.getType(), handler); final StateAbstractDTO currentState = session.getCurrentState(); @@ -228,11 +210,6 @@ } @Override - public void onToolChanged(final Listener2<String, String> listener) { - throw new NotImplementedException(); - } - - @Override public void onValueChange(final ValueChangeEvent<String> event) { Log.info("History event value changed: " + event.getValue()); processHistoryToken(event.getValue()); Modified: trunk/src/main/java/cc/kune/core/shared/FileConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/FileConstants.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/main/java/cc/kune/core/shared/FileConstants.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -21,7 +21,7 @@ public final class FileConstants { - public final static String ASITE_PREFIX = "ws/"; + public final static String ASITE_PREFIX = "/ws/"; public final static String AVATARDOWNLOADSERVLET = ASITE_PREFIX + "servlets/UserLogoDownloadManager"; public final static String BACKDOWNLOADSERVLET = ASITE_PREFIX + "servlets/EntityBackgroundDownloadManager"; Modified: trunk/src/test/java/cc/kune/core/client/i18n/I18nUtilsTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/i18n/I18nUtilsTest.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/test/java/cc/kune/core/client/i18n/I18nUtilsTest.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -26,6 +26,7 @@ assertEquals("yesOrNo", I18nUtils.convertMethodName("yes, or & no?")); assertEquals("yesOrNo", I18nUtils.convertMethodName("yes or no")); assertEquals("yesOrNo", I18nUtils.convertMethodName("yes or no")); + assertEquals("newYesNoMaybeVoting", I18nUtils.convertMethodName("New Yes/No/Maybe/+ Voting")); } @Test Modified: trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -51,7 +51,7 @@ public static final Injector INJECTOR = Guice.createInjector(new SeleniumModule()); private static final Log LOG = LogFactory.getLog(KuneSeleniumDefaults.class); - public static boolean mustCloseFinally = true; + public static boolean mustCloseFinally = false; private final String baseUrl; protected final ChatPageObject chat; protected final EntityHeaderPageObject entityHeader; @@ -62,9 +62,8 @@ private final WebDriver webdriver; public KuneSeleniumDefaults() { - baseUrl = "http://kune.beta.iepala.es/?locale=en#"; - // baseUrl = - // "http://127.0.0.1:8888/?locale=es&log_level=INFO&gwt.codesvr=127.0.0.1:9997#"; + // baseUrl = "http://kune.beta.iepala.es/?locale=en#"; + baseUrl = "http://127.0.0.1:8888/?locale=es&log_level=INFO&gwt.codesvr=127.0.0.1:9997#"; injector = INJECTOR; webdriver = injector.getInstance(WebDriver.class); login = injector.getInstance(LoginPageObject.class); Modified: trunk/src/test/java/cc/kune/selenium/tools/SeleniumConstants.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/tools/SeleniumConstants.java 2011-10-13 12:37:59 UTC (rev 1559) +++ trunk/src/test/java/cc/kune/selenium/tools/SeleniumConstants.java 2011-10-13 16:10:45 UTC (rev 1560) @@ -23,7 +23,7 @@ public static final String FIREFOX_PROFILE_NAME = "selenium"; public static final String GWTDEV = "gwt-debug-"; public static final String INPUT = "-input"; - public static final int TIMEOUT = 20; + public static final int TIMEOUT = 25; public static final String USER_EMAIL = "[email protected]"; public static final String USER_LONGNAME = "Administrator"; public static final String USER_PASSWD = "easyeasy";