r1242 - in trunk/src/main/java: cc/kune/core/client/auth cc/kune/core/client/errors cc/kune/core/client/groups/newgroup cc/kune/core/client/resources cc/kune/core/client/ui cc/kune/core/client/ui/dialogs cc/kune/core/public cc/kune/wave/server org/ourproject/kune/workspace/client
Author: vjrj_ Date: 2011-02-08 17:36:26 +0100 (Tue, 08 Feb 2011) New Revision: 1242 Removed: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/ Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupView.java trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java Log: New Group refactorized Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -24,9 +24,9 @@ import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.state.Session; import cc.kune.core.client.ui.KuneUiUtils; +import cc.kune.core.client.ui.dialogs.MessageToolbar; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.extjs.gxt.ui.client.widget.VerticalPanel; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.inject.Inject; @@ -50,13 +50,12 @@ super(REGISTER_DIALOG, mask, i18n, i18n.t(CoreMessages.REGISTER_TITLE), true, true, true, 400, 420, "", i18n.t(CoreMessages.REGISTER_TITLE), REGISTER_BUTTON_ID, i18n.tWithNT("Cancel", "used in button"), CANCEL_BUTTON_ID, images, ERRMSG, 5); - final VerticalPanel panel = new VerticalPanel(); - // panel.setBorder(false); registerForm = new RegisterForm(i18n, session); registerForm.setWidth(370); - panel.add(registerForm.getFormPanel()); - super.getInnerPanel().add(panel); - panel.setId(REGISTER_FORM); + registerForm.getFormPanel().setId(REGISTER_FORM); + messageErrorBar = new MessageToolbar(images, errorLabelId); + registerForm.add(messageErrorBar); + super.getInnerPanel().add(registerForm.getFormPanel()); } @Override Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -25,6 +25,7 @@ import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.errors.EmailAddressInUseException; import cc.kune.core.client.errors.GroupNameInUseException; +import cc.kune.core.client.errors.UserRegistrationException; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.logs.Log; import cc.kune.core.client.notify.msgs.UserNotifyEvent; @@ -146,6 +147,9 @@ getView().setErrorMessage(i18n.t(CoreMessages.EMAIL_IN_USE), NotifyLevel.error); } else if (caught instanceof GroupNameInUseException) { getView().setErrorMessage(i18n.t(CoreMessages.NAME_IN_USE), NotifyLevel.error); + } else if (caught instanceof UserRegistrationException) { + getView().setErrorMessage(i18n.t("Error during registration. " + caught.getMessage()), + NotifyLevel.error); } else { getView().setErrorMessage(i18n.t("Error during registration."), NotifyLevel.error); throw new UIException("Other kind of exception in user registration", caught); Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -36,11 +36,11 @@ public abstract class SignInAbstractPanel extends ViewImpl { private final BasicTopDialog dialog; - private final String errorLabelId; + protected final String errorLabelId; protected final I18nTranslationService i18n; - private final NotifyLevelImages images; + protected final NotifyLevelImages images; private final MaskWidgetView mask; - private MessageToolbar messageErrorBar; + protected MessageToolbar messageErrorBar; public SignInAbstractPanel(final String dialogId, final MaskWidgetView mask, final I18nTranslationService i18n, final String title, final boolean autohide, final boolean modal, final boolean autoscroll, final int width, @@ -60,14 +60,6 @@ return dialog; } - private void createMessageErrorIfNeeded() { - if (messageErrorBar == null) { - messageErrorBar = new MessageToolbar(images, errorLabelId); - messageErrorBar.setHeight("50px"); - dialog.getBottomPanel().add(messageErrorBar); - } - } - public HasCloseHandlers<PopupPanel> getClose() { return dialog.getClose(); } @@ -91,7 +83,6 @@ } public void hideMessages() { - createMessageErrorIfNeeded(); messageErrorBar.hideErrorMessage(); } @@ -104,7 +95,6 @@ } public void setErrorMessage(final String message, final NotifyLevel level) { - createMessageErrorIfNeeded(); messageErrorBar.setErrorMessage(message, level); } Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -23,6 +23,7 @@ import cc.kune.common.client.ui.MaskWidgetView; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ui.KuneUiUtils; +import cc.kune.core.client.ui.dialogs.MessageToolbar; import cc.kune.core.shared.i18n.I18nTranslationService; import com.extjs.gxt.ui.client.widget.VerticalPanel; @@ -48,12 +49,12 @@ i18n.t(CoreMessages.SIGN_IN_TITLE), SIGN_IN_BUTTON_ID, i18n.tWithNT("Cancel", "used in button"), CANCEL_BUTTON_ID, images, ERROR_MSG, 102); - final VerticalPanel panel = new VerticalPanel(); signInForm = new SignInForm(i18n); signInForm.setWidth(370); - panel.add(signInForm.getFormPanel()); - panel.add(createNoAccountRegister()); - super.getInnerPanel().add(panel); + signInForm.add(createNoAccountRegister()); + messageErrorBar = new MessageToolbar(images, errorLabelId); + signInForm.add(messageErrorBar); + super.getInnerPanel().add(signInForm.getFormPanel()); } private VerticalPanel createNoAccountRegister() { Modified: trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify @@ -32,9 +32,10 @@ public DefaultException(final int statusCode, final String message) { super(statusCode + " " + message); + } public DefaultException(final String message) { - this(0, message); + super(message); } } Modified: trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) * This file is part of kune. * * This program is free software: you can redistribute it and/or modify Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -36,7 +36,9 @@ import com.extjs.gxt.ui.client.widget.form.TextArea; import com.extjs.gxt.ui.client.widget.form.TextField; import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.event.logical.shared.HasCloseHandlers; import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.gwtplatform.mvp.client.ViewImpl; @@ -78,14 +80,14 @@ @Inject public NewGroupPanel(final I18nTranslationService i18n, final NotifyLevelImages img, final MaskWidgetView mask) { dialog = new BasicTopDialog(NEWGROUP_WIZARD, CoreMessages.REGISTER_A_NEW_GROUP_TITLE, true, true, true, 450, - 420, "k-newgroup-icon", i18n.t("Register"), REGISTER_BUTTON, i18n.t("Cancel"), CANCEL_BUTTON, 9); + 360, "k-newgroup-icon", i18n.t("Register"), REGISTER_BUTTON, i18n.t("Cancel"), CANCEL_BUTTON, 9); this.i18n = i18n; this.mask = mask; // Field.setMsgTarget("side"); form = createNewGroupInitialDataForm(); messageErrorBar = new MessageToolbar(img, ERROR_MSG_BAR); - dialog.getBottomPanel().add(messageErrorBar); + form.add(messageErrorBar); dialog.getInnerPanel().add(form); } @@ -98,6 +100,7 @@ public void clearData() { form.reset(); shortNameField.focus(); + messageErrorBar.hideErrorMessage(); } private FormPanel createNewGroupInitialDataForm() { @@ -202,9 +205,12 @@ shortNameField.focus(); } + public HasCloseHandlers<PopupPanel> getClose() { + return dialog.getClose(); + } + @Override public HasClickHandlers getFirstBtn() { - return dialog.getFirstBtn(); } Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -24,6 +24,7 @@ import cc.kune.common.client.noti.NotifyUser; import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.errors.GroupNameInUseException; +import cc.kune.core.client.logs.Log; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.GroupServiceAsync; @@ -39,8 +40,11 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.logical.shared.CloseEvent; +import com.google.gwt.event.logical.shared.CloseHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.PopupPanel; import com.google.inject.Inject; import com.google.inject.Provider; import com.gwtplatform.mvp.client.Presenter; @@ -122,12 +126,19 @@ } }); getView().getSecondBtn().addClickHandler(new ClickHandler() { - @Override public void onClick(final ClickEvent event) { onCancel(); } }); + getView().getClose().addCloseHandler(new CloseHandler<PopupPanel>() { + + @Override + public void onClose(final CloseEvent<PopupPanel> event) { + Log.debug("Closing register presenter"); + NewGroupPresenter.this.onCancel(); + } + }); } public void onCancel() { Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupView.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupView.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -22,6 +22,8 @@ import cc.kune.common.client.noti.NotifyLevel; import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.event.logical.shared.HasCloseHandlers; +import com.google.gwt.user.client.ui.PopupPanel; import com.gwtplatform.mvp.client.View; public interface NewGroupView extends View { @@ -30,6 +32,8 @@ void focusOnShorName(); + HasCloseHandlers<PopupPanel> getClose(); + HasClickHandlers getFirstBtn(); String getLongName(); Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -24,7 +24,7 @@ public final static String EMAIL_IN_USE = "This email address is being used by another user. Please, try with another one"; public final static String ENT_LOGO_SELECTOR_NORMAL_TITLE = "Logo"; public final static String ENT_LOGO_SELECTOR_PERSON_TITLE = "Avatar"; - public final static String FIELD_MUST_BE_BETWEEN_3_AND_15 = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters, numbers"; + public final static String FIELD_MUST_BE_BETWEEN_3_AND_15 = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters and numbers"; public final static String GROUP_OPTIONS_DIALOG_TITLE = "Group options"; public final static String INCORRECT_NICKNAME_EMAIL_OR_PASSWORD = "The nickname/email/password is incorrect"; public final static String MEMBERS_NOT_PUBLIC = "The members of this group are not public"; Modified: trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -32,6 +32,7 @@ import com.extjs.gxt.ui.client.widget.form.FieldSet; import com.extjs.gxt.ui.client.widget.form.FormPanel; import com.extjs.gxt.ui.client.widget.form.FormPanel.LabelAlign; +import com.google.gwt.user.client.ui.Widget; public class DefaultForm { @@ -79,6 +80,10 @@ form.add(label); } + public void add(final Widget widget) { + form.add(widget); + } + public void addButton(final Button button) { form.addButton(button); } Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -26,18 +26,18 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.Label; public class MessageToolbar extends Composite { private final Image errorIcon; - private final InlineLabel errorLabel; + private final Label errorLabel; private final NotifyLevelImages images; private final FlowPanel toolbar; public MessageToolbar(final NotifyLevelImages images, final String errorLabelId) { this.images = images; toolbar = new FlowPanel(); - errorLabel = new InlineLabel(""); + errorLabel = new Label(""); errorLabel.setWordWrap(true); errorLabel.ensureDebugId(errorLabelId); errorIcon = new Image(); Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-08 16:36:26 UTC (rev 1242) @@ -694,17 +694,17 @@ .k-error-tb { background: #FFB380 none repeat scroll 0% 50%; /* color: #250; */ - margin: 0 20px 0 10px; + padding: 10px; } .k-error-tb img { - margin: 15px 5px 5px 15px; + margin: 0 10px; + float: left; } -.k-error-tb span { - position: relative; - top: -7px; - left: 9px; +.k-error-tb div { + font-size: 14px; + display: table-cell; } .k-mask { Modified: trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java 2011-02-08 14:17:50 UTC (rev 1241) +++ trunk/src/main/java/cc/kune/wave/server/CustomUserRegistrationServlet.java 2011-02-08 16:36:26 UTC (rev 1242) @@ -129,7 +129,7 @@ try { if (accountStore.getAccount(id) != null) { - return "Account already exists"; + return "An account with this name already exists"; } } catch (final PersistenceException e) { LOG.severe("Failed to retreive account data for " + id, e);
participants (1)
-
Vicente J. Ruiz Jurado