Author: vjrj_ Date: 2011-12-20 01:10:39 +0100 (Tue, 20 Dec 2011) New Revision: 1640 Added: trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationServiceMocked.java trunk/src/main/java/cc/kune/core/client/ui/BasicDragableThumb.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/ Removed: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/ trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java Modified: trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.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/ui/dialogs/tabbed/AbstractTabbedDialog.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/TabTitleGenerator.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java Log: More refactoring for calendar tool Modified: trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-12-20 00:10:39 UTC (rev 1640) @@ -9,7 +9,7 @@ <!-- Specify the paths for translatable code --> <source path="shared"/> <source path='client' - excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> <public path="public"/> <inherits name='org.cobogw.gwt.user.User'/> <inherits name='com.google.gwt.inject.Inject'/> Modified: trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/common/client/ui/BasicThumb.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -23,7 +23,6 @@ import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.utils.TextUtils; -import com.allen_sauer.gwt.dnd.client.HasDragHandle; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.DoubleClickEvent; @@ -37,12 +36,11 @@ import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; /** * BasicThumb.java */ -public class BasicThumb extends Composite implements HasDragHandle { +public class BasicThumb extends Composite { private static final int NOSIZE = -1; private final Image image; private Tooltip imageTooltip; @@ -150,8 +148,7 @@ panel.addDomHandler(clickHandler, DoubleClickEvent.getType()); } - @Override - public Widget getDragHandle() { + public Image getImage() { return image; } Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/PromptTopDialog.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -27,6 +27,7 @@ public static class Builder extends BasicTopDialog.Builder { private boolean allowBlank = false; + private int fieldWidth; private int maxLength = 0; private String maxLengthText; private int minLength = 0; @@ -53,6 +54,11 @@ return dialog; } + public Builder fieldWidth(final int fieldWidth) { + this.fieldWidth = fieldWidth; + return this; + } + public Builder maxLength(final int maxLength) { this.maxLength = maxLength; return this; @@ -114,6 +120,7 @@ if (builder.maxLength != 0) { textField.setMaxLength(builder.maxLength); } + textField.setWidth(builder.fieldWidth); textField.setAllowBlank(builder.allowBlank); super.getInnerPanel().add(textField); } Copied: trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationServiceMocked.java (from rev 1639, trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java) =================================================================== --- trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationServiceMocked.java (rev 0) +++ trunk/src/main/java/cc/kune/common/shared/i18n/I18nTranslationServiceMocked.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -0,0 +1,36 @@ +/* + * + * 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.shared.i18n; + +import cc.kune.common.client.utils.TextUtils; + +public class I18nTranslationServiceMocked extends I18nTranslationService { + @Override + public boolean isRTL() { + return false; + } + + @Override + public String tWithNT(final String text, final String noteForTranslators) { + final String encodeText = TextUtils.escapeHtmlLight(text); + final String translation = encodeText; + return decodeHtml(translation); + } +} Deleted: trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -1,37 +0,0 @@ -/* - * - * 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.core.client.i18n; - -import cc.kune.common.client.utils.TextUtils; -import cc.kune.common.shared.i18n.I18nTranslationService; - -public class I18nTranslationServiceMocked extends I18nTranslationService { - @Override - public boolean isRTL() { - return false; - } - - @Override - public String tWithNT(final String text, final String noteForTranslators) { - final String encodeText = TextUtils.escapeHtmlLight(text); - final String translation = encodeText; - return decodeHtml(translation); - } -} Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -28,11 +28,11 @@ 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.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.avatar.SmallAvatarDecorator; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.dnd.NotImplementedDropManager; +import cc.kune.core.client.ui.BasicDragableThumb; import cc.kune.gspace.client.GSpaceArmor; import com.google.gwt.core.client.GWT; @@ -133,9 +133,10 @@ actions.clear(); } - public BasicThumb createThumb(final String text, final String avatarUrl, final String tooltip, + public BasicDragableThumb createThumb(final String text, final String avatarUrl, final String tooltip, final String tooltipTitle, final GuiActionDescCollection menuitems) { - final BasicThumb thumb = new BasicThumb(avatarUrl, AVATARSIZE, text, AVATARLABELMAXSIZE, false); + final BasicDragableThumb thumb = new BasicDragableThumb(avatarUrl, AVATARSIZE, text, + AVATARLABELMAXSIZE, false); final ClickHandler clickHand = new ClickHandler() { MenuDescriptor menu; @@ -163,7 +164,8 @@ return thumb; } - public SmallAvatarDecorator decorateAvatarWithXmppStatus(final String shortname, final BasicThumb thumb) { + public SmallAvatarDecorator decorateAvatarWithXmppStatus(final String shortname, + final BasicDragableThumb thumb) { final SmallAvatarDecorator decorator = avatarDecoratorProv.get(); decorator.setWidget(thumb); decorator.setItem(shortname); Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -23,12 +23,12 @@ 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.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.avatar.SmallAvatarDecorator; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.dnd.NotImplementedDropManager; import cc.kune.core.client.sn.GroupSNPresenter.GroupSNView; +import cc.kune.core.client.ui.BasicDragableThumb; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.gspace.client.GSpaceArmor; @@ -65,7 +65,8 @@ @Override public void addAdmin(final GroupDTO group, final String avatarUrl, final String tooltip, final String tooltipTitle, final GuiActionDescCollection menu) { - final BasicThumb thumb = createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, menu); + final BasicDragableThumb thumb = createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, + menu); firstCategoryFlow.add(group.isPersonal() ? (Widget) decorateAvatarWithXmppStatus( group.getShortName(), thumb) : thumb); } @@ -73,7 +74,8 @@ @Override public void addCollab(final GroupDTO group, final String avatarUrl, final String tooltip, final String tooltipTitle, final GuiActionDescCollection menu) { - final BasicThumb thumb = createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, menu); + final BasicDragableThumb thumb = createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, + menu); sndCategoryFlow.add(group.isPersonal() ? (Widget) decorateAvatarWithXmppStatus(group.getShortName(), thumb) : thumb); } @@ -81,7 +83,8 @@ @Override public void addPending(final GroupDTO group, final String avatarUrl, final String tooltip, final String tooltipTitle, final GuiActionDescCollection menu) { - final BasicThumb thumb = createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, menu); + final BasicDragableThumb thumb = createThumb(group.getShortName(), avatarUrl, tooltip, tooltipTitle, + menu); trdCategoryFlow.add(thumb); } Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -22,13 +22,13 @@ 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.ui.BasicThumb; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.avatar.SmallAvatarDecorator; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.dnd.NotImplementedDropManager; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.sn.UserSNPresenter.UserSNView; +import cc.kune.core.client.ui.BasicDragableThumb; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.UserSimpleDTO; import cc.kune.gspace.client.GSpaceArmor; @@ -76,7 +76,8 @@ @Override public void addBuddie(final UserSimpleDTO user, final String avatarUrl, final String tooltip, final String tooltipTitle, final GuiActionDescCollection menu) { - final BasicThumb thumb = createThumb(user.getShortName(), avatarUrl, tooltip, tooltipTitle, menu); + final BasicDragableThumb thumb = createThumb(user.getShortName(), avatarUrl, tooltip, tooltipTitle, + menu); firstCategoryFlow.add((Widget) decorateAvatarWithXmppStatus(user.getShortName(), thumb)); } Added: trunk/src/main/java/cc/kune/core/client/ui/BasicDragableThumb.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/BasicDragableThumb.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ui/BasicDragableThumb.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -0,0 +1,20 @@ +package cc.kune.core.client.ui; + +import cc.kune.common.client.ui.BasicThumb; + +import com.allen_sauer.gwt.dnd.client.HasDragHandle; +import com.google.gwt.user.client.ui.Widget; + +public class BasicDragableThumb extends BasicThumb implements HasDragHandle { + + public BasicDragableThumb(final Object imageRef, final int imgSize, final String text, + final int textMaxLenght, final boolean crop) { + super(imageRef, imgSize, text, textMaxLenght, crop); + } + + @Override + public Widget getDragHandle() { + return getImage(); + } + +} Copied: trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed (from rev 1630, trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed) Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialog.java 2011-11-28 16:19:48 UTC (rev 1630) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialog.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.common.client.ui.dialogs.tabbed; +package cc.kune.core.client.ui.dialogs.tabbed; import cc.kune.common.client.notify.NotifyLevel; Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-11-28 16:19:48 UTC (rev 1630) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.common.client.ui.dialogs.tabbed; +package cc.kune.core.client.ui.dialogs.tabbed; import cc.kune.common.client.ProvidersCollection; import cc.kune.common.client.notify.NotifyLevel; @@ -25,7 +25,7 @@ import cc.kune.common.client.ui.dialogs.BasicTopDialog; import cc.kune.common.client.ui.dialogs.BasicTopDialog.Builder; import cc.kune.common.client.ui.dialogs.MessageToolbar; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java 2011-11-28 16:19:48 UTC (rev 1630) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/AbstractTabbedDialogPresenter.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.common.client.ui.dialogs.tabbed; +package cc.kune.core.client.ui.dialogs.tabbed; import cc.kune.common.client.notify.NotifyLevel; Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/TabTitleGenerator.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/TabTitleGenerator.java 2011-11-28 16:19:48 UTC (rev 1630) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/tabbed/TabTitleGenerator.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.common.client.ui.dialogs.tabbed; +package cc.kune.core.client.ui.dialogs.tabbed; import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -20,10 +20,10 @@ package cc.kune.gspace.client.i18n; import cc.kune.common.client.notify.NotifyLevelImages; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import cc.kune.common.client.utils.SimpleCallback; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; import cc.kune.gspace.client.i18n.I18nTranslatorPresenter.I18nTranslatorView; Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorPresenter.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -19,10 +19,10 @@ */ package cc.kune.gspace.client.i18n; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialog; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.state.Session; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialog; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; import cc.kune.gspace.client.i18n.I18nTranslatorPresenter.I18nTranslatorView; @@ -41,7 +41,7 @@ } public interface I18nTranslatorView extends - cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView { + cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView { void init(); Modified: trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/EntityOptions.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -19,7 +19,7 @@ */ package cc.kune.gspace.client.options; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialog; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialog; import com.google.gwt.user.client.ui.IsWidget; Modified: trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -19,7 +19,7 @@ */ package cc.kune.gspace.client.options; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView; public interface EntityOptionsView extends AbstractTabbedDialogView { Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -21,9 +21,9 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.notify.NotifyLevelImages; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.gspace.client.options.GroupOptionsPresenter.GroupOptionsView; Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -24,7 +24,6 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; @@ -33,6 +32,7 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.client.state.UserSignOutEvent; import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.gspace.client.options.GroupOptionsPresenter.GroupOptionsView; Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -20,9 +20,9 @@ package cc.kune.gspace.client.options; import cc.kune.common.client.notify.NotifyLevelImages; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.gspace.client.options.UserOptionsPresenter.UserOptionsView; Modified: trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/UserOptionsPresenter.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -23,7 +23,6 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; -import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sitebar.SiteUserOptions; @@ -33,6 +32,7 @@ import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler; import cc.kune.core.client.state.UserSignOutEvent; import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler; +import cc.kune.core.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import cc.kune.gspace.client.options.UserOptionsPresenter.UserOptionsView; import com.google.gwt.event.shared.EventBus; Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -21,8 +21,8 @@ import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.MaskWidget; -import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.core.client.ui.DefaultForm; +import cc.kune.core.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.gspace.client.options.EntityOptionsView; import com.extjs.gxt.ui.client.event.BaseEvent; Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -22,9 +22,9 @@ import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.KuneWindowUtils; -import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.core.shared.dto.LicenseDTO; import cc.kune.gspace.client.options.EntityOptionsView; Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -24,11 +24,11 @@ import gwtupload.client.IUploader.OnFinishUploaderHandler; import gwtupload.client.IUploader.OnStartUploaderHandler; import cc.kune.common.client.ui.IconLabel; -import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.common.client.utils.OnAcceptCallback; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.core.shared.FileConstants; import cc.kune.gspace.client.options.EntityOptionsView; Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -25,9 +25,9 @@ import gwtupload.client.IUploader.OnStartUploaderHandler; import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; -import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.gspace.client.options.EntityOptionsView; import cc.kune.gspace.client.options.logo.EntityUploaderForm; import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel; Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptToolsPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -25,10 +25,10 @@ import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; import cc.kune.common.client.ui.MaskWidget; -import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.ui.DefaultForm; +import cc.kune.core.client.ui.dialogs.tabbed.TabTitleGenerator; import cc.kune.core.shared.dto.ToolSimpleDTO; import cc.kune.gspace.client.options.EntityOptionsView; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java 2011-12-19 21:49:18 UTC (rev 1639) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java 2011-12-20 00:10:39 UTC (rev 1640) @@ -23,11 +23,11 @@ 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.ui.BasicThumb; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.dnd.FolderViewerDropController; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.ui.BasicDragableThumb; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.gspace.client.GSpaceArmor; @@ -74,10 +74,11 @@ super.clear(); } - public BasicThumb createThumb(final String text, final Object icon, final String tooltip, + public BasicDragableThumb createThumb(final String text, final Object icon, final String tooltip, final String tooltipTitle, final GuiActionDescCollection menuitems, final DoubleClickHandler doubleClickHandler) { - final BasicThumb thumb = new BasicThumb(icon, ICONSIZE, text, ICONLABELMAXSIZE, false); + final BasicDragableThumb thumb = new BasicDragableThumb(icon, ICONSIZE, text, ICONLABELMAXSIZE, + false); final MenuDescriptor menu = new MenuDescriptor(); menu.setStandalone(true); menu.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl);