[kune-commits] r1307 - in trunk/src: main/java/cc/kune/chat/client main/java/cc/kune/chat/client/actions main/java/cc/kune/client main/java/cc/kune/common/client main/java/cc/kune/common/client/actions/gwtui main/java/cc/kune/common/client/notify main/java/cc/kune/common/client/tooltip main/java/cc/kune/common/client/ui main/java/cc/kune/common/public main/java/cc/kune/core/client/auth main/java/cc/kune/core/client/errors main/java/cc/kune/core/client/groups/newgroup main/java/cc/kune/core/client/init main/

Author: vjrj_ Date: 2011-04-12 20:38:37 +0200 (Tue, 12 Apr 2011) New Revision: 1307 Added: trunk/src/main/java/cc/kune/common/client/notify/ConfirmAskEvent.java trunk/src/main/java/cc/kune/common/client/notify/NotifyLevel.java trunk/src/main/java/cc/kune/common/client/notify/NotifyLevelImages.java trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java trunk/src/main/java/cc/kune/common/client/tooltip/ trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.ui.xml trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPosition.java trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPositionCalculator.java trunk/src/test/java/cc/kune/common/client/tooltip/ trunk/src/test/java/cc/kune/common/client/tooltip/TooltipPositionCalculatorTest.java trunk/src/test/java/cc/kune/wave/server/KuneWaveManagerDefaultTest.java Removed: trunk/src/main/java/cc/kune/common/client/noti/ Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java trunk/src/main/java/cc/kune/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java trunk/src/main/java/cc/kune/common/public/kune-common.css 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/SignIn.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractView.java trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java trunk/src/main/java/cc/kune/core/client/auth/WaveClientSimpleAuthenticator.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.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/init/AppStarterDefault.java trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPresenter.java trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerViewImpl.java trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/UserSNVisibilityAction.java trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessagePanel.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessagePanelView.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/docs/client/ContentRenameAction.java trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPresenter.java trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePresenter.java trunk/src/main/java/cc/kune/msgs/client/UserMessage.java trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java trunk/src/main/java/cc/kune/msgs/client/UserMessagesPresenter.java trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java trunk/src/main/java/cc/kune/wave/client/WebClient.java trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java trunk/src/main/java/com/example/client/HelloWorldActions.java trunk/src/main/java/com/example/client/HelloWorldPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipateAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/SocialNetworkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UnjoinButtonAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptions.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java Log: NEW - # 37: Implement a GWT Tooltip widget similar to qtip or others http://kune.ourproject.org/issues/ticket/37 Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -34,7 +34,7 @@ import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.common.client.log.Log; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.client.utils.TextUtils; import cc.kune.common.client.utils.WindowUtils; Modified: trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/chat/client/KuneChatNotifier.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,7 +19,7 @@ */ package cc.kune.chat.client; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import com.calclab.hablar.signals.client.notifications.HablarNotifier; Modified: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -27,7 +27,7 @@ import cc.kune.common.client.actions.PropertyChangeEvent; import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateChangedEvent; Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -4,7 +4,7 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -20,7 +20,7 @@ package cc.kune.client; import cc.kune.common.client.log.Log; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import com.google.gwt.core.client.EntryPoint; Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -26,6 +26,7 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; import com.google.gwt.event.dom.client.ClickEvent; @@ -141,11 +142,7 @@ public void setToolTipText(final String tooltip) { if (tooltip != null && !tooltip.isEmpty()) { final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); - if (key == null) { - button.setTitle(tooltip); - } else { - button.setTitle(tooltip + key.toString()); - } + Tooltip.to(button, key == null ? tooltip : tooltip + key.toString()); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -87,11 +87,7 @@ @Override public void setToolTipText(final String tooltip) { final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); - if (key == null) { - iconLabel.setTitle(tooltip); - } else { - iconLabel.setTitle(tooltip + key.toString()); - } + iconLabel.setTooltip(key == null ? tooltip : tooltip + key.toString()); } @Override Copied: trunk/src/main/java/cc/kune/common/client/notify/ConfirmAskEvent.java (from rev 1304, trunk/src/main/java/cc/kune/common/client/noti/ConfirmAskEvent.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/notify/ConfirmAskEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/notify/ConfirmAskEvent.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -0,0 +1,214 @@ +/* + * + * 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 + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.notify; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.event.shared.HasHandlers; + +public class ConfirmAskEvent extends GwtEvent<ConfirmAskEvent.ConfirmAskHandler> { + + public interface ConfirmAskHandler extends EventHandler { + public void onConfirmAsk(ConfirmAskEvent event); + } + + public interface HasConfirmAskHandlers extends HasHandlers { + HandlerRegistration addConfirmAskHandler(ConfirmAskHandler handler); + } + + private static final Type<ConfirmAskHandler> TYPE = new Type<ConfirmAskHandler>(); + + public static void fire(final HasHandlers source, final java.lang.String message) { + source.fireEvent(new ConfirmAskEvent(message)); + } + + public static void fire(final HasHandlers source, final java.lang.String title, final java.lang.String message, + final java.lang.String acceptBtnMsg, final java.lang.String cancelBtnMsg, + final java.lang.String acceptBtnTooltip, final java.lang.String cancelBtnTooltip, + final cc.kune.common.client.utils.SimpleCallback callback) { + source.fireEvent(new ConfirmAskEvent(title, message, acceptBtnMsg, cancelBtnMsg, acceptBtnTooltip, + cancelBtnTooltip, callback)); + } + + public static Type<ConfirmAskHandler> getType() { + return TYPE; + } + + java.lang.String acceptBtnMsg; + java.lang.String acceptBtnTooltip; + cc.kune.common.client.utils.SimpleCallback callback; + java.lang.String cancelBtnMsg; + java.lang.String cancelBtnTooltip; + java.lang.String message; + java.lang.String title; + + protected ConfirmAskEvent() { + // Possibly for serialization. + } + + public ConfirmAskEvent(final java.lang.String message) { + this.message = message; + } + + public ConfirmAskEvent(final java.lang.String title, final java.lang.String message, + final java.lang.String acceptBtnMsg, final java.lang.String cancelBtnMsg, + final cc.kune.common.client.utils.SimpleCallback callback) { + this.title = title; + this.message = message; + this.acceptBtnMsg = acceptBtnMsg; + this.cancelBtnMsg = cancelBtnMsg; + this.callback = callback; + } + + public ConfirmAskEvent(final java.lang.String title, final java.lang.String message, + final java.lang.String acceptBtnMsg, final java.lang.String cancelBtnMsg, + final java.lang.String acceptBtnTooltip, final java.lang.String cancelBtnTooltip, + final cc.kune.common.client.utils.SimpleCallback callback) { + this.title = title; + this.message = message; + this.acceptBtnMsg = acceptBtnMsg; + this.cancelBtnMsg = cancelBtnMsg; + this.acceptBtnTooltip = acceptBtnTooltip; + this.cancelBtnTooltip = cancelBtnTooltip; + this.callback = callback; + } + + @Override + protected void dispatch(final ConfirmAskHandler handler) { + handler.onConfirmAsk(this); + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final ConfirmAskEvent other = (ConfirmAskEvent) obj; + if (title == null) { + if (other.title != null) { + return false; + } + } else if (!title.equals(other.title)) { + return false; + } + if (message == null) { + if (other.message != null) { + return false; + } + } else if (!message.equals(other.message)) { + return false; + } + if (acceptBtnMsg == null) { + if (other.acceptBtnMsg != null) { + return false; + } + } else if (!acceptBtnMsg.equals(other.acceptBtnMsg)) { + return false; + } + if (cancelBtnMsg == null) { + if (other.cancelBtnMsg != null) { + return false; + } + } else if (!cancelBtnMsg.equals(other.cancelBtnMsg)) { + return false; + } + if (acceptBtnTooltip == null) { + if (other.acceptBtnTooltip != null) { + return false; + } + } else if (!acceptBtnTooltip.equals(other.acceptBtnTooltip)) { + return false; + } + if (cancelBtnTooltip == null) { + if (other.cancelBtnTooltip != null) { + return false; + } + } else if (!cancelBtnTooltip.equals(other.cancelBtnTooltip)) { + return false; + } + if (callback == null) { + if (other.callback != null) { + return false; + } + } else if (!callback.equals(other.callback)) { + return false; + } + return true; + } + + public java.lang.String getAcceptBtnMsg() { + return acceptBtnMsg; + } + + public java.lang.String getAcceptBtnTooltip() { + return acceptBtnTooltip; + } + + @Override + public Type<ConfirmAskHandler> getAssociatedType() { + return TYPE; + } + + public cc.kune.common.client.utils.SimpleCallback getCallback() { + return callback; + } + + public java.lang.String getCancelBtnMsg() { + return cancelBtnMsg; + } + + public java.lang.String getCancelBtnTooltip() { + return cancelBtnTooltip; + } + + public java.lang.String getMessage() { + return message; + } + + public java.lang.String getTitle() { + return title; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + (title == null ? 1 : title.hashCode()); + hashCode = (hashCode * 37) + (message == null ? 1 : message.hashCode()); + hashCode = (hashCode * 37) + (acceptBtnMsg == null ? 1 : acceptBtnMsg.hashCode()); + hashCode = (hashCode * 37) + (cancelBtnMsg == null ? 1 : cancelBtnMsg.hashCode()); + hashCode = (hashCode * 37) + (acceptBtnTooltip == null ? 1 : acceptBtnTooltip.hashCode()); + hashCode = (hashCode * 37) + (cancelBtnTooltip == null ? 1 : cancelBtnTooltip.hashCode()); + hashCode = (hashCode * 37) + (callback == null ? 1 : callback.hashCode()); + return hashCode; + } + + @Override + public String toString() { + return "ConfirmAskEvent[" + title + "," + message + "," + acceptBtnMsg + "," + cancelBtnMsg + "," + + acceptBtnTooltip + "," + cancelBtnTooltip + "," + callback + "]"; + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/notify/ConfirmAskEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/common/client/notify/NotifyLevel.java (from rev 1304, trunk/src/main/java/cc/kune/common/client/noti/NotifyLevel.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/notify/NotifyLevel.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/notify/NotifyLevel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -0,0 +1,24 @@ +/* + * + * 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 + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.notify; + +public enum NotifyLevel { + info, important, veryImportant, error +} Property changes on: trunk/src/main/java/cc/kune/common/client/notify/NotifyLevel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/common/client/notify/NotifyLevelImages.java (from rev 1304, trunk/src/main/java/cc/kune/common/client/noti/NotifyLevelImages.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/notify/NotifyLevelImages.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/notify/NotifyLevelImages.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -0,0 +1,49 @@ +/* + * + * 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 + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.notify; + +import cc.kune.core.client.resources.CoreResources; + +import com.google.gwt.resources.client.ImageResource; +import com.google.inject.Inject; + +public class NotifyLevelImages { + + private final CoreResources images; + + @Inject + public NotifyLevelImages(final CoreResources images) { + this.images = images; + } + + public ImageResource getImage(final NotifyLevel level) { + switch (level) { + case info: + return images.info(); + case important: + return images.important(); + case veryImportant: + return images.alert(); + case error: + default: + return images.error(); + } + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/notify/NotifyLevelImages.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java (from rev 1304, trunk/src/main/java/cc/kune/common/client/noti/NotifyUser.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -0,0 +1,118 @@ +/* + * + * 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 + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.notify; + +import cc.kune.common.client.utils.SimpleCallback; +import cc.kune.core.client.notify.msgs.UserNotifyEvent; +import cc.kune.core.client.notify.spiner.ProgressHideEvent; +import cc.kune.core.client.notify.spiner.ProgressShowEvent; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.event.shared.EventBus; + +public class NotifyUser { + private static EventBus eventBus; + private static I18nTranslationService i18n; + private static SimpleCallback onOk; + + public static void askConfirmation(final String tittle, final String message, final SimpleCallback callback) { + eventBus.fireEvent(new ConfirmAskEvent(tittle, message, i18n.t("Yes"), i18n.t("No"), callback)); + } + + public static void error(final String message) { + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, message)); + } + + public static void error(final String message, final boolean closeable) { + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, message, closeable)); + } + + public static void error(final String message, final String title, final boolean closeable) { + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, message, title, closeable)); + } + + public static void error(final String message, final String title, final String id, final boolean closeable) { + final UserNotifyEvent event = new UserNotifyEvent(NotifyLevel.error, message, id, closeable); + event.setId(id); + eventBus.fireEvent(event); + } + + public static void hideProgress() { + eventBus.fireEvent(new ProgressHideEvent()); + } + + public static void important(final String message) { + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.important, message)); + } + + public static void info(final String message) { + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.info, message)); + } + + public static void info(final String message, final boolean closeable) { + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.info, message, closeable)); + } + + public static void init(final EventBus eventBus, final I18nTranslationService i18n) { + NotifyUser.eventBus = eventBus; + NotifyUser.i18n = i18n; + onOk = new SimpleCallback() { + + @Override + public void onCancel() { + // Do nothing + } + + @Override + public void onSuccess() { + // Do nothing + } + }; + + } + + public static void showAlertMessage(final String title, final String message) { + showAlertMessage(title, message, onOk); + } + + public static void showAlertMessage(final String title, final String message, final SimpleCallback callback) { + eventBus.fireEvent(new ConfirmAskEvent(title, message, i18n.t("Ok"), "", callback)); + } + + public static void showProgress() { + eventBus.fireEvent(new ProgressShowEvent("")); + } + + public static void showProgress(final String text) { + eventBus.fireEvent(new ProgressShowEvent(text)); + } + + public static void showProgressLoading() { + eventBus.fireEvent(new ProgressShowEvent()); + } + + public static void showProgressProcessing() { + eventBus.fireEvent(new ProgressShowEvent()); + } + + public static void veryImportant(final String message) { + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.veryImportant, message)); + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/notify/NotifyUser.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -0,0 +1,154 @@ +package cc.kune.common.client.tooltip; + +import cc.kune.common.client.utils.TextUtils; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.Style.Unit; +import com.google.gwt.event.dom.client.MouseOutEvent; +import com.google.gwt.event.dom.client.MouseOutHandler; +import com.google.gwt.event.dom.client.MouseOverEvent; +import com.google.gwt.event.dom.client.MouseOverHandler; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.HTMLPanel; +import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.PopupPanel; +import com.google.gwt.user.client.ui.Widget; + +public class Tooltip extends PopupPanel { + + interface TooltipUiBinder extends UiBinder<Widget, Tooltip> { + } + + private static TooltipUiBinder uiBinder = GWT.create(TooltipUiBinder.class); + + public static Tooltip to(final Widget widget, final String text) { + if (TextUtils.notEmpty(text)) { + final Tooltip tip = new Tooltip(); + tip.to(widget); + tip.setText(text); + return tip; + } + return null; + } + + public static Tooltip to(final Widget widget, final Widget withContent) { + final Tooltip tip = new Tooltip(); + tip.to(widget); + tip.setContent(withContent); + return tip; + } + @UiField + HTMLPanel arrow; + @UiField + HTMLPanel arrowBorder; + @UiField + FlowPanel content; + @UiField + FlowPanel flow; + private final boolean isOver; + private Widget ofWidget; + private final Timer timer; + @UiField + InlineLabel title; + @UiField + HTMLPanel tooltip; + + public Tooltip() { + super.add(uiBinder.createAndBindUi(this)); + super.setAutoHideEnabled(false); + super.setAnimationEnabled(false); + isOver = false; + timer = new Timer() { + + @Override + public void run() { + hide(); + } + }; + } + + protected int getHeight() { + return tooltip.getElement().getOffsetHeight(); + } + + protected int getWidth() { + return tooltip.getElement().getOffsetWidth(); + } + + private void setContent(final Widget widget) { + content.clear(); + content.add(widget); + } + + private void setText(final String text) { + content.clear(); + content.add(new Label(text)); + } + + @Override + public void show() { + if (!Tooltip.this.isShowing()) { + Tooltip.super.show(); + Tooltip.this.showAt(TooltipPositionCalculator.calculate(Window.getClientWidth(), Window.getClientHeight(), + ofWidget.getAbsoluteLeft(), ofWidget.getAbsoluteTop(), ofWidget.getOffsetWidth(), + ofWidget.getOffsetHeight(), Tooltip.this.getWidth(), Tooltip.this.getHeight())); + if (tooltip.getOffsetWidth() > 430) { + tooltip.getElement().getStyle().setWidth(430, Unit.PX); + } else { + tooltip.getElement().getStyle().clearWidth(); + } + } + } + + protected void showAt(final TooltipPosition position) { + this.setPopupPosition(position.getLeft(), position.getTop()); + switch (position.getArrowPosition()) { + case N: + case NW: + case NE: + arrow.getElement().getStyle().setLeft(position.getArrowLeft(), Unit.PX); + arrow.getElement().getStyle().setTop(position.getArrowTop() + 3, Unit.PX); + arrowBorder.getElement().getStyle().setLeft(position.getArrowLeft(), Unit.PX); + arrowBorder.getElement().getStyle().setTop(position.getArrowTop() + 1, Unit.PX); + arrow.getElement().removeClassName("k-tooltip-arrow-s"); + arrow.getElement().addClassName("k-tooltip-arrow-n"); + arrowBorder.getElement().removeClassName("k-tooltip-arrow-border-s"); + arrowBorder.getElement().addClassName("k-tooltip-arrow-border-n"); + break; + case S: + case SE: + case SW: + arrow.getElement().getStyle().setLeft(position.getArrowLeft(), Unit.PX); + arrow.getElement().getStyle().setBottom(position.getArrowTop() + 2, Unit.PX); + arrowBorder.getElement().getStyle().setLeft(position.getArrowLeft(), Unit.PX); + arrowBorder.getElement().getStyle().setBottom(position.getArrowTop(), Unit.PX); + arrow.getElement().addClassName("k-tooltip-arrow-s"); + arrow.getElement().removeClassName("k-tooltip-arrow-n"); + arrowBorder.getElement().addClassName("k-tooltip-arrow-border-s"); + arrowBorder.getElement().removeClassName("k-tooltip-arrow-border-n"); + break; + } + } + + private void to(final Widget ofWidget) { + this.ofWidget = ofWidget; + ofWidget.addDomHandler(new MouseOverHandler() { + @Override + public void onMouseOver(final MouseOverEvent event) { + timer.cancel(); + show(); + } + }, MouseOverEvent.getType()); + ofWidget.addDomHandler(new MouseOutHandler() { + @Override + public void onMouseOut(final MouseOutEvent event) { + timer.schedule(750); + } + }, MouseOutEvent.getType()); + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.ui.xml 2011-04-12 18:38:37 UTC (rev 1307) @@ -0,0 +1,17 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <ui:style> + </ui:style> + <g:HTMLPanel> + <g:HTMLPanel ui:field="tooltip" + addStyleNames="k-tooltip, k-3corners, k-box-3shadow"> + <g:FlowPanel ui:field="flow"> + <g:InlineLabel ui:field="title" /> + <g:FlowPanel ui:field="content" /> + </g:FlowPanel> + </g:HTMLPanel> + <g:HTMLPanel ui:field="arrowBorder" styleName="k-tooltip-arrow-border" /> + <g:HTMLPanel ui:field="arrow" styleName="k-tooltip-arrow" /> + </g:HTMLPanel> +</ui:UiBinder> \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/common/client/tooltip/Tooltip.ui.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPosition.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPosition.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPosition.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -0,0 +1,69 @@ +package cc.kune.common.client.tooltip; + +public class TooltipPosition { + + public enum ArrowPosition { + E, N, NE, NW, S, SE, SW, W + } + + public static final int ARROW_DEF_MARGIN = 10; + public static final int ARROW_SIZE = 7; + public static final int TOOLTIP_DISTANCE = 7; + + private int arrowLeft; + private ArrowPosition arrowPosition; + private int arrowTop; + private int left; + private int top; + + public TooltipPosition(final int left, final int top, final ArrowPosition arrowPosition, final int arrowLeft, + final int arrowTop) { + super(); + this.left = left; + this.top = top; + this.arrowPosition = arrowPosition; + this.arrowLeft = arrowLeft; + this.arrowTop = arrowTop; + } + + public int getArrowLeft() { + return arrowLeft; + } + + public ArrowPosition getArrowPosition() { + return arrowPosition; + } + + public int getArrowTop() { + return arrowTop; + } + + public int getLeft() { + return left; + } + + public int getTop() { + return top; + } + + public void setArrowLeft(final int arrowLeft) { + this.arrowLeft = arrowLeft; + } + + public void setArrowPosition(final ArrowPosition arrowPosition) { + this.arrowPosition = arrowPosition; + } + + public void setArrowTop(final int arrowTop) { + this.arrowTop = arrowTop; + } + + public void setLeft(final int left) { + this.left = left; + } + + public void setTop(final int top) { + this.top = top; + } + +} Property changes on: trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPosition.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPositionCalculator.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPositionCalculator.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPositionCalculator.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -0,0 +1,67 @@ +package cc.kune.common.client.tooltip; + +import cc.kune.common.client.tooltip.TooltipPosition.ArrowPosition; + +public class TooltipPositionCalculator { + + public static TooltipPosition calculate(final int windowWitdh, final int windowHeight, final int widgetLeft, + final int widgetTop, final int widgetWidth, final int widgetHeight, final int tooltipWidth, + final int tooltipHeight) { + // GWT.log("ww: " + windowWitdh + " wh: " + windowHeight + " widL: " + + // widgetLeft + " widT: " + widgetTop + // + " widW: " + widgetWidth + " widH: " + widgetHeight + " tW: " + + // tooltipWidth + " tH: " + tooltipHeight); + final boolean overflowsWidth = overflowsWidth(windowWitdh, widgetLeft, tooltipWidth); + final boolean overflowsHeight = overflowsHeight(windowHeight, widgetTop, tooltipHeight); + // GWT.log("ow: " + overflowsWidth + " oH: " + overflowsHeight); + if (overflowsWidth && overflowsHeight) { + // esta es mezcla de las anteriores (y falta) + return new TooltipPosition(leftOverflow(widgetLeft, widgetWidth, tooltipWidth), widgetTop - tooltipHeight + - TooltipPosition.TOOLTIP_DISTANCE, ArrowPosition.SE, leftArrowOverflow(tooltipWidth), -2 + * TooltipPosition.ARROW_SIZE); + } else if (overflowsHeight) { + return new TooltipPosition(leftNoOverflow(widgetLeft), widgetTop - tooltipHeight + - TooltipPosition.TOOLTIP_DISTANCE, ArrowPosition.SW, 0, -2 * TooltipPosition.ARROW_SIZE); + } else if (overflowsWidth) { + return new TooltipPosition(leftOverflow(widgetLeft, widgetWidth, tooltipWidth), topNoOverflow(widgetTop, + widgetHeight), ArrowPosition.NE, leftArrowOverflow(tooltipWidth), -2 * TooltipPosition.ARROW_SIZE + - 1); + // 10 in the border width + } else if (overflowsHeight) { + return new TooltipPosition(onTopPositionTop(widgetLeft, widgetWidth), widgetTop - tooltipHeight + - TooltipPosition.TOOLTIP_DISTANCE, ArrowPosition.SW, TooltipPosition.ARROW_DEF_MARGIN, 0); + } else { + // Don't overflow + return new TooltipPosition(leftNoOverflow(widgetLeft), topNoOverflow(widgetTop, widgetHeight), + ArrowPosition.NW, TooltipPosition.ARROW_DEF_MARGIN, -2 * TooltipPosition.ARROW_SIZE - 1); + } + } + + private static int leftArrowOverflow(final int tooltipWidth) { + return tooltipWidth - TooltipPosition.ARROW_DEF_MARGIN - 2 * 10; + } + + private static int leftNoOverflow(final int widgetLeft) { + return widgetLeft; + } + + private static int leftOverflow(final int widgetLeft, final int widgetWidth, final int tooltipWidth) { + return widgetLeft + widgetWidth - tooltipWidth - TooltipPosition.TOOLTIP_DISTANCE; + } + + private static int onTopPositionTop(final int widgetTop, final int widgetHeight) { + return topNoOverflow(widgetTop, widgetHeight); + } + + private static boolean overflowsHeight(final int windowHeight, final int widgetTop, final int tooltipHeight) { + return widgetTop + TooltipPosition.TOOLTIP_DISTANCE + tooltipHeight > windowHeight; + } + + private static boolean overflowsWidth(final int windowWitdh, final int widgetLeft, final int tooltipWidth) { + return widgetLeft + TooltipPosition.TOOLTIP_DISTANCE + tooltipWidth > windowWitdh; + } + + private static int topNoOverflow(final int widgetTop, final int widgetHeight) { + return widgetTop + widgetHeight + TooltipPosition.TOOLTIP_DISTANCE; + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/tooltip/TooltipPositionCalculator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,6 +19,7 @@ */ package cc.kune.common.client.ui; +import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.utils.TextUtils; import com.google.gwt.event.dom.client.ClickHandler; @@ -135,7 +136,7 @@ } public void setTooltip(final String tipTitle, final String tip) { - image.setTitle(tip); - label.setTitle(tip); + Tooltip.to(image, tip); + Tooltip.to(label, tip); } } Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -21,6 +21,8 @@ import java.util.Iterator; +import cc.kune.common.client.tooltip.Tooltip; + import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.i18n.client.HasDirection.Direction; @@ -150,4 +152,10 @@ public void setText(final String text, final Direction dir) { label.setText(text, dir); } + + public void setTooltip(final String text) { + Tooltip.to(label, text); + // Tooltip.to(iconRight, text); + // Tooltip.to(iconLeft, text); + } } Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-04-12 18:38:37 UTC (rev 1307) @@ -21,21 +21,21 @@ } .k-opacity80 { - kfilter: alpha(opacity = 80); + kfilter: alpha(opacity = 80); -moz-opacity: 0.80; -khtml-opacity: 0.80; opacity: 0.80; } .k-opacity90 { - kfilter: alpha(opacity = 90); + kfilter: alpha(opacity = 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; } .k-opacity95 { - kfilter: alpha(opacity = 95); + kfilter: alpha(opacity = 95); -moz-opacity: 0.95; -khtml-opacity: 0.95; opacity: 0.95; @@ -43,13 +43,19 @@ .gwt-PopupPanelGlass { background-color: #f7ebe3 !important; - kfilter: alpha(opacity = 68) + kfilter: alpha(opacity = 68) !important; -moz-opacity: 0.68 !important; -khtml-opacity: 0.68 !important; opacity: 0.68 !important; } +.k-box-3shadow { + -webkit-box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5); + box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5); +} + .k-box-5shadow { -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); @@ -279,7 +285,7 @@ -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px; border-bottom-left-radius: 5px; - kfilter: alpha(opacity = 90); + kfilter: alpha(opacity = 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; @@ -469,4 +475,54 @@ .gwt-Button { background: url("images/hborder.png") repeat-x scroll 0 -27px transparent; -} \ No newline at end of file +} + +/* tooltips, adaptation of http://jonrohan.me/guide/css/creating-triangles-in-css/ */ +.k-tooltip { + background-color: #FEFFF1; + border: 2px solid #666666; + line-height: 1.3em; + padding: 5px; +} + +.k-tooltip-arrow-border { + border-style: solid; + border-width: 7px; + height: 0; + width: 0; + position: absolute; +} + +.k-tooltip-arrow-border-n { + border-color: transparent transparent #666666 transparent; +} + +.k-tooltip-arrow-border-s { + border-color: #666666 transparent transparent transparent; +} + +.k-tooltip-arrow { + border-style: solid; + border-width: 7px; + height: 0; + width: 0; + position: absolute; +} + +.k-tooltip-arrow-n { + border-color: transparent transparent #FEFFF1 transparent; +} + +.k-tooltip-arrow-s { + border-color: #FEFFF1 transparent transparent transparent; +} + +/* IE6 */ +.k-tooltip-arrow { + _border-left-color: pink; + _border-bottom-color: pink; + _border-right-color: pink; + _filter: chroma(color = pink); +} + +/* end tooltip */ \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.auth; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.MaskWidgetView; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.state.Session; Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -21,8 +21,8 @@ import cc.kune.common.client.errors.UIException; import cc.kune.common.client.log.Log; -import cc.kune.common.client.noti.NotifyLevel; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.errors.EmailAddressInUseException; import cc.kune.core.client.errors.GroupNameInUseException; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignIn.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignIn.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/auth/SignIn.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.auth; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,8 +19,8 @@ */ package cc.kune.core.client.auth; -import cc.kune.common.client.noti.NotifyLevel; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.MaskWidgetView; import cc.kune.core.client.ui.dialogs.BasicTopDialog; import cc.kune.core.client.ui.dialogs.MessageToolbar; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractView.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractView.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.auth; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.logical.shared.HasCloseHandlers; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.auth; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.MaskWidgetView; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ui.KuneUiUtils; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -20,7 +20,7 @@ package cc.kune.core.client.auth; import cc.kune.common.client.log.Log; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.utils.TextUtils; import cc.kune.common.client.utils.TimerWrapper; import cc.kune.common.client.utils.TimerWrapper.Executer; Modified: trunk/src/main/java/cc/kune/core/client/auth/WaveClientSimpleAuthenticator.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/WaveClientSimpleAuthenticator.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/auth/WaveClientSimpleAuthenticator.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -1,7 +1,7 @@ package cc.kune.core.client.auth; import cc.kune.common.client.log.Log; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.gspace.client.WsArmor; import com.google.gwt.http.client.Request; Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -20,8 +20,8 @@ package cc.kune.core.client.errors; import cc.kune.common.client.log.Log; -import cc.kune.common.client.noti.NotifyLevel; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.state.Session; 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-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,8 +19,8 @@ */ package cc.kune.core.client.groups.newgroup; -import cc.kune.common.client.noti.NotifyLevel; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.ui.MaskWidgetView; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ui.DefaultFormUtils; @@ -79,7 +79,7 @@ @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, + dialog = new BasicTopDialog(NEWGROUP_WIZARD, CoreMessages.REGISTER_A_NEW_GROUP_TITLE, false, true, true, 450, 360, "k-newgroup-icon", i18n.t("Register"), REGISTER_BUTTON, i18n.t("Cancel"), CANCEL_BUTTON, 9); this.i18n = i18n; this.mask = mask; @@ -205,6 +205,7 @@ shortNameField.focus(); } + @Override public HasCloseHandlers<PopupPanel> getClose() { return dialog.getClose(); } 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-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -20,8 +20,8 @@ package cc.kune.core.client.groups.newgroup; import cc.kune.common.client.errors.UIException; -import cc.kune.common.client.noti.NotifyLevel; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.errors.GroupNameInUseException; import cc.kune.core.client.resources.CoreMessages; 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-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupView.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.groups.newgroup; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.logical.shared.HasCloseHandlers; Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -20,7 +20,7 @@ package cc.kune.core.client.init; import cc.kune.common.client.log.Log; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.rpcservices.SiteServiceAsync; Modified: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.notify.confirm; -import cc.kune.common.client.noti.ConfirmAskEvent; +import cc.kune.common.client.notify.ConfirmAskEvent; import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmView; import cc.kune.core.client.ui.dialogs.BasicTopDialog; Modified: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPresenter.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.notify.confirm; -import cc.kune.common.client.noti.ConfirmAskEvent; +import cc.kune.common.client.notify.ConfirmAskEvent; import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmProxy; import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmView; Modified: trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.notify.msgs; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.GwtEvent; Modified: trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerViewImpl.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerViewImpl.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -53,12 +53,12 @@ Widget widget; @Inject - public SpinerViewImpl(EventBus eventBus) { + public SpinerViewImpl(final EventBus eventBus) { super(eventBus); widget = uiBinder.createAndBindUi(this); popup = new PopupPanel(false, false); popup.add(widget); - popup.setPopupPosition(0, 0); + popup.setPopupPosition(200, 0); popup.setStyleName("k-spiner-popup"); popup.show(); } @@ -74,7 +74,7 @@ } @Override - public void show(String message) { + public void show(final String message) { if (message == null || message.isEmpty()) { label.setText(""); } else { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -61,7 +61,7 @@ @Override public void onClick() { - stateManager.gotoHistoryToken(SiteTokens.GROUP_HOME); + stateManager.gotoHistoryToken(SiteTokens.HOME); } @Override 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-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.sitebar.spaces; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SiteTokens; @@ -57,6 +57,8 @@ HasClickHandlers getUserBtn(); + void hideTooltip(); + void setGroupBtnDown(boolean down); void setHomeBtnDown(boolean down); @@ -64,6 +66,8 @@ void setPublicBtnDown(boolean down); void setUserBtnDown(boolean down); + + void showTooltip(); } private final WsArmor armor; @@ -184,6 +188,7 @@ default: break; } + // getView().hideTooltip(); } } @@ -216,4 +221,8 @@ protected void revealInParent() { RevealRootContentEvent.fire(this, this); } + + public void showTooltip() { + getView().showTooltip(); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,17 +19,20 @@ */ package cc.kune.core.client.sitebar.spaces; +import cc.kune.common.client.tooltip.Tooltip; import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter.SpaceSelectorView; -import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.WsArmor; +import cc.kune.gspace.client.resources.WsArmorResources; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.HasClickHandlers; -import com.google.gwt.event.shared.EventBus; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Grid; import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ToggleButton; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; @@ -39,30 +42,35 @@ interface SpaceSelectorViewImplUiBinder extends UiBinder<Widget, SpaceSelectorViewImpl> { } private static SpaceSelectorViewImplUiBinder uiBinder = GWT.create(SpaceSelectorViewImplUiBinder.class); - private final EventBus eventBus; @UiField ToggleButton groupButton; @UiField ToggleButton homeButton; @UiField HorizontalPanel panel; - @UiField ToggleButton publicButton; - private final StateManager stateManager; + private final Tooltip tooltip; @UiField ToggleButton userButton; @Inject - public SpaceSelectorViewImpl(final WsArmor armor, final I18nTranslationService i18n, - final StateManager stateManager, final EventBus eventBus) { - this.stateManager = stateManager; - this.eventBus = eventBus; + public SpaceSelectorViewImpl(final WsArmor armor, final I18nTranslationService i18n, final WsArmorResources res) { armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0); - homeButton.setTitle(i18n.t("Home page of this site")); - userButton.setTitle(i18n.t("User space: Waves (docs) in which you participate")); - groupButton.setTitle(i18n.t("Group and personal space: Where you can create and publish contents for your personal or group spaces")); - publicButton.setTitle(i18n.t("Public space: This is only a preview of how this page looks like to the general public on the web, outside this site")); + final Grid grid = new Grid(4, 2); + grid.setWidget(0, 1, new Label(i18n.t("Home page of this site"))); + grid.setWidget(1, 1, new Label(i18n.t("User space: it shows a list of all your documents and contents " + + "in which you participate"))); + grid.setWidget(2, 1, new Label(i18n.t("Group and personal space: Where you can create " + + "and publish contents for your personal or group web spaces"))); + grid.setWidget(3, 1, new Label(i18n.t("Public space: In this space you can see a preview of how the Personal o" + + "r Group Space looks like on the web, outside this site"))); + grid.setWidget(0, 0, new Image(res.homeSpaceEnabled())); + grid.setWidget(1, 0, new Image(res.userSpaceEnabled())); + grid.setWidget(2, 0, new Image(res.groupSpaceEnabled())); + grid.setWidget(3, 0, new Image(res.publicSpaceEnabled())); + grid.addStyleName("k-space-tooltip"); + tooltip = Tooltip.to(panel, grid); } @Override @@ -91,6 +99,11 @@ } @Override + public void hideTooltip() { + tooltip.hide(); + } + + @Override public void setGroupBtnDown(final boolean down) { groupButton.setDown(down); } @@ -110,4 +123,8 @@ userButton.setDown(down); } + @Override + public void showTooltip() { + tooltip.show(); + } } Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -8,6 +8,7 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.BasicThumb; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.WsArmor; @@ -92,6 +93,11 @@ return widget; } + protected void setTooltip(DockLayoutPanel panel, String title) { + Tooltip.to(panel, title); + } + + public void clear() { trdCategoryFlow.clear(); firstCategoryFlow.clear(); Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -3,6 +3,7 @@ import cc.kune.common.client.actions.ui.ActionFlowPanel; import cc.kune.common.client.actions.ui.bind.GuiProvider; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.BasicThumb; import cc.kune.core.client.sn.GroupSNPresenter.GroupSNView; import cc.kune.core.shared.dto.GroupDTO; @@ -18,13 +19,13 @@ super(i18n, guiProvider, armor); setVisible(false); mainTitle.setText(i18n.t("Group members")); - mainTitle.setTitle(i18n.t("People and groups collaborating in this group")); + Tooltip.to(mainTitle, i18n.t("People and groups collaborating in this group")); firstCategoryLabel.setText(i18n.t("Admins")); - firstCategoryPanel.setTitle(i18n.t("People that can admin this group")); + setTooltip(firstCategoryPanel, i18n.t("People that can admin this group")); sndCategoryLabel.setText(i18n.t("Collaborators")); - sndCategoryPanel.setTitle(i18n.t("Other people that collaborate with this group")); + setTooltip(sndCategoryPanel, i18n.t("Other people that collaborate with this group")); trdCategoryLabel.setText(i18n.t("Pending")); - trdCategoryPanel.setTitle(i18n.t("People pending to be accepted in this group by the admins")); + setTooltip(trdCategoryPanel, i18n.t("People pending to be accepted in this group by the admins")); sndDeckLabel.setText(i18n.t("This is an orphaned project, if you are interested please request to join to work on it")); firstDeckLabel.setText(i18n.t("The members of this group are not public")); bottomActionsToolbar = new ActionFlowPanel(guiProvider); Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -22,12 +22,12 @@ mainTitle.setText(i18n.t("His/her network:")); mainTitle.setTitle(i18n.t("This user buddies and groups where participes")); firstCategoryLabel.setText(i18n.t("Buddies")); - firstCategoryPanel.setTitle(i18n.t("This user buddies")); + setTooltip(firstCategoryPanel, i18n.t("This user buddies")); sndCategoryLabel.setText(i18n.t("Participates in")); - sndCategoryPanel.setTitle(i18n.t("Groups in which this user participates")); + setTooltip(sndCategoryPanel, i18n.t("Groups in which this user participates")); firstDeckLabel.setText(i18n.t(CoreMessages.BUDDIES_NOT_PUBLIC)); trdCategoryLabel.setText("NOT USED"); - trdCategoryLabel.setTitle("NOT USED"); + setTooltip(trdCategoryPanel, "NOT USED"); super.setTrdCategoryVisible(false); sndDeckLabel.setText("NOT USED"); bottomActionsToolbar = new ActionFlowPanel(guiProvider); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AcceptJoinGroupAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -3,7 +3,7 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -3,7 +3,7 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -3,7 +3,7 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToCollabAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -3,7 +3,7 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/DenyJoinGroupAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -3,7 +3,7 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -2,7 +2,7 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/MembersModerationAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -2,7 +2,7 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/MembersVisibilityAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -2,7 +2,7 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/RemoveMemberAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -3,7 +3,7 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinGroupAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -2,7 +2,7 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.OnAcceptCallback; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UserSNVisibilityAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/UserSNVisibilityAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UserSNVisibilityAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -2,7 +2,7 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.Session; Modified: trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -27,6 +27,7 @@ import cc.kune.core.client.sitebar.AboutKuneDialog; import cc.kune.core.client.sitebar.spaces.Space; import cc.kune.core.client.sitebar.spaces.SpaceSelectEvent; +import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; @@ -38,16 +39,18 @@ private final Provider<NewGroup> newGroup; private final Provider<Register> register; private final Provider<SignIn> signIn; + private final Provider<SpaceSelectorPresenter> spaceSelector; @Inject public SiteTokenListeners(final Session session, final EventBus eventBus, final Provider<SignIn> signIn, final Provider<Register> register, final Provider<NewGroup> newGroup, - final Provider<AboutKuneDialog> aboutKuneDialog) { + final Provider<AboutKuneDialog> aboutKuneDialog, final Provider<SpaceSelectorPresenter> spaceSelector) { this.eventBus = eventBus; this.signIn = signIn; this.register = register; this.newGroup = newGroup; this.aboutKuneDialog = aboutKuneDialog; + this.spaceSelector = spaceSelector; init(); } @@ -56,6 +59,7 @@ @Override public void onHistoryToken() { SpaceSelectEvent.fire(eventBus, Space.homeSpace); + // spaceSelector.get().showTooltip(); } }); put(SiteTokens.WAVEINBOX, new HistoryTokenCallback() { Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessagePanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessagePanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessagePanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,8 +19,8 @@ */ package cc.kune.core.client.ui.dialogs; -import cc.kune.common.client.noti.NotifyLevel; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevelImages; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ImageResource; Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessagePanelView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessagePanelView.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessagePanelView.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.ui.dialogs; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; import com.google.gwt.user.client.ui.IsWidget; 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-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/MessageToolbar.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,8 +19,8 @@ */ package cc.kune.core.client.ui.dialogs; -import cc.kune.common.client.noti.NotifyLevel; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevelImages; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.Composite; Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-12 18:38:37 UTC (rev 1307) @@ -342,6 +342,9 @@ .kLoadingPanel { background-color: #FF9999; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; -webkit-border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; border-bottom-right-radius: 4px; @@ -357,6 +360,13 @@ padding: 0 5px 0 5px; } +.k-space-tooltip { + border-collapse: separate; + border-spacing: 5px; + vertical-align: middle; + line-height: 1.1em; +} + .k-space-sel { margin-right: 10px; background-color: #F2F2F2; @@ -399,8 +409,10 @@ padding: 1px 7px 0 0 !important; } -.k-sitebar-wave-status{ +.k-sitebar-wave-status { + } + .k-sitebar-wave-status-online { color: green; } @@ -882,10 +894,9 @@ padding: 10px; } -.k-sn-adminspanel { - /* background-color: #a05a2c; */ - border-bottom:2px solid #F7EBE3; - border-top:2px solid #F7EBE3; +.k-sn-adminspanel { /* background-color: #a05a2c; */ + border-bottom: 2px solid #F7EBE3; + border-top: 2px solid #F7EBE3; } .k-sn-collabspanel { @@ -1091,5 +1102,4 @@ .k-tool-item-notselected { background-color: inherits; -} - +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/docs/client/ContentRenameAction.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/ContentRenameAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/docs/client/ContentRenameAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -1,7 +1,7 @@ package cc.kune.docs.client; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.actions.RolAction; import cc.kune.core.shared.dto.AccessRolDTO; Modified: trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -137,7 +137,7 @@ content.setStatus(ContentStatus.publishedOnline); content.setPublishedOn(new Date()); group.setDefaultContent(content); - kuneWaveManager.createWave(user.getShortName(), i18n.t("About [%s]", longName)); + kuneWaveManager.createWave(user.getShortName(), "<h1>" + i18n.t("About [%s]" + "</h1>", longName)); return group; } Modified: trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPresenter.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -20,7 +20,7 @@ package cc.kune.gspace.client.tags; import cc.kune.common.client.log.Log; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateChangedEvent; import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; Modified: trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,9 +19,7 @@ */ package cc.kune.gspace.client.ui.footer.license; -import org.adamtacy.client.ui.effects.examples.Fade; -import org.adamtacy.client.ui.effects.examples.Show; - +import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.KuneWindowUtils; import cc.kune.core.shared.dto.LicenseDTO; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -29,14 +27,8 @@ import cc.kune.gspace.client.ui.footer.license.EntityLicensePresenter.EntityLicenseView; import com.google.gwt.event.dom.client.HasClickHandlers; -import com.google.gwt.event.dom.client.MouseOutEvent; -import com.google.gwt.event.dom.client.MouseOutHandler; -import com.google.gwt.event.dom.client.MouseOverEvent; -import com.google.gwt.event.dom.client.MouseOverHandler; -import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.gwtplatform.mvp.client.ViewImpl; @@ -44,39 +36,18 @@ public class EntityLicensePanel extends ViewImpl implements EntityLicenseView { public static final String LICENSE_LABEL = "k-elp-lic-lab"; private final I18nTranslationService i18n; - private final Element labelElement; private final FlowPanel licenseBar; private final Image licenseImage; - private final Label licenseLabel; @Inject public EntityLicensePanel(final I18nTranslationService i18n, final WsArmor armor) { this.i18n = i18n; licenseImage = new Image(); - licenseLabel = new Label("", false); licenseBar = new FlowPanel(); licenseBar.add(licenseImage); - licenseBar.add(licenseLabel); - licenseImage.addMouseOutHandler(new MouseOutHandler() { - @Override - public void onMouseOut(final MouseOutEvent event) { - // fade(false); - } - }); - licenseImage.addMouseOverHandler(new MouseOverHandler() { - @Override - public void onMouseOver(final MouseOverEvent event) { - show(); - } - }); licenseImage.addStyleName("k-footer-license-img"); - licenseLabel.addStyleName("k-footer-license-label"); - licenseLabel.setVisible(false); armor.getEntityFooter().add(licenseBar); - labelElement = licenseLabel.getElement(); - labelElement.getStyle().setOpacity(0); - licenseLabel.setVisible(true); } @Override @@ -94,43 +65,21 @@ licenseBar.setVisible(false); } - private void fade() { - if ("1".equals(labelElement.getStyle().getOpacity())) { - final Fade fade = new Fade(labelElement); - fade.setDuration(.5); - fade.play(); - } - } - @Override public HasClickHandlers getImage() { return licenseImage; } @Override - public HasClickHandlers getLabel() { - return licenseLabel; - } - - @Override public void openWindow(final String url) { KuneWindowUtils.open(url); } - private void show() { - if ("0".equals(labelElement.getStyle().getOpacity())) { - final Show show = new Show(labelElement); - show.setDuration(.5); - show.play(); - } - } - @Override public void showLicense(final String groupName, final LicenseDTO licenseDTO) { final String licenseText = i18n.t("© [%s], under license: [%s]", groupName, licenseDTO.getLongName()); - licenseLabel.setText(licenseText); // KuneUiUtils.setQuickTip(licenseLabel, licenseText); licenseImage.setUrl(licenseDTO.getImageUrl()); - fade(); + Tooltip.to(licenseImage, licenseText); } } Modified: trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePresenter.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -50,8 +50,6 @@ HasClickHandlers getImage(); - HasClickHandlers getLabel(); - void openWindow(String url); void showLicense(String groupName, LicenseDTO licenseDTO); @@ -84,7 +82,6 @@ } }; getView().getImage().addClickHandler(clickHandler); - getView().getLabel().addClickHandler(clickHandler); } @Override Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessage.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessage.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessage.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -24,7 +24,7 @@ import org.adamtacy.client.ui.effects.examples.Fade; import org.adamtacy.client.ui.effects.examples.Show; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.utils.TextUtils; import cc.kune.msgs.client.resources.UserMessageImages; Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,7 +19,7 @@ */ package cc.kune.msgs.client; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; import cc.kune.msgs.client.UserMessagesPresenter.UserMessagesView; import com.google.gwt.core.client.GWT; Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessagesPresenter.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessagesPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -19,7 +19,7 @@ */ package cc.kune.msgs.client; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; public class UserMessagesPresenter { Modified: trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -8,7 +8,7 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.IconLabelDescriptor; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.sitebar.SitebarActionsPresenter; import cc.kune.core.client.sn.actions.SessionAction; import cc.kune.core.client.state.Session; Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -59,7 +59,7 @@ import org.waveprotocol.wave.model.wave.ParticipantId; import org.waveprotocol.wave.model.waveref.WaveRef; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.sitebar.spaces.Space; import cc.kune.core.client.sitebar.spaces.SpaceConfEvent; import cc.kune.core.client.state.SiteTokens; Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -15,8 +15,13 @@ import org.waveprotocol.wave.model.version.HashedVersion; import org.waveprotocol.wave.model.wave.ParticipantId; +import cc.kune.common.client.utils.TextUtils; +import cc.kune.core.client.errors.DefaultException; + import com.google.inject.Inject; import com.google.inject.name.Named; +import com.google.wave.api.JsonRpcResponse; +import com.google.wave.api.Markup; import com.google.wave.api.OperationQueue; import com.google.wave.api.OperationRequest; import com.google.wave.api.ProtocolVersion; @@ -51,38 +56,39 @@ public void createWave(final String username, final String message) { final ParticipantId user = participantUtils.of(username); final OperationQueue opQueue = new OperationQueue(); - final Set<String> users = new HashSet<String>(); - users.add(user.toString()); - final Wavelet newWavelet = opQueue.createWavelet(domain, users, message); - // opQueue.appendBlipToWavelet(newWavelet, "kk2"); - // final Markup markup = Markup.of(message); - // opQueue.modifyTagOfWavelet(newWavelet, "tag", "add"); + final Set<String> participants = new HashSet<String>(); + participants.add(user.toString()); + final Wavelet newWavelet = opQueue.createWavelet(domain, participants); + // newWavelet.getRootBlip().append(Markup.of(message)); + opQueue.appendMarkupToDocument(newWavelet.getRootBlip(), Markup.of(message).getMarkup()); - // newWavelet.getRootBlip().appendMarkup(markup.getMarkup()); - // opQueue.createChildOfBlip(newWavelet.getRootBlip()); - // opQueue.appendBlipToWavelet(newWavelet, message); - // opQueue.appendBlipToWavelet(newWavelet, message); - // opQueue.appendMarkupToDocument(null, message) - // opQueue.modifyDocument(null) - assert newWavelet.getRootBlip() != null; final OperationContextImpl context = new OperationContextImpl(waveletProvider, converterManager.getEventDataConverter(ProtocolVersion.DEFAULT), conversationUtil); + for (final OperationRequest req : opQueue.getPendingOperations()) { OperationUtil.executeOperation(req, operationRegistry, context, user); final String reqId = req.getId(); - if (context.getResponse(reqId).isError()) { - LOG.error(context.getResponse(reqId).getErrorMessage()); + final JsonRpcResponse response = context.getResponse(reqId); + if (response != null && response.isError()) { + onFailure(context.getResponse(reqId).getErrorMessage()); } - OperationUtil.submitDeltas(context, waveletProvider, new SubmitRequestListener() { - @Override - public void onFailure(final String arg0) { - LOG.error("Wave creation failed: " + arg0); - } + } + OperationUtil.submitDeltas(context, waveletProvider, new SubmitRequestListener() { + @Override + public void onFailure(final String arg0) { + KuneWaveManagerDefault.this.onFailure("Wave creation failed, onFailure: " + arg0); + } - @Override - public void onSuccess(final int arg0, final HashedVersion arg1, final long arg2) { - } - }); - } + @Override + public void onSuccess(final int arg0, final HashedVersion arg1, final long arg2) { + LOG.info("Wave creation success: " + arg1); + } + }); } + + private void onFailure(final String message) { + final String errorMsg = TextUtils.notEmpty(message) ? message : "Wave operation failed"; + LOG.error(errorMsg); + throw new DefaultException(errorMsg); + } } Modified: trunk/src/main/java/com/example/client/HelloWorldActions.java =================================================================== --- trunk/src/main/java/com/example/client/HelloWorldActions.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/com/example/client/HelloWorldActions.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -4,7 +4,7 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sitebar.SiteUserOptions; import cc.kune.core.client.sitebar.SitebarActions; Modified: trunk/src/main/java/com/example/client/HelloWorldPanel.java =================================================================== --- trunk/src/main/java/com/example/client/HelloWorldPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/com/example/client/HelloWorldPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -1,6 +1,6 @@ package com.example.client; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import com.example.client.HelloWorldPresenter.HelloWorldView; import com.google.gwt.core.client.GWT; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -92,7 +92,7 @@ import org.ourproject.kune.platf.client.ui.rte.saving.RTESavingEditorPanel; import org.ourproject.kune.platf.client.ui.rte.saving.RTESavingEditorPresenter; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.common.client.utils.SchedulerManager; import cc.kune.common.client.utils.TimerWrapper; import cc.kune.core.client.errors.ErrorHandler; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialog.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialog.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.View; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; public interface AbstractTabbedDialog { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -25,8 +25,8 @@ import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; -import cc.kune.common.client.noti.NotifyLevel; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.core.client.ui.dialogs.MessageToolbar; import com.allen_sauer.gwt.log.client.Log; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.View; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; public abstract class AbstractTabbedDialogPresenter implements AbstractTabbedDialog { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/tabbed/AbstractTabbedDialogView.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.View; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; public interface AbstractTabbedDialogView extends View { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -22,8 +22,8 @@ import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; -import cc.kune.common.client.noti.NotifyLevel; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.user.client.Window; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -23,7 +23,7 @@ import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPresenter; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; import cc.kune.core.shared.dto.ExtMediaDescripDTO; public class InsertMediaExtPresenter extends InsertMediaAbstractPresenter implements InsertMediaExt { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.core.shared.i18n.I18nTranslationService; import com.gwtext.client.core.EventObject; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPresenter.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/BuddiesSummaryPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -31,7 +31,7 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionBuddiesSummaryToolbar; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPresenter.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/GroupMembersSummaryPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -31,7 +31,7 @@ import org.ourproject.kune.workspace.client.oldsn.toolbar.ActionGroupSummaryToolbar; import org.ourproject.kune.workspace.client.search.GroupLiveSearcher; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipateAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipateAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/ParticipateAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/SocialNetworkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/SocialNetworkPresenter.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/SocialNetworkPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -31,7 +31,7 @@ import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UnjoinButtonAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UnjoinButtonAction.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/oldsn/UnjoinButtonAction.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.actions.ActionEvent; -import cc.kune.common.client.noti.NotifyUser; +import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.OnAcceptCallback; import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptions.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptions.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialog; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; public interface EntityOptions extends AbstractTabbedDialog { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -24,7 +24,7 @@ import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -23,7 +23,7 @@ import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import cc.kune.common.client.noti.NotifyLevelImages; +import cc.kune.common.client.notify.NotifyLevelImages; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2011-04-06 10:51:50 UTC (rev 1306) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -25,7 +25,7 @@ import org.ourproject.kune.platf.client.View; import org.ourproject.kune.workspace.client.options.EntityOptions; -import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.common.client.notify.NotifyLevel; import cc.kune.core.client.rpcservices.GroupServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; Added: trunk/src/test/java/cc/kune/common/client/tooltip/TooltipPositionCalculatorTest.java =================================================================== --- trunk/src/test/java/cc/kune/common/client/tooltip/TooltipPositionCalculatorTest.java (rev 0) +++ trunk/src/test/java/cc/kune/common/client/tooltip/TooltipPositionCalculatorTest.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -0,0 +1,38 @@ +package cc.kune.common.client.tooltip; + +public class TooltipPositionCalculatorTest { + + // private static final int TOOLTIP_HEIGHT = 100; + // private static final int TOOLTIP_WIDTH = 100; + // private static final int WINDOW_HEIGHT = 480; + // private static final int WINDOW_WIDTH = 640; + + // @Test + // public void testWhenNoOverflow() { + // final TooltipPosition position = + // TooltipPositionCalculator.calculate(WINDOW_WIDTH, WINDOW_HEIGHT, 0, 0, + // 10, 10, + // TOOLTIP_WIDTH, TOOLTIP_HEIGHT); + // assertEquals(ArrowPosition.NW, position.getArrowPosition()); + // assertEquals(TooltipPosition.ARROW_DEF_MARGIN, position.getArrowLeft()); + // assertEquals(0, position.getArrowTop()); + // assertEquals(TooltipPosition.TOOLTIP_DISTANCE, position.getLeft()); + // assertEquals(TooltipPosition.TOOLTIP_DISTANCE, position.getTop()); + // } + // + // @Test + // public void testWhenOverflowWidth() { + // final TooltipPosition position = + // TooltipPositionCalculator.calculate(WINDOW_WIDTH, WINDOW_HEIGHT, + // WINDOW_WIDTH, + // 0, 10, 10, TOOLTIP_WIDTH, TOOLTIP_HEIGHT); + // assertEquals(ArrowPosition.NE, position.getArrowPosition()); + // assertEquals(TOOLTIP_WIDTH - TooltipPosition.ARROW_DEF_MARGIN, + // position.getArrowLeft()); + // assertEquals(0, position.getArrowTop()); + // assertEquals(WINDOW_WIDTH - TOOLTIP_WIDTH + + // TooltipPosition.TOOLTIP_DISTANCE, position.getLeft()); + // assertEquals(TooltipPosition.TOOLTIP_DISTANCE, position.getTop()); + // } + +} Property changes on: trunk/src/test/java/cc/kune/common/client/tooltip/TooltipPositionCalculatorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/test/java/cc/kune/wave/server/KuneWaveManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/wave/server/KuneWaveManagerDefaultTest.java (rev 0) +++ trunk/src/test/java/cc/kune/wave/server/KuneWaveManagerDefaultTest.java 2011-04-12 18:38:37 UTC (rev 1307) @@ -0,0 +1,30 @@ +package cc.kune.wave.server; + +import java.io.IOException; + +import org.junit.Before; +import org.junit.Test; + +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.server.integration.IntegrationTest; +import cc.kune.core.server.integration.IntegrationTestHelper; + +import com.google.inject.Inject; + +public class KuneWaveManagerDefaultTest extends IntegrationTest { + + @Inject + KuneWaveManagerDefault manager; + + @Before + public void before() { + new IntegrationTestHelper(this); + + } + + @Test + public void createWave() throws DefaultException, IOException { + doLogin(); + manager.createWave(getSiteAdminShortName(), "testing"); + } +} Property changes on: trunk/src/test/java/cc/kune/wave/server/KuneWaveManagerDefaultTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain