Author: vjrj Date: 2008-11-17 11:18:11 +0100 (Mon, 17 Nov 2008) New Revision: 953 Added: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocContextPropEditor.java trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocContextPropEditorPanel.java trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocContextPropEditorPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocContextPropEditorView.java Removed: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/folder/ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditor.java trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorPanel.java trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorView.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxedit/ Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AbstractContextPropEditorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AbstractContextPropEditorPresenter.java Log: Incomplete - task New Register of type_id and capabilities Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-11-17 10:14:27 UTC (rev 952) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-11-17 10:18:11 UTC (rev 953) @@ -29,7 +29,7 @@ import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_WIKIPAGE; import org.ourproject.kune.docs.client.cnt.DocumentViewer; -import org.ourproject.kune.docs.client.ctx.admin.DocContextPropEditor; +import org.ourproject.kune.docs.client.ctx.DocContextPropEditor; import org.ourproject.kune.platf.client.actions.ActionEnableCondition; import org.ourproject.kune.platf.client.actions.ActionMenuItemDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonAndItemDescriptor; Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-11-17 10:14:27 UTC (rev 952) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-11-17 10:18:11 UTC (rev 953) @@ -26,12 +26,12 @@ 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.DocContextPropEditor; +import org.ourproject.kune.docs.client.ctx.DocContextPropEditorPanel; +import org.ourproject.kune.docs.client.ctx.DocContextPropEditorPresenter; +import org.ourproject.kune.docs.client.ctx.DocContextPropEditorView; import org.ourproject.kune.docs.client.ctx.DocumentContext; import org.ourproject.kune.docs.client.ctx.DocumentContextPresenter; -import org.ourproject.kune.docs.client.ctx.admin.DocContextPropEditor; -import org.ourproject.kune.docs.client.ctx.admin.DocContextPropEditorPanel; -import org.ourproject.kune.docs.client.ctx.admin.DocContextPropEditorPresenter; -import org.ourproject.kune.docs.client.ctx.admin.DocContextPropEditorView; import org.ourproject.kune.platf.client.actions.ContentActionRegistry; import org.ourproject.kune.platf.client.actions.ContextActionRegistry; import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar; Copied: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocContextPropEditor.java (from rev 949, trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditor.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditor.java 2008-11-11 13:33:36 UTC (rev 949) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocContextPropEditor.java 2008-11-17 10:18:11 UTC (rev 953) @@ -0,0 +1,32 @@ +/* + * + * Copyright (C) 2007-2008 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.ctx; + +import org.ourproject.kune.platf.client.dto.StateContentDTO; + +public interface DocContextPropEditor { + void attach(); + + void clear(); + + void detach(); + + void setState(StateContentDTO content); +} Copied: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocContextPropEditorPanel.java (from rev 952, trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorPanel.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorPanel.java 2008-11-17 10:14:27 UTC (rev 952) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocContextPropEditorPanel.java 2008-11-17 10:18:11 UTC (rev 953) @@ -0,0 +1,37 @@ +/* + * + * Copyright (C) 2007-2008 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.ctx; + +import org.ourproject.kune.platf.client.services.I18nTranslationService; +import org.ourproject.kune.platf.client.services.Images; +import org.ourproject.kune.workspace.client.cxt.AbstractContextPropEditorPanel; +import org.ourproject.kune.workspace.client.i18n.LanguageSelector; +import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; + +import com.calclab.suco.client.ioc.Provider; + +public class DocContextPropEditorPanel extends AbstractContextPropEditorPanel implements DocContextPropEditorView { + + public DocContextPropEditorPanel(final DocContextPropEditorPresenter presenter, final I18nTranslationService i18n, + WorkspaceSkeleton ws, Provider<LanguageSelector> langSelectorProv, Images images) { + super(presenter, i18n, ws, langSelectorProv, images); + } + +} Copied: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocContextPropEditorPresenter.java (from rev 952, trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorPresenter.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorPresenter.java 2008-11-17 10:14:27 UTC (rev 952) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocContextPropEditorPresenter.java 2008-11-17 10:18:11 UTC (rev 953) @@ -0,0 +1,42 @@ +/* + * + * Copyright (C) 2007-2008 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.ctx; + +import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; +import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; +import org.ourproject.kune.platf.client.state.Session; +import org.ourproject.kune.platf.client.state.StateManager; +import org.ourproject.kune.workspace.client.cxt.AbstractContextPropEditorPresenter; +import org.ourproject.kune.workspace.client.tags.TagsSummary; +import org.ourproject.kune.workspace.client.title.EntitySubTitle; +import org.ourproject.kune.workspace.client.title.EntityTitle; + +import com.calclab.suco.client.ioc.Provider; + +public class DocContextPropEditorPresenter extends AbstractContextPropEditorPresenter implements DocContextPropEditor { + + public DocContextPropEditorPresenter(final Session session, final StateManager stateManager, + ContentCapabilitiesRegistry capabilitiesRegistry, final Provider<TagsSummary> tagsSummaryProvider, + final Provider<ContentServiceAsync> contentServiceProvider, final EntityTitle entityTitle, + final EntitySubTitle entitySubTitle) { + super(session, stateManager, capabilitiesRegistry, tagsSummaryProvider, contentServiceProvider, entityTitle, + entitySubTitle); + } +} Copied: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocContextPropEditorView.java (from rev 952, trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorView.java) =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorView.java 2008-11-17 10:14:27 UTC (rev 952) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocContextPropEditorView.java 2008-11-17 10:18:11 UTC (rev 953) @@ -0,0 +1,26 @@ +/* + * + * Copyright (C) 2007-2008 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.ctx; + +import org.ourproject.kune.workspace.client.cxt.AbstractContextPropEditorView; + + +public interface DocContextPropEditorView extends AbstractContextPropEditorView { +} Modified: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java 2008-11-17 10:14:27 UTC (rev 952) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java 2008-11-17 10:18:11 UTC (rev 953) @@ -20,7 +20,6 @@ package org.ourproject.kune.docs.client.ctx; import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.docs.client.ctx.admin.DocContextPropEditor; import org.ourproject.kune.platf.client.dto.StateContainerDTO; import org.ourproject.kune.platf.client.dto.StateContentDTO; import org.ourproject.kune.platf.client.state.StateManager; Deleted: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditor.java 2008-11-17 10:14:27 UTC (rev 952) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditor.java 2008-11-17 10:18:11 UTC (rev 953) @@ -1,32 +0,0 @@ -/* - * - * Copyright (C) 2007-2008 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.ctx.admin; - -import org.ourproject.kune.platf.client.dto.StateContentDTO; - -public interface DocContextPropEditor { - void attach(); - - void clear(); - - void detach(); - - void setState(StateContentDTO content); -} Deleted: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorPanel.java 2008-11-17 10:14:27 UTC (rev 952) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorPanel.java 2008-11-17 10:18:11 UTC (rev 953) @@ -1,37 +0,0 @@ -/* - * - * Copyright (C) 2007-2008 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.ctx.admin; - -import org.ourproject.kune.platf.client.services.I18nTranslationService; -import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.workspace.client.cxt.AbstractContextPropEditorPanel; -import org.ourproject.kune.workspace.client.i18n.LanguageSelector; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import com.calclab.suco.client.ioc.Provider; - -public class DocContextPropEditorPanel extends AbstractContextPropEditorPanel implements DocContextPropEditorView { - - public DocContextPropEditorPanel(final DocContextPropEditorPresenter presenter, final I18nTranslationService i18n, - WorkspaceSkeleton ws, Provider<LanguageSelector> langSelectorProv, Images images) { - super(presenter, i18n, ws, langSelectorProv, images); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorPresenter.java 2008-11-17 10:14:27 UTC (rev 952) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorPresenter.java 2008-11-17 10:18:11 UTC (rev 953) @@ -1,42 +0,0 @@ -/* - * - * Copyright (C) 2007-2008 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.ctx.admin; - -import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; -import org.ourproject.kune.workspace.client.cxt.AbstractContextPropEditorPresenter; -import org.ourproject.kune.workspace.client.tags.TagsSummary; -import org.ourproject.kune.workspace.client.title.EntitySubTitle; -import org.ourproject.kune.workspace.client.title.EntityTitle; - -import com.calclab.suco.client.ioc.Provider; - -public class DocContextPropEditorPresenter extends AbstractContextPropEditorPresenter implements DocContextPropEditor { - - public DocContextPropEditorPresenter(final Session session, final StateManager stateManager, - ContentCapabilitiesRegistry capabilitiesRegistry, final Provider<TagsSummary> tagsSummaryProvider, - final Provider<ContentServiceAsync> contentServiceProvider, final EntityTitle entityTitle, - final EntitySubTitle entitySubTitle) { - super(session, stateManager, capabilitiesRegistry, tagsSummaryProvider, contentServiceProvider, entityTitle, - entitySubTitle); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorView.java 2008-11-17 10:14:27 UTC (rev 952) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/DocContextPropEditorView.java 2008-11-17 10:18:11 UTC (rev 953) @@ -1,26 +0,0 @@ -/* - * - * Copyright (C) 2007-2008 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.ctx.admin; - -import org.ourproject.kune.workspace.client.cxt.AbstractContextPropEditorView; - - -public interface DocContextPropEditorView extends AbstractContextPropEditorView { -} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AbstractContextPropEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AbstractContextPropEditorPanel.java 2008-11-17 10:14:27 UTC (rev 952) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AbstractContextPropEditorPanel.java 2008-11-17 10:18:11 UTC (rev 953) @@ -22,8 +22,8 @@ import java.util.Date; import java.util.List; -import org.ourproject.kune.docs.client.ctx.admin.DocContextPropEditorPresenter; -import org.ourproject.kune.docs.client.ctx.admin.DocContextPropEditorView; +import org.ourproject.kune.docs.client.ctx.DocContextPropEditorPresenter; +import org.ourproject.kune.docs.client.ctx.DocContextPropEditorView; import org.ourproject.kune.platf.client.dto.AccessListsDTO; import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; import org.ourproject.kune.platf.client.dto.UserSimpleDTO; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AbstractContextPropEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AbstractContextPropEditorPresenter.java 2008-11-17 10:14:27 UTC (rev 952) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AbstractContextPropEditorPresenter.java 2008-11-17 10:18:11 UTC (rev 953) @@ -22,7 +22,7 @@ import java.util.Date; import java.util.List; -import org.ourproject.kune.docs.client.ctx.admin.DocContextPropEditorView; +import org.ourproject.kune.docs.client.ctx.DocContextPropEditorView; import org.ourproject.kune.platf.client.dto.AccessListsDTO; import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; import org.ourproject.kune.platf.client.dto.StateContainerDTO;