[kune-commits] r1293 - in trunk/src: main/java/cc/kune/client main/java/cc/kune/core/client main/java/cc/kune/core/client/cnt main/java/cc/kune/core/client/services main/java/cc/kune/core/client/ui main/java/cc/kune/core/client/ui/footer main/java/cc/kune/core/client/ui/utils main/java/cc/kune/gspace main/java/cc/kune/gspace/client main/java/cc/kune/gspace/client/tags main/java/cc/kune/gspace/client/tool main/java/cc/kune/gspace/client/ui main/java/cc/kune/gspace/client/ui/footer main/java/cc/kune/gspace/cl

Author: vjrj_ Date: 2011-03-25 13:43:38 +0100 (Fri, 25 Mar 2011) New Revision: 1293 Added: trunk/src/main/java/cc/kune/core/client/cnt/ trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java trunk/src/main/java/cc/kune/core/client/services/MediaUtils.java trunk/src/main/java/cc/kune/core/client/ui/utils/ trunk/src/main/java/cc/kune/core/client/ui/utils/ContentPosition.java trunk/src/main/java/cc/kune/gspace/client/tags/ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/ trunk/src/main/java/cc/kune/gspace/client/ui/ trunk/src/main/java/cc/kune/gspace/client/ui/footer/ trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/ trunk/src/test/java/cc/kune/gspace/ trunk/src/test/java/cc/kune/gspace/client/ trunk/src/test/java/cc/kune/gspace/client/tags/ trunk/src/test/java/cc/kune/gspace/client/tool/ Removed: trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarPresenter.java trunk/src/main/java/cc/kune/core/client/cnt/ContentIconsRegistry.java trunk/src/main/java/cc/kune/core/client/tags/ trunk/src/main/java/cc/kune/core/client/tool/ trunk/src/main/java/cc/kune/core/client/ui/footer/license/ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ trunk/src/test/java/cc/kune/core/client/tags/ trunk/src/test/java/cc/kune/core/client/tool/ Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/CoreParts.java trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentPanel.java trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentPresenter.java trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentView.java trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbar.java trunk/src/main/java/cc/kune/core/client/cnt/ContentActionRegistry.java trunk/src/main/java/cc/kune/core/client/cnt/FoldableContent.java trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml trunk/src/main/java/cc/kune/gspace/client/WsArmor.java trunk/src/main/java/cc/kune/gspace/client/WsArmorEntryPoint.java trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummary.java trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPresenter.java trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolResources.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelector.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItem.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.ui.xml trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPresenter.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPresenter.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/pspace/client/PSpacePanel.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentView.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewer.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerView.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomView.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentView.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewer.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerView.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewer.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerView.java trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentView.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewer.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerView.java trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldAbstractClientTool.java trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldFoldableAbstractClientTool.java trunk/src/test/java/cc/kune/gspace/client/tags/TagsSummaryPresenterTest.java trunk/src/test/java/cc/kune/gspace/client/tool/ToolSelectorPresenterTest.java trunk/src/test/java/testsuites/OthersTestSuite.java Log: Tools refactoring Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -79,5 +79,6 @@ ginjector.getSpacesTabPresenter(); ginjector.getChatClient(); ginjector.getCoreParts(); + ginjector.getPSpacePresenter(); } } Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -44,11 +44,12 @@ import cc.kune.core.client.sn.UserSNPresenter; import cc.kune.core.client.state.SiteTokenListeners; import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tags.TagsSummaryPresenter; -import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.entheader.EntityHeaderPresenter; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.tags.TagsSummaryPresenter; +import cc.kune.gspace.client.tool.ToolSelectorPresenter; +import cc.kune.gspace.client.ui.footer.license.EntityLicensePresenter; import cc.kune.pspace.client.PSpaceGinModule; import cc.kune.pspace.client.PSpacePresenter; import cc.kune.wave.client.WaveGinModule; @@ -109,8 +110,6 @@ AsyncProvider<PSpacePresenter> getPSpacePresenter(); - AsyncProvider<TagsSummaryPresenter> getTagsSummaryPresenter(); - AsyncProvider<RegisterPresenter> getRegisterPresenter(); AsyncProvider<SignInPresenter> getSignInPresenter(); @@ -127,6 +126,10 @@ StateManager getStateManager(); + AsyncProvider<TagsSummaryPresenter> getTagsSummaryPresenter(); + + AsyncProvider<ToolSelectorPresenter> getToolSelectorPresenter(); + AsyncProvider<UserConfirmPresenter> getUserConfirmPresenter(); AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -89,10 +89,6 @@ import cc.kune.core.client.state.SiteTokenListeners; import cc.kune.core.client.state.StateManager; import cc.kune.core.client.state.StateManagerDefault; -import cc.kune.core.client.tags.TagsSummaryPanel; -import cc.kune.core.client.tags.TagsSummaryPresenter; -import cc.kune.core.client.ui.footer.license.EntityLicensePanel; -import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.CoreViewImpl; import cc.kune.core.client.ws.entheader.EntityHeader; @@ -101,6 +97,13 @@ import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.WsArmor; import cc.kune.gspace.client.WsArmorImpl; +import cc.kune.gspace.client.tags.TagsSummaryPanel; +import cc.kune.gspace.client.tags.TagsSummaryPresenter; +import cc.kune.gspace.client.tool.ToolSelector; +import cc.kune.gspace.client.tool.ToolSelectorPanel; +import cc.kune.gspace.client.tool.ToolSelectorPresenter; +import cc.kune.gspace.client.ui.footer.license.EntityLicensePanel; +import cc.kune.gspace.client.ui.footer.license.EntityLicensePresenter; import cc.kune.msgs.client.UserMessagesPanel; import cc.kune.msgs.client.UserMessagesPresenter; @@ -117,7 +120,7 @@ /* * (non-Javadoc) - * + * * @see com.google.gwt.inject.client.AbstractGinModule#configure() */ @Override @@ -161,6 +164,9 @@ UserConfirmPresenter.UserConfirmProxy.class); bindPresenter(TagsSummaryPresenter.class, TagsSummaryPresenter.TagsSummaryView.class, TagsSummaryPanel.class, TagsSummaryPresenter.TagsSummaryProxy.class); + bindPresenter(ToolSelectorPresenter.class, ToolSelectorPresenter.ToolSelectorView.class, + ToolSelectorPanel.class, ToolSelectorPresenter.ToolSelectorProxy.class); + bind(ToolSelector.class).to(ToolSelectorPresenter.class).in(Singleton.class); bind(UserPassAutocompleteManager.class).to(UserPassAutocompleteManagerImpl.class).in(Singleton.class); bind(SignIn.class).to(SignInPresenter.class).in(Singleton.class); Modified: trunk/src/main/java/cc/kune/core/client/CoreParts.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -8,8 +8,9 @@ import cc.kune.core.client.sn.actions.registry.GroupSNConfActions; import cc.kune.core.client.sn.actions.registry.UserSNConfActions; import cc.kune.core.client.state.Session; -import cc.kune.core.client.tags.TagsSummaryPresenter; -import cc.kune.core.client.ui.footer.license.EntityLicensePresenter; +import cc.kune.gspace.client.tags.TagsSummaryPresenter; +import cc.kune.gspace.client.tool.ToolSelector; +import cc.kune.gspace.client.ui.footer.license.EntityLicensePresenter; import com.google.inject.Inject; import com.google.inject.Provider; @@ -21,7 +22,8 @@ final Provider<UserSNPresenter> buddiesAndParticipationPresenter, final Provider<GroupSNConfActions> groupMembersConfActions, final Provider<UserSNConfActions> userSNConfActions, final Provider<SiteUserOptionsPresenter> userOptions, - final Provider<EntityLicensePresenter> licenseFooter, final Provider<TagsSummaryPresenter> tagsPresenter) { + final Provider<EntityLicensePresenter> licenseFooter, final Provider<TagsSummaryPresenter> tagsPresenter, + final Provider<ToolSelector> toolSelector) { session.onInitDataReceived(true, new AppStartHandler() { @Override public void onAppStart(final AppStartEvent event) { @@ -32,6 +34,7 @@ userOptions.get(); licenseFooter.get(); tagsPresenter.get(); + toolSelector.get(); } }); } Copied: trunk/src/main/java/cc/kune/core/client/cnt (from rev 1279, trunk/src/main/java/org/ourproject/kune/workspace/client/cnt) Modified: trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/AbstractContentPanel.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,23 +17,24 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.gspace.client.WsArmor; +import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; import com.google.gwt.user.client.ui.Widget; public abstract class AbstractContentPanel { - private final WorkspaceSkeleton ws; private Widget widget; + private final ForIsWidget ws; - public AbstractContentPanel(final WorkspaceSkeleton ws) { - this.ws = ws; + public AbstractContentPanel(final WsArmor ws) { + this.ws = ws.getDocContainer(); } public void attach() { if (widget != null && !widget.isAttached()) { - ws.getEntityWorkspace().setContent(widget); + ws.add(widget); } } @@ -43,7 +44,7 @@ } } - public void setWidget(Widget widget) { + public void setWidget(final Widget widget) { this.widget = widget; } } Modified: trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/AbstractContentPresenter.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; public abstract class AbstractContentPresenter { Modified: trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/AbstractContentView.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/AbstractContentView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; import com.google.gwt.user.client.ui.Widget; Modified: trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbar.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,12 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; +import cc.kune.common.client.actions.ui.IsActionExtensible; -import cc.kune.core.shared.domain.utils.StateToken; +public interface ActionContentToolbar extends IsActionExtensible { -public interface ActionContentToolbar extends ActionToolbar<StateToken> { + void attach(); + void detach(); + } Added: trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarImpl.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -0,0 +1,52 @@ +/* + * + * 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.cnt; + +import cc.kune.common.client.actions.ui.ActionFlowPanel; +import cc.kune.common.client.actions.ui.bind.GuiProvider; +import cc.kune.gspace.client.WsArmor; + +import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; +import com.google.inject.Inject; + +public class ActionContentToolbarImpl extends ActionFlowPanel implements ActionContentToolbar { + + private final ForIsWidget wsToolbar; + + @Inject + public ActionContentToolbarImpl(final GuiProvider guiProvider, final WsArmor wsArmor) { + super(guiProvider); + this.wsToolbar = wsArmor.getDocSubheader(); + } + + @Override + public void attach() { + if (!this.isAttached()) { + wsToolbar.add(this); + } + } + + @Override + public void detach() { + if (this.isAttached()) { + this.removeFromParent(); + } + } +} Deleted: trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/ActionContentToolbarPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,33 +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 org.ourproject.kune.workspace.client.cnt; - -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; -import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; - -import cc.kune.core.shared.domain.utils.StateToken; - -public class ActionContentToolbarPresenter extends ActionToolbarPresenter<StateToken> implements ActionContentToolbar { - - public ActionContentToolbarPresenter(ActionToolbarView<StateToken> toolbar) { - super(toolbar); - } - -} Modified: trunk/src/main/java/cc/kune/core/client/cnt/ContentActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/ContentActionRegistry.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,11 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; -import org.ourproject.kune.platf.client.actions.ActionRegistry; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; -import cc.kune.core.shared.domain.utils.StateToken; - -public class ContentActionRegistry extends ActionRegistry<StateToken> { +@SuppressWarnings("serial") +public class ContentActionRegistry extends GuiActionDescCollection { } Deleted: trunk/src/main/java/cc/kune/core/client/cnt/ContentIconsRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentIconsRegistry.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/ContentIconsRegistry.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,78 +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 org.ourproject.kune.workspace.client.cnt; - -import java.util.HashMap; - -import cc.kune.core.shared.dto.BasicMimeTypeDTO; - -public class ContentIconsRegistry { - private final HashMap<String, String> contentTypesIcons; - - public ContentIconsRegistry() { - contentTypesIcons = new HashMap<String, String>(); - } - - public String getContentTypeIcon(final String typeId) { - final String icon = contentTypesIcons.get(typeId); - return icon == null ? "" : icon; - } - - /** - * If there is a specific icon for a type/subtype pair or a generic type - * icon in defect - * - * @param typeId - * the kune typeId (see *ClientTool) - * @param mimeType - * @return - */ - public String getContentTypeIcon(final String typeId, final BasicMimeTypeDTO mimeType) { - String icon = getContentTypeIcon(concatenate(typeId, mimeType)); - if (icon.equals("")) { - if (mimeType == null) { - return getContentTypeIcon(typeId); - } - } else { - return icon; - } - final String subtype = mimeType.getSubtype(); - if (subtype != null && subtype.length() > 0) { - icon = getContentTypeIcon(typeId, new BasicMimeTypeDTO(mimeType.getType())); - } - return icon.equals("") ? getContentTypeIcon(typeId) : icon; - } - - public void registerContentTypeIcon(final String typeId, final BasicMimeTypeDTO mimeType, final String iconUrl) { - registerContentTypeIcon(concatenate(typeId, mimeType), iconUrl); - } - - public void registerContentTypeIcon(final String contentTypeId, final String iconUrl) { - contentTypesIcons.put(contentTypeId, iconUrl); - } - - private String concatenate(final String typeId, final BasicMimeTypeDTO mimeType) { - if (mimeType != null) { - return typeId + "|" + mimeType; - } else { - return typeId; - } - } -} Modified: trunk/src/main/java/cc/kune/core/client/cnt/FoldableContent.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContent.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/FoldableContent.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; public interface FoldableContent { Modified: trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,18 +17,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; -import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.platf.client.ui.IconLabel; -import org.ourproject.kune.platf.client.ui.KuneUiUtils; -import org.ourproject.kune.platf.client.ui.RoundedPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.common.client.ui.IconLabel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; @@ -39,19 +37,30 @@ private static final String DEF_CONTENT_MARGINS_STYLE = "kune-Margin-7-trbl"; private final I18nTranslationService i18n; - private final RoundedPanel messagePanel; private final IconLabel messageLabel; + private final FlowPanel messagePanel; - public FoldableContentPanel(final WorkspaceSkeleton ws, final I18nTranslationService i18n) { + public FoldableContentPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { super(ws); this.i18n = i18n; - messageLabel = new IconLabel(Images.App.getInstance().info(), ""); + messageLabel = new IconLabel(""); + messageLabel.setLeftIconResource(res.info()); messageLabel.addStyleName("k-preview-msg-lab"); - messagePanel = new RoundedPanel(messageLabel, RoundedPanel.ALL, 2); - messagePanel.setCornerStyleName("k-preview-msg"); + messagePanel = new FlowPanel(); + messagePanel.add(messageLabel); + messagePanel.addStyleName("k-preview-msg"); messagePanel.addStyleName("kune-Margin-7-b"); } + private VerticalPanel createMessageVp(final boolean showMsg) { + final VerticalPanel vp = new VerticalPanel(); + if (showMsg) { + setDefPreviewMsg(); + vp.add(messagePanel); + } + return vp; + } + @Override public void setContent(final String content, final boolean showPreviewMsg) { final VerticalPanel vp = createMessageVp(showPreviewMsg); @@ -60,11 +69,42 @@ setWidgetAsContent(vp, true); } + private void setContent(final Widget widget) { + setWidget(widget); + attach(); + } + + private void setDefPreviewMsg() { + messageLabel.setText(i18n.t("This is only a preview, download it to get the complete file")); + } + + private void setDefStyle(final Widget widget) { + widget.setStyleName("kune-Content-Main"); + widget.addStyleName(DEF_CONTENT_MARGINS_STYLE); + } + @Override public void setInfo(final String info) { setLabel(info); } + // public void setWave(final String waveId, final Listener0 onLoaded) { + // final WaveWidget waveWidget = new + // WaveWidget("http://wave.google.com/a/wavesandbox.com/"); + // waveWidget.setUIConfig("white", "black", "arial, sans", "10pt"); + // waveWidget.setHeight("100%"); + // waveWidget.addWaveLoadHandler(new WaveLoadHandler() { + // public void onWaveLoad(final WaveLoadEvent event) { + // Log.info("Wave '" + event.getWaveId() + "' loaded!"); + // onLoaded.onEvent(); + // } + // }); + // waveWidget.loadWave(waveId); + // setWidgetAsContent(waveWidget, false); + // waveWidget.setToolbarVisible(true); + // waveWidget.setEditMode(false); + // } + @Override public void setInfoMessage(final String text) { final VerticalPanel vp = createMessageVp(true); @@ -85,6 +125,10 @@ setWidgetAsContent(vp, true); } + private void setNoPreviewLabelMsg() { + messageLabel.setText(i18n.t("Preview not available")); + } + @Override public void setRawContent(final String content) { final HTML html = new HTML(content); @@ -92,23 +136,6 @@ setContent(html); } - // public void setWave(final String waveId, final Listener0 onLoaded) { - // final WaveWidget waveWidget = new - // WaveWidget("http://wave.google.com/a/wavesandbox.com/"); - // waveWidget.setUIConfig("white", "black", "arial, sans", "10pt"); - // waveWidget.setHeight("100%"); - // waveWidget.addWaveLoadHandler(new WaveLoadHandler() { - // public void onWaveLoad(final WaveLoadEvent event) { - // Log.info("Wave '" + event.getWaveId() + "' loaded!"); - // onLoaded.onEvent(); - // } - // }); - // waveWidget.loadWave(waveId); - // setWidgetAsContent(waveWidget, false); - // waveWidget.setToolbarVisible(true); - // waveWidget.setEditMode(false); - // } - @Override public void setWidgetAsContent(final Widget widget, final boolean setDefMargins) { if (setDefMargins) { @@ -122,8 +149,8 @@ final VerticalPanel vp = createMessageVp(showPreviewMsg); final Image imgOrig = new Image(imageUrl); final Image imgResized = new Image(imageResizedUrl); - KuneUiUtils.setQuickTip(imgOrig, i18n.t("Click to zoom out")); - KuneUiUtils.setQuickTip(imgResized, i18n.t("Click to zoom in")); + imgOrig.setTitle(i18n.t("Click to zoom out")); + imgResized.setTitle(i18n.t("Click to zoom in")); setDefStyle(imgOrig); setDefStyle(imgResized); imgOrig.addStyleName("kune-pointer"); @@ -146,31 +173,4 @@ setWidgetAsContent(vp, true); Image.prefetch(imageUrl); } - - private VerticalPanel createMessageVp(final boolean showMsg) { - final VerticalPanel vp = new VerticalPanel(); - if (showMsg) { - setDefPreviewMsg(); - vp.add(messagePanel); - } - return vp; - } - - private void setContent(final Widget widget) { - setWidget(widget); - attach(); - } - - private void setDefPreviewMsg() { - messageLabel.setText(i18n.t("This is only a preview, download it to get the complete file")); - } - - private void setDefStyle(final Widget widget) { - widget.setStyleName("kune-Content-Main"); - widget.addStyleName(DEF_CONTENT_MARGINS_STYLE); - } - - private void setNoPreviewLabelMsg() { - messageLabel.setText(i18n.t("Preview not available")); - } } Modified: trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,18 +17,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.workspace.client.cnt; +package cc.kune.core.client.cnt; -import org.ourproject.kune.platf.client.actions.ActionItemCollection; -import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; - +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.services.ImageSize; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateChangedEvent; +import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.BasicMimeTypeDTO; import cc.kune.core.shared.dto.StateAbstractDTO; @@ -36,23 +34,22 @@ import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public abstract class FoldableContentPresenter extends AbstractContentPresenter implements FoldableContent { - private final String toolName; - private final ActionRegistry<StateToken> actionRegistry; - protected final Session session; - private final ActionContentToolbar toolbar; + private final GuiActionDescCollection actionRegistry; private final Provider<FileDownloadUtils> downloadProvider; private final I18nTranslationService i18n; private final Provider<MediaUtils> mediaUtils; + protected final Session session; + private final ActionContentToolbar toolbar; + private final String toolName; private String uploadType; private String waveType; public FoldableContentPresenter(final String toolName, final StateManager stateManager, final Session session, - final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final ActionContentToolbar toolbar, final GuiActionDescCollection actionRegistry, final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n, final Provider<MediaUtils> mediaUtils) { this.toolName = toolName; @@ -62,14 +59,19 @@ this.downloadProvider = downloadProvider; this.i18n = i18n; this.mediaUtils = mediaUtils; - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { + stateManager.onStateChanged(true, new StateChangedHandler() { @Override - public void onEvent(final StateAbstractDTO state) { - setState(state); + public void onStateChanged(final StateChangedEvent event) { + setState(event.getState()); } }); } + private String getContentBody(final StateContentDTO state) { + final String contentBody = state.getContent(); + return contentBody; + } + public String getToolName() { return toolName; } @@ -87,14 +89,6 @@ setState(session.getContentState()); } - public void setUploadType(final String uploadType) { - this.uploadType = uploadType; - } - - public void setWaveType(final String waveType) { - this.waveType = waveType; - } - protected void setContent(final StateContentDTO state) { final String typeId = state.getTypeId(); if (typeId.equals(getUploadType())) { @@ -107,6 +101,19 @@ view.attach(); } + private void setNormalContent(final StateContentDTO state) { + final String contentBody = getContentBody(state); + if (contentBody == null || contentBody.length() == 0) { + if (state.getContentRights().isEditable()) { + view.setInfoMessage(i18n.t("There is no text in this page. Feel free to edit this page")); + } else { + view.setInfoMessage(i18n.t("There is no text in this page")); + } + } else { + view.setRawContent(contentBody); + } + } + protected void setState(final StateAbstractDTO state) { toolbar.detach(); if (state instanceof StateContainerDTO) { @@ -123,43 +130,18 @@ } protected void setState(final StateContainerDTO state) { - final ActionItemCollection<StateToken> collection = getActionCollection(state, state.getContainerRights()); - setToolbar(collection); + setToolbar(actionRegistry); attach(); } protected void setState(final StateContentDTO state) { - final ActionItemCollection<StateToken> collection = getActionCollection(state, state.getContentRights()); - setToolbar(collection); + setToolbar(actionRegistry); + attach(); } - private ActionItemCollection<StateToken> getActionCollection(final StateContainerDTO state, - final AccessRights rights) { - return actionRegistry.getCurrentActions(state.getStateToken(), state.getTypeId(), session.isLogged(), rights, - true); - } - - private String getContentBody(final StateContentDTO state) { - final String contentBody = state.getContent(); - return contentBody; - } - - private void setNormalContent(final StateContentDTO state) { - final String contentBody = getContentBody(state); - if (contentBody == null || contentBody.length() == 0) { - if (state.getContentRights().isEditable()) { - view.setInfoMessage(i18n.t("There is no text in this page. Feel free to edit this page")); - } else { - view.setInfoMessage(i18n.t("There is no text in this page")); - } - } else { - view.setRawContent(contentBody); - } - } - - private void setToolbar(final ActionItemCollection<StateToken> collection) { - toolbar.disableMenusAndClearButtons(); - toolbar.addActions(collection, AbstractFoldableContentActions.CONTENT_TOPBAR); + private void setToolbar(final GuiActionDescCollection collection) { + // toolbar.disableMenusAndClearButtons(); + toolbar.addActions(collection); toolbar.attach(); } @@ -192,4 +174,12 @@ view.setNoPreview(); } } + + public void setUploadType(final String uploadType) { + this.uploadType = uploadType; + } + + public void setWaveType(final String waveType) { + this.waveType = waveType; + } } Copied: trunk/src/main/java/cc/kune/core/client/services/MediaUtils.java (from rev 1279, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/services/MediaUtils.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/services/MediaUtils.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -0,0 +1,64 @@ +/* + * + * 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.services; + + +import cc.kune.core.client.state.Session; +import cc.kune.core.client.ui.utils.ContentPosition; +import cc.kune.core.shared.domain.utils.StateToken; + +public class MediaUtils { + + public static final String DOC_URL_TAG = "###DOC_URL###"; + + private final Session session; + + private final FileDownloadUtils downloadUtils; + + public MediaUtils(final Session session, final FileDownloadUtils downloadUtils) { + this.session = session; + this.downloadUtils = downloadUtils; + } + + public String getAviEmbed(final StateToken token) { + return setCenterPosition(session.getInitData().getAviEmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token))); + } + + public String getFlvEmbed(final StateToken token) { + return setCenterPosition(session.getInitData().getFlvEmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token))); + } + + public String getMp3Embed(final StateToken token) { + return setCenterPosition(session.getInitData().getMp3EmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token))); + } + + public String getOggEmbed(final StateToken token) { + return setCenterPosition(session.getInitData().getOggEmbedObject().replace(DOC_URL_TAG, + session.getSiteUrl() + downloadUtils.getUrl(token))); + } + + private String setCenterPosition(final String elementCode) { + return ContentPosition.setCenterPosition(elementCode); + } + +} Copied: trunk/src/main/java/cc/kune/core/client/ui/utils/ContentPosition.java (from rev 1279, trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/utils/ContentPosition.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ui/utils/ContentPosition.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -0,0 +1,79 @@ +/* + * + * 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.ui.utils; + +import org.cobogw.gwt.user.client.CSS; + +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.gwt.dom.client.Element; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.HTML; +import com.google.inject.Inject; + +public class ContentPosition { + + public static final String CENTER = "center"; + public static final String LEFT = "left"; + public static final String RIGHT = "right"; + private static I18nTranslationService i18n; + private static Object[][] positionObjs; + public static final String[][] positions = { new String[] { LEFT }, new String[] { CENTER }, new String[] { RIGHT } }; + + public synchronized static Object[][] getPositions() { + if (positionObjs == null) { + final String[][] values = positions; + positionObjs = new Object[values.length][1]; + int i = 0; + for (final String[] position : values) { + final Object[] obj = new Object[] { position[0], i18n.t(position[0]) }; + positionObjs[i++] = obj; + } + } + return positionObjs; + } + + public static String setCenterPosition(final String elementCode) { + return setPosition(elementCode, false, CENTER); + } + + public static Element setPosition(final Element element, final boolean wraptext, final String position) { + if (!wraptext || position.equals(ContentPosition.CENTER)) { + final com.google.gwt.user.client.Element divEl = DOM.createDiv(); + CSS.setProperty(divEl, CSS.A.TEXT_ALIGN, position); + divEl.setInnerHTML(element.getString()); + return divEl; + } else { + CSS.setProperty(element, CSS.A.FLOAT, position); + return element; + } + } + + public static String setPosition(final String elementCode, final boolean wraptext, final String position) { + final HTML html = new HTML(elementCode); + html.removeStyleName("gwt-HTML"); + return setPosition(html.getElement(), wraptext, position).getString(); + } + + @Inject + public ContentPosition(final I18nTranslationService i18n) { + ContentPosition.i18n = i18n; + } +} Modified: trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,13 +1,8 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd"> <module> <inherits name="com.google.gwt.user.User" /> - <!-- <entry-point class="cc.kune.core.ws.armor.client.WsArmorEntryPoint" - /> --> <public path="public" /> - <source path="client" /> + <source path='client' + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> <inherits name="cc.kune.pspace.PSpace" /> - <!-- NOTE: this only compiles for chromium/safari ============= --> - <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 --> - <!-- <set-property name="user.agent" value="gecko1_8" /> --> -<!-- <set-property name="user.agent" value="safari" />--> </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmor.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmor.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmor.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,6 +20,7 @@ package cc.kune.gspace.client; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; +import com.google.gwt.user.client.ui.SimplePanel; public interface WsArmor { @@ -41,6 +42,8 @@ ForIsWidget getEntityToolsSouth(); + SimplePanel getPublicSpace(); + ForIsWidget getSitebar(); ForIsWidget getUserSpace(); Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmorEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmorEntryPoint.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmorEntryPoint.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -34,7 +34,7 @@ resources.style().ensureInjected(); final RootLayoutPanel rootPanel = RootLayoutPanel.get(); - final WsArmorImpl armor = new WsArmorImpl(null); + final WsArmorImpl armor = new WsArmorImpl(); final InlineLabel icons = new InlineLabel("Icons"); final InlineLabel login = new InlineLabel("Login"); final InlineLabel logo = new InlineLabel("Logo"); Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,8 +19,6 @@ */ package cc.kune.gspace.client; -import cc.kune.pspace.client.PSpacePresenter; - import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -34,7 +32,6 @@ import com.google.gwt.user.client.ui.TabLayoutPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -import com.google.inject.Inject; public class WsArmorImpl extends Composite implements WsArmor { @@ -80,13 +77,11 @@ @UiField FlowPanel userSpace; - @Inject - public WsArmorImpl(final PSpacePresenter pspace) { + public WsArmorImpl() { initWidget(uiBinder.createAndBindUi(this)); groupSpace.setWidgetMinSize(splitEast, 150); tabs.setStyleName("k-spaces"); homeSpace.add(RootPanel.get("k-home-wrapper")); - publicSpace.add(pspace.getWidget()); } @Override @@ -135,10 +130,16 @@ } @Override + public SimplePanel getPublicSpace() { + return publicSpace; + } + + @Override public ForIsWidget getSitebar() { return sitebar; } + @Override public ForIsWidget getUserSpace() { return userSpace; } Copied: trunk/src/main/java/cc/kune/gspace/client/tags (from rev 1281, trunk/src/main/java/cc/kune/core/client/tags) Modified: trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummary.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tags/TagsSummary.java 2011-03-17 18:03:05 UTC (rev 1281) +++ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummary.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.tags; +package cc.kune.gspace.client.tags; import cc.kune.core.shared.domain.TagCloudResult; Deleted: trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tags/TagsSummaryPanel.java 2011-03-17 18:03:05 UTC (rev 1281) +++ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,84 +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.tags; - -import cc.kune.core.client.tags.TagsSummaryPresenter.TagsSummaryView; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.WsArmor; - -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.ui.FlowPanel; -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; - -public class TagsSummaryPanel extends ViewImpl implements TagsSummaryView { - - private final FlowPanel flowPanel; - private final I18nTranslationService i18n; - - @Inject - public TagsSummaryPanel(final I18nTranslationService i18n, final WsArmor ws) { - this.i18n = i18n; - FlowPanel mainPanel = new FlowPanel(); - flowPanel = new FlowPanel(); - flowPanel.setWidth("100%"); - Label header = new Label(i18n.t("Tags")); - header.setTitle(i18n.t("Keywords or terms associated with this group")); - // super.setBorderStylePrimaryName("k-dropdownouter-tags"); - flowPanel.addStyleName("kune-Margin-Small-trbl"); - flowPanel.addStyleName("k-tsp-cloud"); - header.addStyleName("k-sn-maintitle"); - mainPanel.addStyleName("k-sn-mainpanel"); - mainPanel.add(header); - mainPanel.add(flowPanel); - ws.getEntityToolsSouth().add(mainPanel); - } - - public void addTag(final String name, final Long count, final String style, ClickHandler clickHandler) { - final Label label = new Label(name); - // i18n pluralization - if (count > 1) { - label.setTitle(i18n.t("There are [%d] items with this tag", count)); - } else { - label.setTitle(i18n.t("There are [%d] item with this tag", count)); - } - label.addClickHandler(clickHandler); - label.addStyleName("k-tsp-tag"); - label.addStyleName(style); - flowPanel.add(label); - } - - @Override - public void clear() { - flowPanel.clear(); - } - - @Override - public void setVisible(boolean visible) { - flowPanel.setVisible(visible); - } - - @Override - public Widget asWidget() { - return flowPanel; - } -} Copied: trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java (from rev 1282, trunk/src/main/java/cc/kune/core/client/tags/TagsSummaryPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -0,0 +1,85 @@ +/* + * + * 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.gspace.client.tags; + +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import cc.kune.gspace.client.tags.TagsSummaryPresenter.TagsSummaryView; + +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.FlowPanel; +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; + +public class TagsSummaryPanel extends ViewImpl implements TagsSummaryView { + + private final FlowPanel flowPanel; + private final I18nTranslationService i18n; + private FlowPanel mainPanel; + + @Inject + public TagsSummaryPanel(final I18nTranslationService i18n, final WsArmor ws) { + this.i18n = i18n; + mainPanel = new FlowPanel(); + flowPanel = new FlowPanel(); + flowPanel.setWidth("100%"); + Label header = new Label(i18n.t("Tags")); + header.setTitle(i18n.t("Keywords or terms associated with this group")); + // super.setBorderStylePrimaryName("k-dropdownouter-tags"); + flowPanel.addStyleName("kune-Margin-Small-trbl"); + flowPanel.addStyleName("k-tsp-cloud"); + header.addStyleName("k-sn-maintitle"); + mainPanel.addStyleName("k-sn-mainpanel"); + mainPanel.add(header); + mainPanel.add(flowPanel); + ws.getEntityToolsSouth().add(mainPanel); + } + + public void addTag(final String name, final Long count, final String style, ClickHandler clickHandler) { + final Label label = new Label(name); + // i18n pluralization + if (count > 1) { + label.setTitle(i18n.t("There are [%d] items with this tag", count)); + } else { + label.setTitle(i18n.t("There are [%d] item with this tag", count)); + } + label.addClickHandler(clickHandler); + label.addStyleName("k-tsp-tag"); + label.addStyleName(style); + flowPanel.add(label); + } + + @Override + public void clear() { + flowPanel.clear(); + } + + @Override + public void setVisible(boolean visible) { + mainPanel.setVisible(visible); + } + + @Override + public Widget asWidget() { + return mainPanel; + } +} Modified: trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tags/TagsSummaryPresenter.java 2011-03-17 18:03:05 UTC (rev 1281) +++ trunk/src/main/java/cc/kune/gspace/client/tags/TagsSummaryPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.tags; +package cc.kune.gspace.client.tags; import cc.kune.common.client.log.Log; import cc.kune.common.client.noti.NotifyUser; Copied: trunk/src/main/java/cc/kune/gspace/client/tool (from rev 1291, trunk/src/main/java/cc/kune/core/client/tool) Modified: trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/AbstractClientTool.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; public abstract class AbstractClientTool { Modified: trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/FoldableAbstractClientTool.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolResources.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolResources.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,4 +1,4 @@ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelector.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelector.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelector.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; public interface ToolSelector { Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItem.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelectorItem.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItem.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,9 +17,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; -import cc.kune.core.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; +import cc.kune.gspace.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; public interface ToolSelectorItem { Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelectorItemPanel.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,6 +1,6 @@ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; -import cc.kune.core.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; +import cc.kune.gspace.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.HasClickHandlers; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelectorItemPanel.ui.xml 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPanel.ui.xml 2011-03-25 12:43:38 UTC (rev 1293) @@ -33,7 +33,7 @@ top: -6px; } </ui:style> - <ui:with field='res' type='cc.kune.core.client.tool.ToolResources' /> + <ui:with field='res' type='cc.kune.gspace.client.tool.ToolResources' /> <g:FocusPanel ui:field="self" stylePrimaryName="k-tool-item"> <g:FlowPanel styleName="{style.flow}" ui:field="flow"> <g:Image ui:field="iconLeft" styleName="{style.iconLeft}" /> Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelectorItemPresenter.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorItemPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelectorPanel.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,13 +1,15 @@ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; -import cc.kune.core.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; -import cc.kune.core.client.tool.ToolSelectorPresenter.ToolSelectorView; +import cc.kune.gspace.client.WsArmor; +import cc.kune.gspace.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; +import cc.kune.gspace.client.tool.ToolSelectorPresenter.ToolSelectorView; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; import com.gwtplatform.mvp.client.ViewImpl; public class ToolSelectorPanel extends ViewImpl implements ToolSelectorView { @@ -20,8 +22,9 @@ @UiField FlowPanel flow; - public ToolSelectorPanel() { - uiBinder.createAndBindUi(this); + @Inject + public ToolSelectorPanel(final WsArmor wsArmor) { + wsArmor.getEntityToolsSouth().add(uiBinder.createAndBindUi(this)); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/tool/ToolSelectorPresenter.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/main/java/cc/kune/gspace/client/tool/ToolSelectorPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; import java.util.HashMap; import java.util.List; @@ -31,7 +31,7 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.client.state.ToolChangedEvent; import cc.kune.core.client.state.ToolChangedEvent.ToolChangedHandler; -import cc.kune.core.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; +import cc.kune.gspace.client.tool.ToolSelectorItemPresenter.ToolSelectorItemView; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; @@ -101,6 +101,13 @@ getView().addItem(item.getView()); } + private void checkTool(final ToolSelectorItem tool) { + if (tool == null) { + throw new UIException("Trying to activate an unregistered tool in client"); + } + + } + void onGroupChanged(final String newGroupName) { for (final String name : tools.keySet()) { tools.get(name).setGroupShortName(newGroupName); @@ -110,10 +117,14 @@ void onToolChanged(final String oldTool, final String newTool) { Log.debug("Registered tools: " + tools.keySet().toString()); if (!oldTool.equals("")) { - tools.get(oldTool).setSelected(false); + final ToolSelectorItem tool = tools.get(oldTool); + checkTool(tool); + tool.setSelected(false); } if (!newTool.equals("")) { - tools.get(newTool).setSelected(true); + final ToolSelectorItem tool = tools.get(newTool); + checkTool(tool); + tool.setSelected(true); } } Copied: trunk/src/main/java/cc/kune/gspace/client/ui/footer/license (from rev 1279, trunk/src/main/java/cc/kune/core/client/ui/footer/license) Modified: trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePanel.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,16 +17,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.ui.footer.license; +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.ui.KuneWindowUtils; -import cc.kune.core.client.ui.footer.license.EntityLicensePresenter.EntityLicenseView; import cc.kune.core.shared.dto.LicenseDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.WsArmor; +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; Modified: trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/footer/license/EntityLicensePresenter.java 2011-03-15 20:11:19 UTC (rev 1279) +++ trunk/src/main/java/cc/kune/gspace/client/ui/footer/license/EntityLicensePresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.ui.footer.license; +package cc.kune.gspace.client.ui.footer.license; import cc.kune.core.client.state.StateChangedEvent; import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler; Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.common.client.actions.ui.bind.GuiProvider; import cc.kune.core.client.resources.CoreResources; +import cc.kune.gspace.client.WsArmor; import cc.kune.pspace.client.PSpacePresenter.PSpaceView; import com.google.gwt.core.client.GWT; @@ -64,7 +65,7 @@ private final Widget widget; @Inject - public PSpacePanel(final GuiProvider guiProvider, final CoreResources res) { + public PSpacePanel(final GuiProvider guiProvider, final CoreResources res, final WsArmor wsArmor) { widget = uiBinder.createAndBindUi(this); actionPanel = new ActionFlowPanel(guiProvider); actionPanelContainer.add(actionPanel); @@ -74,6 +75,7 @@ layer.addClassName("k-box-5shadow"); layer.addClassName("k-5corners"); icon.setResource(res.browser32()); + wsArmor.getPublicSpace().add(widget); } @Override Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -26,7 +26,6 @@ import org.ourproject.kune.blogs.client.cnt.BlogViewer; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; @@ -37,6 +36,7 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; Deleted: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,124 +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 org.ourproject.kune.blogs.client; - -import org.ourproject.kune.blogs.client.cnt.BlogFolderContent; -import org.ourproject.kune.blogs.client.cnt.BlogFolderContentPanel; -import org.ourproject.kune.blogs.client.cnt.BlogFolderContentPresenter; -import org.ourproject.kune.blogs.client.cnt.BlogFolderContentView; -import org.ourproject.kune.blogs.client.cnt.BlogViewer; -import org.ourproject.kune.blogs.client.cnt.BlogViewerPanel; -import org.ourproject.kune.blogs.client.cnt.BlogViewerPresenter; -import org.ourproject.kune.blogs.client.cnt.BlogViewerView; -import org.ourproject.kune.blogs.client.ctx.BlogContext; -import org.ourproject.kune.blogs.client.ctx.BlogContextPresenter; -import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tool.ToolSelector; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; - -public class BlogClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - - register(ToolGroup.class, new Factory<BlogClientTool>(BlogClientTool.class) { - @Override - public BlogClientTool create() { - i(BlogClientActions.class); - return new BlogClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), - i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); - } - }); - - register(ToolGroup.class, new Factory<BlogClientActions>(BlogClientActions.class) { - @Override - public BlogClientActions create() { - return new BlogClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), - i(Session.class), i(StateManager.class), i(SchedulerManager.class), - p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), - i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), - i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(BlogViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); - } - }); - - register(ToolGroup.class, new Factory<BlogContext>(BlogContext.class) { - @Override - public BlogContext create() { - final BlogContextPresenter presenter = new BlogContextPresenter(i(StateManager.class), - p(ContextNavigator.class), p(ContextPropEditor.class)); - return presenter; - } - }); - - register(Singleton.class, new Factory<BlogViewer>(BlogViewer.class) { - @Override - public BlogViewer create() { - final BlogViewerPresenter presenter = new BlogViewerPresenter(i(StateManager.class), i(Session.class), - i(I18nUITranslationService.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final BlogViewerView view = new BlogViewerPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - - register(ToolGroup.class, new Factory<BlogFolderContent>(BlogFolderContent.class) { - @Override - public BlogFolderContent create() { - final BlogFolderContentPresenter presenter = new BlogFolderContentPresenter(i(StateManager.class), - i(Session.class), i(ActionContentToolbar.class), i(ContentActionRegistry.class), - i(I18nTranslationService.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final BlogFolderContentView view = new BlogFolderContentPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - } -} Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -25,7 +25,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.tool.ToolSelector; +import cc.kune.gspace.client.tool.ToolSelector; public class BlogClientTool extends OldFoldableAbstractClientTool { public static final String NAME = "blogs"; Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,14 +19,17 @@ */ package org.ourproject.kune.blogs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class BlogFolderContentPanel extends FoldableContentPanel implements BlogFolderContentView { - public BlogFolderContentPanel(WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public BlogFolderContentPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); } } Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,27 +20,26 @@ package org.ourproject.kune.blogs.client.cnt; import org.ourproject.kune.blogs.client.BlogClientTool; -import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class BlogFolderContentPresenter extends FoldableContentPresenter implements BlogFolderContent { - private BlogFolderContentView view; private final I18nTranslationService i18n; + private BlogFolderContentView view; public BlogFolderContentPresenter(final StateManager stateManager, final Session session, - final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final ActionContentToolbar toolbar, final GuiActionDescCollection actionRegistry, final I18nTranslationService i18n, final Provider<FileDownloadUtils> downloadProvider, final Provider<MediaUtils> mediaUtils) { super(BlogClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, mediaUtils); Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.blogs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface BlogFolderContentView extends AbstractContentView { Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewer.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewer.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.blogs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContent; +import cc.kune.core.client.cnt.FoldableContent; public interface BlogViewer extends FoldableContent { } Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,13 +19,16 @@ */ package org.ourproject.kune.blogs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class BlogViewerPanel extends FoldableContentPanel implements BlogViewerView { - public BlogViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public BlogViewerPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); } } Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,18 +20,18 @@ package org.ourproject.kune.blogs.client.cnt; import org.ourproject.kune.blogs.client.BlogClientTool; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.ContentActionRegistry; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class BlogViewerPresenter extends FoldableContentPresenter implements BlogViewer { Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.blogs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface BlogViewerView extends AbstractContentView { Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,19 +19,15 @@ \*/ package org.ourproject.kune.chat.client; -import org.ourproject.kune.blogs.client.BlogClientTool; import org.ourproject.kune.chat.client.ctx.room.AddRoom; -import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.gallery.client.GalleryClientTool; import org.ourproject.kune.platf.client.actions.ActionEnableCondition; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; -import org.ourproject.kune.wiki.client.WikiClientTool; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.ContentStatus; @@ -113,16 +109,23 @@ addRoom.setToolTip(i18n.t("Create a new chat room")); addRoom.setMustBeAuthenticated(true); - contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_DOCUMENT); - contentActionRegistry.addAction(chatAbout, DocumentClientTool.TYPE_UPLOADEDFILE); - contentActionRegistry.addAction(chatAbout, WikiClientTool.TYPE_WIKIPAGE); - contentActionRegistry.addAction(chatAbout, BlogClientTool.TYPE_POST); - contentActionRegistry.addAction(chatAbout, WikiClientTool.TYPE_UPLOADEDFILE); - contentActionRegistry.addAction(chatAbout, GalleryClientTool.TYPE_UPLOADEDFILE); - contentActionRegistry.addAction(chatAbout, BlogClientTool.TYPE_UPLOADEDFILE); - - contextActionRegistry.addAction(addRoom, ChatClientTool.TYPE_ROOT, ChatClientTool.TYPE_ROOM); - contentActionRegistry.addAction(joinRoom, ChatClientTool.TYPE_ROOM); + // contentActionRegistry.addAction(chatAbout, + // DocumentClientTool.TYPE_DOCUMENT); + // contentActionRegistry.addAction(chatAbout, + // DocumentClientTool.TYPE_UPLOADEDFILE); + // contentActionRegistry.addAction(chatAbout, + // WikiClientTool.TYPE_WIKIPAGE); + // contentActionRegistry.addAction(chatAbout, BlogClientTool.TYPE_POST); + // contentActionRegistry.addAction(chatAbout, + // WikiClientTool.TYPE_UPLOADEDFILE); + // contentActionRegistry.addAction(chatAbout, + // GalleryClientTool.TYPE_UPLOADEDFILE); + // contentActionRegistry.addAction(chatAbout, + // BlogClientTool.TYPE_UPLOADEDFILE); + // + // contextActionRegistry.addAction(addRoom, ChatClientTool.TYPE_ROOT, + // ChatClientTool.TYPE_ROOM); + // contentActionRegistry.addAction(joinRoom, ChatClientTool.TYPE_ROOM); } private ActionEnableCondition<StateToken> notDeleted() { Deleted: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,105 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 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 org.ourproject.kune.chat.client; - -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; - -public class ChatClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - // - // register(ToolGroup.class, new - // Factory<ChatClientActions>(ChatClientActions.class) { - // @Override - // public ChatClientActions create() { - // return new ChatClientActions(i(I18nUITranslationService.class), - // i(Session.class), - // i(ContentActionRegistry.class), i(ContextActionRegistry.class), - // p(ChatEngine.class), - // p(AddRoom.class), p(SchedulerManager.class)); - // } - // }); - // - // register(ToolGroup.class, new - // Factory<ChatClientTool>(ChatClientTool.class) { - // @Override - // public ChatClientTool create() { - // return new ChatClientTool(i(I18nUITranslationService.class), - // i(WorkspaceSkeleton.class), - // i(ToolSelector.class), i(WsThemeManager.class), - // i(ContentCapabilitiesRegistry.class)); - // } - // }); - // - // register(ToolGroup.class, new Factory<ChatContext>(ChatContext.class) - // { - // @Override - // public ChatContext create() { - // final ChatContextPresenter presenter = new - // ChatContextPresenter(i(StateManager.class), - // p(ContextNavigator.class)); - // return presenter; - // } - // }); - // - // register(ToolGroup.class, new Factory<ChatEngine>(ChatEngine.class) { - // @Override - // public ChatEngine create() { - // final ChatEngineDefault chatEngineDefault = new - // ChatEngineDefault(i(I18nUITranslationService.class), - // i(WorkspaceSkeleton.class), i(AppStarter.class), i(Session.class), - // p(EmiteUIDialog.class), - // p(FileDownloadUtils.class), i(GlobalShortcutRegister.class)); - // return chatEngineDefault; - // } - // }); - // - // register(ToolGroup.class, new Factory<ChatRoom>(ChatRoom.class) { - // @Override - // public ChatRoom create() { - // final ChatRoomPresenter presenter = new - // ChatRoomPresenter(i(StateManager.class), i(Session.class), - // i(I18nUITranslationService.class), i(ActionContentToolbar.class), - // i(ContentActionRegistry.class), p(FileDownloadUtils.class), - // p(MediaUtils.class)); - // final ChatRoomPanel panel = new - // ChatRoomPanel(i(WorkspaceSkeleton.class), - // i(I18nTranslationService.class)); - // presenter.init(panel); - // return presenter; - // } - // }); - // - // register(Singleton.class, new Factory<AddRoom>(AddRoom.class) { - // @Override - // public AddRoom create() { - // final AddRoomPresenter presenter = new - // AddRoomPresenter(i(Session.class), p(ContentServiceAsync.class), - // i(StateManager.class)); - // final AddRoomPanel panel = new AddRoomPanel(presenter, - // i(I18nTranslationService.class)); - // presenter.init(panel); - // return presenter; - // } - // }); - - } -} Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -24,8 +24,8 @@ import org.ourproject.kune.workspace.client.tool.OldFoldableAbstractClientTool; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.tool.ToolSelector; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.tool.ToolSelector; public class ChatClientTool extends OldFoldableAbstractClientTool { public static final String NAME = "chats"; Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,14 +19,17 @@ */ package org.ourproject.kune.chat.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class ChatRoomPanel extends FoldableContentPanel implements ChatRoomView { - public ChatRoomPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public ChatRoomPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,29 +20,28 @@ package org.ourproject.kune.chat.client.cnt; import org.ourproject.kune.chat.client.ChatClientTool; -import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.utils.TextUtils; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContainerDTO; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class ChatRoomPresenter extends FoldableContentPresenter implements ChatRoom { - private ChatRoomView view; private final I18nUITranslationService i18n; + private ChatRoomView view; public ChatRoomPresenter(final StateManager stateManager, final Session session, final I18nUITranslationService i18n, final ActionContentToolbar toolbar, - final ActionRegistry<StateToken> actionRegistry, final Provider<FileDownloadUtils> downloadProvider, + final GuiActionDescCollection actionRegistry, final Provider<FileDownloadUtils> downloadProvider, final Provider<MediaUtils> mediaUtils) { super(ChatClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, mediaUtils); this.i18n = i18n; Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.chat.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface ChatRoomView extends AbstractContentView { Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -26,7 +26,6 @@ import org.ourproject.kune.docs.client.cnt.DocumentViewer; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; @@ -37,6 +36,7 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; Deleted: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,124 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 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 org.ourproject.kune.docs.client; - -import org.ourproject.kune.docs.client.cnt.DocFolderContent; -import org.ourproject.kune.docs.client.cnt.DocFolderContentPanel; -import org.ourproject.kune.docs.client.cnt.DocFolderContentPresenter; -import org.ourproject.kune.docs.client.cnt.DocFolderContentView; -import org.ourproject.kune.docs.client.cnt.DocumentViewer; -import org.ourproject.kune.docs.client.cnt.DocumentViewerPanel; -import org.ourproject.kune.docs.client.cnt.DocumentViewerPresenter; -import org.ourproject.kune.docs.client.cnt.DocumentViewerView; -import org.ourproject.kune.docs.client.ctx.DocumentContext; -import org.ourproject.kune.docs.client.ctx.DocumentContextPresenter; -import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tool.ToolSelector; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; - -public class DocumentClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - - register(ToolGroup.class, new Factory<DocumentClientTool>(DocumentClientTool.class) { - @Override - public DocumentClientTool create() { - i(DocumentClientActions.class); - return new DocumentClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), - i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); - } - }); - - register(ToolGroup.class, new Factory<DocumentClientActions>(DocumentClientActions.class) { - @Override - public DocumentClientActions create() { - return new DocumentClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), - i(Session.class), i(StateManager.class), i(SchedulerManager.class), - p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), - i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), - i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(DocumentViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); - } - }); - - register(ToolGroup.class, new Factory<DocumentContext>(DocumentContext.class) { - @Override - public DocumentContext create() { - final DocumentContextPresenter presenter = new DocumentContextPresenter(i(StateManager.class), - p(ContextNavigator.class), p(ContextPropEditor.class)); - return presenter; - } - }); - - register(Singleton.class, new Factory<DocumentViewer>(DocumentViewer.class) { - @Override - public DocumentViewer create() { - final DocumentViewerPresenter presenter = new DocumentViewerPresenter(i(StateManager.class), - i(Session.class), i(I18nUITranslationService.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final DocumentViewerView view = new DocumentViewerPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - - register(ToolGroup.class, new Factory<DocFolderContent>(DocFolderContent.class) { - @Override - public DocFolderContent create() { - final DocFolderContentPresenter presenter = new DocFolderContentPresenter(i(StateManager.class), - i(Session.class), i(ActionContentToolbar.class), i(ContentActionRegistry.class), - p(FileDownloadUtils.class), i(I18nTranslationService.class), p(MediaUtils.class)); - final DocFolderContentView view = new DocFolderContentPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - } -} Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -25,7 +25,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.tool.ToolSelector; +import cc.kune.gspace.client.tool.ToolSelector; public class DocumentClientTool extends OldFoldableAbstractClientTool { public static final String NAME = "docs"; Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,15 +19,18 @@ */ package org.ourproject.kune.docs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class DocFolderContentPanel extends FoldableContentPanel implements DocFolderContentView { - public DocFolderContentPanel(WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public DocFolderContentPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); setInfo(""); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,23 +20,22 @@ package org.ourproject.kune.docs.client.cnt; import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class DocFolderContentPresenter extends FoldableContentPresenter implements DocFolderContent { public DocFolderContentPresenter(final StateManager stateManager, final Session session, - final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final ActionContentToolbar toolbar, final GuiActionDescCollection actionRegistry, final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n, final Provider<MediaUtils> mediaUtils) { super(DocumentClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.docs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface DocFolderContentView extends AbstractContentView { } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewer.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewer.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.docs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContent; +import cc.kune.core.client.cnt.FoldableContent; public interface DocumentViewer extends FoldableContent { } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,13 +19,17 @@ */ package org.ourproject.kune.docs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class DocumentViewerPanel extends FoldableContentPanel implements DocumentViewerView { - public DocumentViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + + @Inject + public DocumentViewerPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,18 +20,18 @@ package org.ourproject.kune.docs.client.cnt; import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.ContentActionRegistry; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class DocumentViewerPresenter extends FoldableContentPresenter implements DocumentViewer { Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.docs.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface DocumentViewerView extends AbstractContentView { } Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -25,7 +25,6 @@ import org.ourproject.kune.gallery.client.cnt.GalleryViewer; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; @@ -36,6 +35,7 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; Deleted: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,125 +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 org.ourproject.kune.gallery.client; - -import org.ourproject.kune.gallery.client.cnt.GalleryFolderContent; -import org.ourproject.kune.gallery.client.cnt.GalleryFolderContentPanel; -import org.ourproject.kune.gallery.client.cnt.GalleryFolderContentPresenter; -import org.ourproject.kune.gallery.client.cnt.GalleryFolderContentView; -import org.ourproject.kune.gallery.client.cnt.GalleryViewer; -import org.ourproject.kune.gallery.client.cnt.GalleryViewerPanel; -import org.ourproject.kune.gallery.client.cnt.GalleryViewerPresenter; -import org.ourproject.kune.gallery.client.cnt.GalleryViewerView; -import org.ourproject.kune.gallery.client.ctx.GalleryContext; -import org.ourproject.kune.gallery.client.ctx.GalleryContextPresenter; -import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tool.ToolSelector; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; - -public class GalleryClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - - register(ToolGroup.class, new Factory<GalleryClientTool>(GalleryClientTool.class) { - @Override - public GalleryClientTool create() { - i(GalleryClientActions.class); - return new GalleryClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), - i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); - } - }); - - register(ToolGroup.class, new Factory<GalleryClientActions>(GalleryClientActions.class) { - @Override - public GalleryClientActions create() { - return new GalleryClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), - i(Session.class), i(StateManager.class), i(SchedulerManager.class), - p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), - i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), - i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(GalleryViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); - } - }); - - register(ToolGroup.class, new Factory<GalleryContext>(GalleryContext.class) { - @Override - public GalleryContext create() { - final GalleryContextPresenter presenter = new GalleryContextPresenter(i(StateManager.class), - p(ContextNavigator.class), p(ContextPropEditor.class)); - return presenter; - } - }); - - register(Singleton.class, new Factory<GalleryViewer>(GalleryViewer.class) { - @Override - public GalleryViewer create() { - final GalleryViewerPresenter presenter = new GalleryViewerPresenter(i(StateManager.class), - i(Session.class), i(I18nUITranslationService.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final GalleryViewerView view = new GalleryViewerPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - - register(ToolGroup.class, new Factory<GalleryFolderContent>(GalleryFolderContent.class) { - @Override - public GalleryFolderContent create() { - final GalleryFolderContentPresenter presenter = new GalleryFolderContentPresenter( - i(StateManager.class), i(Session.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), i(I18nTranslationService.class), p(FileDownloadUtils.class), - p(FileDownloadUtils.class), p(MediaUtils.class)); - final GalleryFolderContentView view = new GalleryFolderContentPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class), i(StateManager.class), i(Session.class)); - presenter.init(view); - return presenter; - } - }); - } -} Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -25,7 +25,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.tool.ToolSelector; +import cc.kune.gspace.client.tool.ToolSelector; public class GalleryClientTool extends OldFoldableAbstractClientTool { public static final String NAME = "gallery"; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,40 +19,45 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - import cc.kune.common.client.ui.BasicThumb; +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.FlowPanel; +import com.google.inject.Inject; public class GalleryFolderContentPanel extends FoldableContentPanel implements GalleryFolderContentView { private static final int TEXT_MAX_LENGHT = 15; private FlowPanel flowPanel; + private final Session session; private final StateManager stateManager; - private final Session session; - public GalleryFolderContentPanel(final WorkspaceSkeleton ws, final I18nTranslationService i18n, + @Inject + public GalleryFolderContentPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res, final StateManager stateManager, final Session session) { - super(ws, i18n); + super(ws, i18n, res); this.stateManager = stateManager; this.session = session; } + @Override public void addThumb(final StateToken token, final String title, final String imgUrl) { Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override public void execute() { final BasicThumb thumb = new BasicThumb(imgUrl, session.getImgCropsize(), title, TEXT_MAX_LENGHT, true, new ClickHandler() { + @Override public void onClick(final ClickEvent event) { stateManager.gotoToken(token); } @@ -67,6 +72,7 @@ }); } + @Override public void setThumbPanel() { if (flowPanel == null) { flowPanel = new FlowPanel(); Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,13 +20,13 @@ package org.ourproject.kune.gallery.client.cnt; import org.ourproject.kune.gallery.client.GalleryClientTool; -import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.services.ImageSize; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; @@ -35,16 +35,16 @@ import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class GalleryFolderContentPresenter extends FoldableContentPresenter implements GalleryFolderContent { + private final Provider<FileDownloadUtils> downloadUtils; + private final I18nTranslationService i18n; private GalleryFolderContentView view; - private final I18nTranslationService i18n; - private final Provider<FileDownloadUtils> downloadUtils; public GalleryFolderContentPresenter(final StateManager stateManager, final Session session, - final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final ActionContentToolbar toolbar, final GuiActionDescCollection actionRegistry, final I18nTranslationService i18n, final Provider<FileDownloadUtils> downloadUtils, final Provider<FileDownloadUtils> downloadProvider, final Provider<MediaUtils> mediaUtils) { super(GalleryClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, @@ -61,7 +61,7 @@ @Override protected void setState(final StateContainerDTO state) { if (state.getTypeId().equals(GalleryClientTool.TYPE_ROOT)) { - ContainerDTO rootContainer = state.getRootContainer(); + final ContainerDTO rootContainer = state.getRootContainer(); if (rootContainer.getChilds().size() == 0 && rootContainer.getContents().size() == 0) { view.setInfo(i18n.t("This gallery has no content")); } else { @@ -69,10 +69,10 @@ } } else if (state.isType(GalleryClientTool.TYPE_ALBUM) && (state.getContainer().getContents().size() > 0)) { view.setThumbPanel(); - for (ContentSimpleDTO content : state.getContainer().getContents()) { + for (final ContentSimpleDTO content : state.getContainer().getContents()) { if (content.getMimeType().isImage()) { - StateToken token = content.getStateToken(); - String imgUrl = downloadUtils.get().getImageResizedUrl(token, ImageSize.thumb); + final StateToken token = content.getStateToken(); + final String imgUrl = downloadUtils.get().getImageResizedUrl(token, ImageSize.thumb); view.addThumb(token, content.getTitle(), imgUrl); } } Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,8 +19,8 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; import cc.kune.core.shared.domain.utils.StateToken; public interface GalleryFolderContentView extends AbstractContentView { Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewer.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewer.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContent; +import cc.kune.core.client.cnt.FoldableContent; public interface GalleryViewer extends FoldableContent { } Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,14 +19,17 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class GalleryViewerPanel extends FoldableContentPanel implements GalleryViewerView { - public GalleryViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public GalleryViewerPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); } } Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,18 +20,18 @@ package org.ourproject.kune.gallery.client.cnt; import org.ourproject.kune.gallery.client.GalleryClientTool; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.ContentActionRegistry; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class GalleryViewerPresenter extends FoldableContentPresenter implements GalleryViewer { Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface GalleryViewerView extends AbstractContentView { } 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-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -71,7 +71,6 @@ import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialogPanel; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialogPresenter; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaGroup; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertMediaExt; import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertMediaExtPanel; import org.ourproject.kune.platf.client.ui.rte.insertmedia.ext.InsertMediaExtPresenter; @@ -101,6 +100,7 @@ import cc.kune.core.client.resources.icons.IconResources; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.client.services.ImageUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ContentPosition.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,73 +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 org.ourproject.kune.platf.client.ui.rte.insertimg; - -import org.cobogw.gwt.user.client.CSS; -import org.ourproject.kune.platf.client.i18n.Resources; - -import com.google.gwt.dom.client.Element; -import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.ui.HTML; - -public class ContentPosition { - - public static final String LEFT = "left"; - public static final String CENTER = "center"; - public static final String RIGHT = "right"; - - public static String[][] positions = { new String[] { LEFT }, new String[] { CENTER }, new String[] { RIGHT } }; - - private static Object[][] positionObjs; - - public synchronized static Object[][] getPositions() { - if (positionObjs == null) { - String[][] values = positions; - positionObjs = new Object[values.length][1]; - int i = 0; - for (String[] position : values) { - final Object[] obj = new Object[] { position[0], Resources.i18n.t(position[0]) }; - positionObjs[i++] = obj; - } - } - return positionObjs; - } - - public static String setCenterPosition(final String elementCode) { - return setPosition(elementCode, false, CENTER); - } - - public static Element setPosition(final Element element, final boolean wraptext, final String position) { - if (!wraptext || position.equals(ContentPosition.CENTER)) { - com.google.gwt.user.client.Element divEl = DOM.createDiv(); - CSS.setProperty(divEl, CSS.A.TEXT_ALIGN, position); - divEl.setInnerHTML(element.getString()); - return divEl; - } else { - CSS.setProperty(element, CSS.A.FLOAT, position); - return element; - } - } - - public static String setPosition(final String elementCode, final boolean wraptext, final String position) { - HTML html = new HTML(elementCode); - html.removeStyleName("gwt-HTML"); - return setPosition(html.getElement(), wraptext, position).getString(); - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ImageInfo.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -22,6 +22,8 @@ import org.cobogw.gwt.user.client.CSS; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo; +import cc.kune.core.client.ui.utils.ContentPosition; + import com.google.gwt.dom.client.Element; import com.google.gwt.user.client.DOM; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -21,6 +21,8 @@ import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; +import cc.kune.core.client.ui.utils.ContentPosition; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertElementAbstractPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -21,9 +21,10 @@ import org.ourproject.kune.platf.client.i18n.Resources; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; -import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; import org.ourproject.kune.platf.client.ui.rte.insertimg.ImageInfo; +import cc.kune.core.client.ui.utils.ContentPosition; + import com.gwtext.client.data.Record; import com.gwtext.client.data.SimpleStore; import com.gwtext.client.data.Store; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/abstractimg/InsertImageAbstractPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,10 +20,11 @@ package org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg; import org.ourproject.kune.platf.client.i18n.Resources; -import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; import org.ourproject.kune.platf.client.ui.rte.insertimg.ImageInfo; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialogView; +import cc.kune.core.client.ui.utils.ContentPosition; + import com.gwtext.client.data.Record; import com.gwtext.client.data.SimpleStore; import com.gwtext.client.data.Store; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/InsertMediaAbstractPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,10 +20,11 @@ package org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia; import org.ourproject.kune.platf.client.i18n.Resources; -import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertElementAbstractPanel; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialogView; +import cc.kune.core.client.ui.utils.ContentPosition; + import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.form.TextField; Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,65 +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 org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia; - -import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; - -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.domain.utils.StateToken; - -public class MediaUtils { - - public static final String DOC_URL_TAG = "###DOC_URL###"; - - private final Session session; - - private final FileDownloadUtils downloadUtils; - - public MediaUtils(final Session session, final FileDownloadUtils downloadUtils) { - this.session = session; - this.downloadUtils = downloadUtils; - } - - public String getAviEmbed(final StateToken token) { - return setCenterPosition(session.getInitData().getAviEmbedObject().replace(DOC_URL_TAG, - session.getSiteUrl() + downloadUtils.getUrl(token))); - } - - public String getFlvEmbed(final StateToken token) { - return setCenterPosition(session.getInitData().getFlvEmbedObject().replace(DOC_URL_TAG, - session.getSiteUrl() + downloadUtils.getUrl(token))); - } - - public String getMp3Embed(final StateToken token) { - return setCenterPosition(session.getInitData().getMp3EmbedObject().replace(DOC_URL_TAG, - session.getSiteUrl() + downloadUtils.getUrl(token))); - } - - public String getOggEmbed(final StateToken token) { - return setCenterPosition(session.getInitData().getOggEmbedObject().replace(DOC_URL_TAG, - session.getSiteUrl() + downloadUtils.getUrl(token))); - } - - private String setCenterPosition(final String elementCode) { - return ContentPosition.setCenterPosition(elementCode); - } - -} Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -26,7 +26,6 @@ import org.ourproject.kune.wiki.client.cnt.WikiViewer; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; @@ -37,6 +36,7 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.ContentServiceAsync; Deleted: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -1,124 +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 org.ourproject.kune.wiki.client; - -import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; -import org.ourproject.kune.wiki.client.cnt.WikiFolderContent; -import org.ourproject.kune.wiki.client.cnt.WikiFolderContentPanel; -import org.ourproject.kune.wiki.client.cnt.WikiFolderContentPresenter; -import org.ourproject.kune.wiki.client.cnt.WikiFolderContentView; -import org.ourproject.kune.wiki.client.cnt.WikiViewer; -import org.ourproject.kune.wiki.client.cnt.WikiViewerPanel; -import org.ourproject.kune.wiki.client.cnt.WikiViewerPresenter; -import org.ourproject.kune.wiki.client.cnt.WikiViewerView; -import org.ourproject.kune.wiki.client.ctx.WikiContext; -import org.ourproject.kune.wiki.client.ctx.WikiContextPresenter; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.themes.WsBackManager; -import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tool.ToolSelector; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.ioc.decorator.Singleton; -import com.calclab.suco.client.ioc.module.Factory; - -public class WikiClientModule extends AbstractExtendedModule { - - @Override - public void onInstall() { - - register(ToolGroup.class, new Factory<WikiClientTool>(WikiClientTool.class) { - @Override - public WikiClientTool create() { - i(WikiClientActions.class); - return new WikiClientTool(i(I18nUITranslationService.class), i(ToolSelector.class), - i(WsThemeManager.class), i(WorkspaceSkeleton.class), i(ContentCapabilitiesRegistry.class)); - } - }); - - register(ToolGroup.class, new Factory<WikiClientActions>(WikiClientActions.class) { - @Override - public WikiClientActions create() { - return new WikiClientActions(i(I18nUITranslationService.class), i(ContextNavigator.class), - i(Session.class), i(StateManager.class), i(SchedulerManager.class), - p(ContentServiceAsync.class), p(GroupServiceAsync.class), p(FileUploader.class), - i(ContentActionRegistry.class), i(ContextActionRegistry.class), p(FileDownloadUtils.class), - i(EntityHeader.class), p(ContentEditor.class), i(ErrorHandler.class), i(WikiViewer.class), - p(ContextPropEditor.class), i(SitePublicSpaceLink.class), i(WsBackManager.class)); - } - }); - - register(ToolGroup.class, new Factory<WikiContext>(WikiContext.class) { - @Override - public WikiContext create() { - final WikiContextPresenter presenter = new WikiContextPresenter(i(StateManager.class), - p(ContextNavigator.class), p(ContextPropEditor.class)); - return presenter; - } - }); - - register(Singleton.class, new Factory<WikiViewer>(WikiViewer.class) { - @Override - public WikiViewer create() { - final WikiViewerPresenter presenter = new WikiViewerPresenter(i(StateManager.class), i(Session.class), - i(I18nUITranslationService.class), i(ActionContentToolbar.class), - i(ContentActionRegistry.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final WikiViewerView view = new WikiViewerPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - - register(ToolGroup.class, new Factory<WikiFolderContent>(WikiFolderContent.class) { - @Override - public WikiFolderContent create() { - final WikiFolderContentPresenter presenter = new WikiFolderContentPresenter(i(StateManager.class), - i(Session.class), i(ActionContentToolbar.class), i(ContentActionRegistry.class), - i(I18nTranslationService.class), p(FileDownloadUtils.class), p(MediaUtils.class)); - final WikiFolderContentView view = new WikiFolderContentPanel(i(WorkspaceSkeleton.class), - i(I18nTranslationService.class)); - presenter.init(view); - return presenter; - } - }); - } -} Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -25,7 +25,7 @@ import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.tool.ToolSelector; +import cc.kune.gspace.client.tool.ToolSelector; public class WikiClientTool extends OldFoldableAbstractClientTool { public static final String NAME = "wiki"; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,15 +19,18 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class WikiFolderContentPanel extends FoldableContentPanel implements WikiFolderContentView { - public WikiFolderContentPanel(WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public WikiFolderContentPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); super.setLabel(""); } } Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,29 +19,28 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.wiki.client.WikiClientTool; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ContainerDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class WikiFolderContentPresenter extends FoldableContentPresenter implements WikiFolderContent { - private WikiFolderContentView view; private final I18nTranslationService i18n; + private WikiFolderContentView view; public WikiFolderContentPresenter(final StateManager stateManager, final Session session, - final ActionContentToolbar toolbar, final ActionRegistry<StateToken> actionRegistry, + final ActionContentToolbar toolbar, final GuiActionDescCollection actionRegistry, final I18nTranslationService i18n, final Provider<FileDownloadUtils> downloadProvider, final Provider<MediaUtils> mediaUtils) { super(WikiClientTool.NAME, stateManager, session, toolbar, actionRegistry, downloadProvider, i18n, mediaUtils); @@ -56,7 +55,7 @@ @Override protected void setState(final StateContainerDTO state) { if (state.getTypeId().equals(WikiClientTool.TYPE_ROOT)) { - ContainerDTO rootContainer = state.getRootContainer(); + final ContainerDTO rootContainer = state.getRootContainer(); if (rootContainer.getChilds().size() == 0 && rootContainer.getContents().size() == 0) { view.setInfo(i18n.t("This wiki has no pages.")); } else { Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface WikiFolderContentView extends AbstractContentView { } Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewer.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewer.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContent; +import cc.kune.core.client.cnt.FoldableContent; public interface WikiViewer extends FoldableContent { } Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,13 +19,16 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - +import cc.kune.core.client.cnt.FoldableContentPanel; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.WsArmor; +import com.google.inject.Inject; + public class WikiViewerPanel extends FoldableContentPanel implements WikiViewerView { - public WikiViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { - super(ws, i18n); + @Inject + public WikiViewerPanel(final WsArmor ws, final I18nTranslationService i18n, final CoreResources res) { + super(ws, i18n, res); } } Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,19 +19,19 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.wiki.client.WikiClientTool; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.cnt.ActionContentToolbar; +import cc.kune.core.client.cnt.ContentActionRegistry; +import cc.kune.core.client.cnt.FoldableContentPresenter; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; -import com.calclab.suco.client.ioc.Provider; +import com.google.inject.Provider; public class WikiViewerPresenter extends FoldableContentPresenter implements WikiViewer { Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerView.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerView.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.client.cnt.AbstractContentView; public interface WikiViewerView extends AbstractContentView { } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -32,8 +32,6 @@ import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; -import org.ourproject.kune.workspace.client.cnt.FoldableContent; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; @@ -44,6 +42,8 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.common.client.utils.SchedulerManager; +import cc.kune.core.client.cnt.ContentActionRegistry; +import cc.kune.core.client.cnt.FoldableContent; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.i18n.I18nUITranslationService; @@ -164,9 +164,8 @@ renameCtn.setTextDescription(textDescription); renameCtn.setParentMenuTitle(parentMenuTitle); renameCtn.setEnableCondition(notDeleted()); - // renameCtn.setShortcut(new ShortcutDescriptor(false, Keyboard.KEY_F2, - // i18n.tWithNT("F2", "The F2 Function key"))); - contentActionRegistry.addAction(renameCtn, registerInTypes); + + // contentActionRegistry.addAction(renameCtn, registerInTypes); } protected void createDelContainerAction(final String text, final String parentMenuTitle, @@ -211,7 +210,7 @@ delContent.setConfirmationTitle(i18n.t("Please confirm")); delContent.setConfirmationText(i18n.t("Are you sure?")); delContent.setEnableCondition(notDefAndNotDeleted()); - contentActionRegistry.addAction(delContent, registerInTypes); + // contentActionRegistry.addAction(delContent, registerInTypes); } protected void createDownloadActions(final String typeUploadedfile) { @@ -238,7 +237,7 @@ downloadCtx.setTextDescription(i18n.t("Download")); downloadCtx.setIconUrl("images/nav/download.png"); - contentActionRegistry.addAction(download, typeUploadedfile); + // contentActionRegistry.addAction(download, typeUploadedfile); contextActionRegistry.addAction(downloadCtx, typeUploadedfile); } @@ -310,7 +309,7 @@ editContent.setIconUrl("images/content_edit.png"); editContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); editContent.setEnableCondition(notDeleted()); - contentActionRegistry.addAction(editContent, registerInTypes); + // contentActionRegistry.addAction(editContent, registerInTypes); return editContent; } @@ -420,7 +419,7 @@ refreshCnt.setParentMenuTitle(parentMenuTitle); refreshCnt.setTextDescription(i18n.t("Refresh")); refreshCnt.setIconUrl("images/nav/refresh.png"); - contentActionRegistry.addAction(refreshCnt, registerInTypes); + // contentActionRegistry.addAction(refreshCnt, registerInTypes); return refreshCnt; } @@ -480,7 +479,8 @@ setAsDefGroupContent.setIconUrl("images/group-home.png"); setAsDefGroupContent.setEnableCondition(notDefAndNotDeleted()); setAsDefGroupContent.setParentMenuTitle(parentMenuTitle); - contentActionRegistry.addAction(setAsDefGroupContent, registerInTypes); + // contentActionRegistry.addAction(setAsDefGroupContent, + // registerInTypes); return setAsDefGroupContent; } @@ -512,7 +512,7 @@ return session.getContentState().getMimeType().isImage(); } }); - contentActionRegistry.addAction(setGroupBackImage, registerInTypes); + // contentActionRegistry.addAction(setGroupBackImage, registerInTypes); } protected void createSetStatusAction(final AccessRolDTO rol, final String textDescription, @@ -536,7 +536,7 @@ action.setTextDescription(textDescription); action.setParentMenuTitle(PUBLICATION_MENU); action.setParentMenuIconUrl("images/anybody.png"); - contentActionRegistry.addAction(action, contentsModerated); + // contentActionRegistry.addAction(action, contentsModerated); } protected void createShowDeletedItems(final String parentMenuTitle, final String... registerInTypes) { @@ -579,7 +579,7 @@ translateContent.setToolTip(i18n.t("Translate this document to other languages")); translateContent.setIconUrl("images/language.gif"); translateContent.setEnableCondition(notDeleted()); - contentActionRegistry.addAction(translateContent, registerInTypes); + // contentActionRegistry.addAction(translateContent, registerInTypes); return translateContent; } @@ -647,7 +647,7 @@ if (position.equals(Position.ctx)) { contextActionRegistry.addAction(action, registerInTypes); } else if (position.equals(Position.cnt)) { - contentActionRegistry.addAction(action, registerInTypes); + // contentActionRegistry.addAction(action, registerInTypes); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/RegistryModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -20,11 +20,11 @@ package org.ourproject.kune.workspace.client; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; import org.ourproject.kune.workspace.client.oldsn.GroupActionRegistry; import org.ourproject.kune.workspace.client.oldsn.UserActionRegistry; +import cc.kune.core.client.cnt.ContentActionRegistry; import cc.kune.core.client.registry.AclEditableRegistry; import cc.kune.core.client.registry.AuthorableRegistry; import cc.kune.core.client.registry.CanBeHomepageRegistry; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -40,11 +40,8 @@ import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkGroup; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaGroup; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialog; import org.ourproject.kune.platf.client.ui.rte.inserttable.InsertTableDialog; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; -import org.ourproject.kune.workspace.client.cnt.ActionContentToolbarPresenter; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigatorPanel; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigatorPresenter; @@ -203,15 +200,16 @@ import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.HistoryTokenCallback; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SiteCommonTokens; import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tags.TagsSummary; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateTokenUtils; import cc.kune.core.shared.dto.UserSimpleDTO; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.tags.TagsSummary; import com.calclab.suco.client.ioc.decorator.NoDecoration; import com.calclab.suco.client.ioc.decorator.Singleton; @@ -982,16 +980,20 @@ } }); - register(NoDecoration.class, new Factory<ActionContentToolbar>(ActionContentToolbar.class) { - @Override - public ActionContentToolbar create() { - final ActionCntCtxToolbarPanel<StateToken> tbar = new ActionCntCtxToolbarPanel<StateToken>( - AbstractFoldableContentActions.CONTENT_TOPBAR, p(ActionManager.class), - i(WorkspaceSkeleton.class)); - final ActionContentToolbar toolbar = new ActionContentToolbarPresenter(tbar); - return toolbar; - } - }); + // register(NoDecoration.class, new + // Factory<ActionContentToolbar>(ActionContentToolbar.class) { + // @Override + // public ActionContentToolbar create() { + // final ActionCntCtxToolbarPanel<StateToken> tbar = new + // ActionCntCtxToolbarPanel<StateToken>( + // AbstractFoldableContentActions.CONTENT_TOPBAR, + // p(ActionManager.class), + // i(WorkspaceSkeleton.class)); + // final ActionContentToolbar toolbar = new + // ActionContentToolbarPresenter(tbar); + // return toolbar; + // } + // }); register(Singleton.class, new Factory<ContentEditor>(ContentEditor.class) { @Override Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -30,13 +30,13 @@ import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tags.TagsSummary; import cc.kune.core.shared.domain.TagCloudResult; import cc.kune.core.shared.dto.AccessListsDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.dto.UserSimpleDTO; +import cc.kune.gspace.client.tags.TagsSummary; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -21,8 +21,8 @@ import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPresenter; -import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; +import cc.kune.core.client.services.MediaUtils; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.StateToken; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldAbstractClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldAbstractClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldAbstractClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -22,9 +22,9 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemeManager; -import cc.kune.core.client.tool.ToolSelector; -import cc.kune.core.client.tool.ToolSelectorItemPanel; -import cc.kune.core.client.tool.ToolSelectorItemPresenter; +import cc.kune.gspace.client.tool.ToolSelector; +import cc.kune.gspace.client.tool.ToolSelectorItemPanel; +import cc.kune.gspace.client.tool.ToolSelectorItemPresenter; public abstract class OldAbstractClientTool implements OldClientTool { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldFoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldFoldableAbstractClientTool.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tool/OldFoldableAbstractClientTool.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -23,8 +23,8 @@ import org.ourproject.kune.workspace.client.themes.WsThemeManager; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.client.tool.ToolSelector; import cc.kune.core.shared.dto.BasicMimeTypeDTO; +import cc.kune.gspace.client.tool.ToolSelector; public abstract class OldFoldableAbstractClientTool extends OldAbstractClientTool { public static final String UPLOADEDFILE_SUFFIX = "uploaded"; Copied: trunk/src/test/java/cc/kune/gspace/client/tags (from rev 1281, trunk/src/test/java/cc/kune/core/client/tags) Modified: trunk/src/test/java/cc/kune/gspace/client/tags/TagsSummaryPresenterTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/tags/TagsSummaryPresenterTest.java 2011-03-17 18:03:05 UTC (rev 1281) +++ trunk/src/test/java/cc/kune/gspace/client/tags/TagsSummaryPresenterTest.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.tags; +package cc.kune.gspace.client.tags; import java.util.ArrayList; @@ -28,11 +28,12 @@ import cc.kune.core.client.state.EventBusTester; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tags.TagsSummaryPresenter.TagsSummaryProxy; -import cc.kune.core.client.tags.TagsSummaryPresenter.TagsSummaryView; import cc.kune.core.shared.domain.TagCloudResult; import cc.kune.core.shared.domain.TagCount; import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.gspace.client.tags.TagsSummaryPresenter; +import cc.kune.gspace.client.tags.TagsSummaryPresenter.TagsSummaryProxy; +import cc.kune.gspace.client.tags.TagsSummaryPresenter.TagsSummaryView; public class TagsSummaryPresenterTest { Copied: trunk/src/test/java/cc/kune/gspace/client/tool (from rev 1291, trunk/src/test/java/cc/kune/core/client/tool) Modified: trunk/src/test/java/cc/kune/gspace/client/tool/ToolSelectorPresenterTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/tool/ToolSelectorPresenterTest.java 2011-03-24 23:10:11 UTC (rev 1291) +++ trunk/src/test/java/cc/kune/gspace/client/tool/ToolSelectorPresenterTest.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package cc.kune.core.client.tool; +package cc.kune.gspace.client.tool; import org.junit.Before; import org.junit.Test; @@ -25,8 +25,10 @@ import cc.kune.core.client.state.EventBusTester; import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.tool.ToolSelectorPresenter.ToolSelectorProxy; -import cc.kune.core.client.tool.ToolSelectorPresenter.ToolSelectorView; +import cc.kune.gspace.client.tool.ToolSelectorItem; +import cc.kune.gspace.client.tool.ToolSelectorPresenter; +import cc.kune.gspace.client.tool.ToolSelectorPresenter.ToolSelectorProxy; +import cc.kune.gspace.client.tool.ToolSelectorPresenter.ToolSelectorView; public class ToolSelectorPresenterTest { Modified: trunk/src/test/java/testsuites/OthersTestSuite.java =================================================================== --- trunk/src/test/java/testsuites/OthersTestSuite.java 2011-03-25 10:09:09 UTC (rev 1292) +++ trunk/src/test/java/testsuites/OthersTestSuite.java 2011-03-25 12:43:38 UTC (rev 1293) @@ -36,8 +36,8 @@ import org.ourproject.kune.workspace.client.socialnet.SNRolActionTest; import org.ourproject.kune.workspace.client.socialnet.RolComparatorTest; -import cc.kune.core.client.tags.TagsSummaryPresenterTest; -import cc.kune.core.client.tool.ToolSelectorPresenterTest; +import cc.kune.gspace.client.tags.TagsSummaryPresenterTest; +import cc.kune.gspace.client.tool.ToolSelectorPresenterTest; /** * Rescan with :