[kune-commits] r951 - in trunk: doc
src/main/java/org/ourproject/kune/app/client
src/main/java/org/ourproject/kune/chat/client
src/main/java/org/ourproject/kune/docs/client
src/main/java/org/ourproject/kune/platf/client
src/main/java/org/ourproject/kune/platf/client/actions
src/main/java/org/ourproject/kune/platf/client/registry
src/main/java/org/ourproject/kune/platf/client/services
src/main/java/org/ourproject/kune/platf/client/tool
src/main/java/org/ourproject/kune/platf/server/domain
src/main/java/org/ourproject/kune/workspace/client/ctxnav
src/main/java/org/ourproject/kune/workspace/client/site/msg
src/main/java/org/ourproject/kune/workspace/client/title
vjrj
vjrj at ourproject.org
Thu Nov 13 04:38:08 CET 2008
Author: vjrj
Date: 2008-11-13 04:38:02 +0100 (Thu, 13 Nov 2008)
New Revision: 951
Added:
trunk/doc/kune-tools-and-functionality-summary.ods
trunk/src/main/java/org/ourproject/kune/platf/client/registry/
trunk/src/main/java/org/ourproject/kune/platf/client/registry/AbstractContentRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/CanBeHomepageRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/ComentableRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/ContentCapabilitiesRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/DragableRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/DropableRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/EmailSubscribeAbleRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/LicensableRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/PublishModerableRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/RateableRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/RenamableRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/TageableRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/TranslatableRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/VersionableRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/XmppComentableRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/registry/XmppNotifyCapableRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneRegistryModule.java
Removed:
trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractContentRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/DragDropContentRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/RenamableContentRegistry.java
Modified:
trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java
trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java
trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java
trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java
trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java
trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java
trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java
trunk/src/main/java/org/ourproject/kune/platf/client/tool/FoldableAbstractClientTool.java
trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteToastMessagePanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java
Log:
Incomplete - task Context properties editor
Incomplete - task New Register of type_id and capabilities
Added: trunk/doc/kune-tools-and-functionality-summary.ods
===================================================================
(Binary files differ)
Property changes on: trunk/doc/kune-tools-and-functionality-summary.ods
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -24,6 +24,7 @@
import org.ourproject.kune.platf.client.services.KuneCoreModule;
import org.ourproject.kune.platf.client.services.KuneModule;
import org.ourproject.kune.platf.client.services.KunePlatformModule;
+import org.ourproject.kune.platf.client.services.KuneRegistryModule;
import org.ourproject.kune.platf.client.services.KuneWorkspaceModule;
import com.allen_sauer.gwt.log.client.Log;
@@ -52,7 +53,8 @@
}
public void onModuleLoadCont() {
- Suco.install(new KuneCoreModule(), new KunePlatformModule(), new KuneWorkspaceModule(), new EmiteUIModule(),
- new DocumentClientModule(), new ChatClientModule(), new KuneModule());
+ Suco.install(new KuneCoreModule(), new KuneRegistryModule(), new KunePlatformModule(),
+ new KuneWorkspaceModule(), new EmiteUIModule(), new DocumentClientModule(), new ChatClientModule(),
+ new KuneModule());
}
}
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -29,11 +29,10 @@
import org.ourproject.kune.platf.client.actions.ContentActionRegistry;
import org.ourproject.kune.platf.client.actions.ContentIconsRegistry;
import org.ourproject.kune.platf.client.actions.ContextActionRegistry;
-import org.ourproject.kune.platf.client.actions.DragDropContentRegistry;
-import org.ourproject.kune.platf.client.actions.RenamableContentRegistry;
import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
import org.ourproject.kune.platf.client.app.Application;
import org.ourproject.kune.platf.client.app.ToolGroup;
+import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
import org.ourproject.kune.platf.client.services.I18nTranslationService;
import org.ourproject.kune.platf.client.state.Session;
@@ -68,7 +67,7 @@
public ChatClientTool create() {
return new ChatClientTool($(I18nUITranslationService.class), $(WorkspaceSkeleton.class),
$(ToolSelector.class), $(WsThemePresenter.class), $(ContentIconsRegistry.class),
- $(DragDropContentRegistry.class), $(RenamableContentRegistry.class));
+ $(ContentCapabilitiesRegistry.class));
}
});
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -20,8 +20,7 @@
package org.ourproject.kune.chat.client;
import org.ourproject.kune.platf.client.actions.ContentIconsRegistry;
-import org.ourproject.kune.platf.client.actions.DragDropContentRegistry;
-import org.ourproject.kune.platf.client.actions.RenamableContentRegistry;
+import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
import org.ourproject.kune.platf.client.services.I18nTranslationService;
import org.ourproject.kune.platf.client.tool.FoldableAbstractClientTool;
import org.ourproject.kune.platf.client.tool.ToolSelector;
@@ -36,10 +35,9 @@
public ChatClientTool(final I18nTranslationService i18n, final WorkspaceSkeleton ws,
final ToolSelector toolSelector, final WsThemePresenter wsThemePresenter,
- final ContentIconsRegistry contentIconsRegistry, final DragDropContentRegistry dragDropContentRegistry,
- RenamableContentRegistry renamablesContentRegistry) {
+ final ContentIconsRegistry contentIconsRegistry, ContentCapabilitiesRegistry contentCapabilitiesRegistry) {
super(NAME, i18n.t("chat rooms"), toolSelector, wsThemePresenter, ws, contentIconsRegistry,
- dragDropContentRegistry, renamablesContentRegistry);
+ contentCapabilitiesRegistry);
}
public String getName() {
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-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -35,10 +35,9 @@
import org.ourproject.kune.platf.client.actions.ContentActionRegistry;
import org.ourproject.kune.platf.client.actions.ContentIconsRegistry;
import org.ourproject.kune.platf.client.actions.ContextActionRegistry;
-import org.ourproject.kune.platf.client.actions.DragDropContentRegistry;
-import org.ourproject.kune.platf.client.actions.RenamableContentRegistry;
import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
import org.ourproject.kune.platf.client.app.ToolGroup;
+import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
import org.ourproject.kune.platf.client.services.I18nTranslationService;
@@ -73,8 +72,8 @@
public DocumentClientTool create() {
$(DocumentClientActions.class);
return new DocumentClientTool($(I18nUITranslationService.class), $(ToolSelector.class),
- $(WsThemePresenter.class), $(WorkspaceSkeleton.class), $(DragDropContentRegistry.class),
- $(ContentIconsRegistry.class), $(RenamableContentRegistry.class));
+ $(WsThemePresenter.class), $(WorkspaceSkeleton.class), $(ContentIconsRegistry.class),
+ $(ContentCapabilitiesRegistry.class));
}
});
Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -20,9 +20,8 @@
package org.ourproject.kune.docs.client;
import org.ourproject.kune.platf.client.actions.ContentIconsRegistry;
-import org.ourproject.kune.platf.client.actions.DragDropContentRegistry;
-import org.ourproject.kune.platf.client.actions.RenamableContentRegistry;
import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO;
+import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
import org.ourproject.kune.platf.client.tool.FoldableAbstractClientTool;
import org.ourproject.kune.platf.client.tool.ToolSelector;
import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService;
@@ -43,10 +42,9 @@
public DocumentClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector,
final WsThemePresenter wsThemePresenter, final WorkspaceSkeleton ws,
- final DragDropContentRegistry dragDropContentRegistry, final ContentIconsRegistry contentIconsRegistry,
- RenamableContentRegistry renamableContentRegistry) {
+ final ContentIconsRegistry contentIconsRegistry, ContentCapabilitiesRegistry contentCapabilitiesRegistry) {
super(NAME, i18n.t("documents"), toolSelector, wsThemePresenter, ws, contentIconsRegistry,
- dragDropContentRegistry, renamableContentRegistry);
+ contentCapabilitiesRegistry);
}
public String getName() {
@@ -55,13 +53,8 @@
@Override
protected void registerDragDropTypes() {
- dragDropContentRegistry.registerDraggableType(TYPE_DOCUMENT);
- dragDropContentRegistry.registerDraggableType(TYPE_FOLDER);
- dragDropContentRegistry.registerDraggableType(TYPE_UPLOADEDFILE);
-
- dragDropContentRegistry.registerDroppableType(TYPE_ROOT);
- dragDropContentRegistry.registerDroppableType(TYPE_FOLDER);
- dragDropContentRegistry.registerDroppableType(TYPE_GALLERY);
+ contentCapabilitiesRegistry.getDragable().register(TYPE_DOCUMENT, TYPE_FOLDER, TYPE_UPLOADEDFILE);
+ contentCapabilitiesRegistry.getDropable().register(TYPE_ROOT, TYPE_FOLDER, TYPE_GALLERY);
}
@Override
@@ -96,7 +89,7 @@
@Override
protected void registerRenamableTypes() {
- renamableContentRegistry.register(TYPE_DOCUMENT, TYPE_FOLDER, TYPE_BLOG, TYPE_GALLERY, TYPE_POST,
- TYPE_UPLOADEDFILE, TYPE_WIKI, TYPE_WIKIPAGE);
+ contentCapabilitiesRegistry.getRenamableContent().register(TYPE_DOCUMENT, TYPE_FOLDER, TYPE_BLOG, TYPE_GALLERY,
+ TYPE_POST, TYPE_UPLOADEDFILE, TYPE_WIKI, TYPE_WIKIPAGE);
}
}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractContentRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractContentRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractContentRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -1,31 +0,0 @@
-package org.ourproject.kune.platf.client.actions;
-
-import java.util.ArrayList;
-
-import com.allen_sauer.gwt.log.client.Log;
-
-public abstract class AbstractContentRegistry {
- private final ArrayList<String> registry;
-
- public AbstractContentRegistry() {
- registry = new ArrayList<String>();
- }
-
- public boolean contains(String typeId) {
- Log.debug("Renables: " + registry + " checking: " + typeId);
- return registry.contains(typeId);
- }
-
- public void register(String... typeIds) {
- for (String typeId : typeIds) {
- registry.add(typeId);
- }
- }
-
- public void unregister(String... typeIds) {
- for (String typeId : typeIds) {
- registry.remove(typeId);
- }
- }
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/actions/DragDropContentRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/DragDropContentRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/DragDropContentRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -1,49 +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.platf.client.actions;
-
-import java.util.ArrayList;
-
-public class DragDropContentRegistry {
-
- private final ArrayList<String> draggables;
- private final ArrayList<String> droppables;
-
- public DragDropContentRegistry() {
- draggables = new ArrayList<String>();
- droppables = new ArrayList<String>();
- }
-
- public boolean isDraggable(final String typeId, final boolean administrable) {
- return administrable && draggables.contains(typeId);
- }
-
- public boolean isDroppable(final String typeId, final boolean administrable) {
- return administrable && droppables.contains(typeId);
- }
-
- public void registerDraggableType(final String type) {
- draggables.add(type);
- }
-
- public void registerDroppableType(final String type) {
- droppables.add(type);
- }
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/actions/RenamableContentRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/RenamableContentRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/RenamableContentRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -1,4 +0,0 @@
-package org.ourproject.kune.platf.client.actions;
-
-public class RenamableContentRegistry extends AbstractContentRegistry {
-}
Copied: trunk/src/main/java/org/ourproject/kune/platf/client/registry/AbstractContentRegistry.java (from rev 949, trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractContentRegistry.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractContentRegistry.java 2008-11-11 13:33:36 UTC (rev 949)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/AbstractContentRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,32 @@
+package org.ourproject.kune.platf.client.registry;
+
+import java.util.ArrayList;
+
+public abstract class AbstractContentRegistry {
+ private final ArrayList<String> registry;
+
+ public AbstractContentRegistry() {
+ registry = new ArrayList<String>();
+ }
+
+ public boolean contains(String typeId) {
+ return registry.contains(typeId);
+ }
+
+ public void register(String... typeIds) {
+ for (String typeId : typeIds) {
+ registry.add(typeId);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "registry: " + registry;
+ }
+
+ public void unregister(String... typeIds) {
+ for (String typeId : typeIds) {
+ registry.remove(typeId);
+ }
+ }
+}
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/client/registry/AbstractContentRegistry.java
___________________________________________________________________
Name: svn:mergeinfo
+
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/CanBeHomepageRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/CanBeHomepageRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/CanBeHomepageRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class CanBeHomepageRegistry extends AbstractContentRegistry {
+}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/ComentableRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/ComentableRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/ComentableRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class ComentableRegistry extends AbstractContentRegistry {
+}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/ContentCapabilitiesRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/ContentCapabilitiesRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/ContentCapabilitiesRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,155 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class ContentCapabilitiesRegistry {
+
+ private final CanBeHomepageRegistry canBeHomepage;
+ private final ComentableRegistry comentable;
+ private final DragableRegistry dragable;
+ private final DropableRegistry dropable;
+ private final EmailSubscribeAbleRegistry emailSubscribeAble;
+ private final LicensableRegistry licensable;
+ private final PublishModerableRegistry publishModerable;
+ private final RateableRegistry rateable;
+ private final TageableRegistry tageable;
+ private final RenamableRegistry renamable;
+ private final TranslatableRegistry translatable;
+ private final VersionableRegistry versionable;
+ private final XmppComentableRegistry xmppComentable;
+ private final XmppNotifyCapableRegistry xmppNotifyCapable;
+
+ public ContentCapabilitiesRegistry(final CanBeHomepageRegistry canBeHomepage, final ComentableRegistry comentable,
+ final DragableRegistry dragable, final DropableRegistry dropable,
+ final EmailSubscribeAbleRegistry emailSubscribeAble, final LicensableRegistry licensable,
+ final PublishModerableRegistry publishModerable, final RateableRegistry rateable,
+ final TageableRegistry tageable, final RenamableRegistry renamable,
+ final TranslatableRegistry translatable, final VersionableRegistry versionable,
+ final XmppComentableRegistry xmppComentable, final XmppNotifyCapableRegistry xmppNotifyCapable) {
+ this.canBeHomepage = canBeHomepage;
+ this.comentable = comentable;
+ this.dragable = dragable;
+ this.dropable = dropable;
+ this.emailSubscribeAble = emailSubscribeAble;
+ this.licensable = licensable;
+ this.publishModerable = publishModerable;
+ this.rateable = rateable;
+ this.tageable = tageable;
+ this.renamable = renamable;
+ this.translatable = translatable;
+ this.versionable = versionable;
+ this.xmppComentable = xmppComentable;
+ this.xmppNotifyCapable = xmppNotifyCapable;
+ }
+
+ public boolean canBeHomepage(String typeId) {
+ return canBeHomepage.contains(typeId);
+ }
+
+ public CanBeHomepageRegistry getCanBeHomepage() {
+ return canBeHomepage;
+ }
+
+ public ComentableRegistry getComentable() {
+ return comentable;
+ }
+
+ public DragableRegistry getDragable() {
+ return dragable;
+ }
+
+ public DropableRegistry getDropable() {
+ return dropable;
+ }
+
+ public EmailSubscribeAbleRegistry getEmailSubscribeAble() {
+ return emailSubscribeAble;
+ }
+
+ public LicensableRegistry getLicensable() {
+ return licensable;
+ }
+
+ public PublishModerableRegistry getPublishModerable() {
+ return publishModerable;
+ }
+
+ public RateableRegistry getRateable() {
+ return rateable;
+ }
+
+ public RenamableRegistry getRenamableContent() {
+ return renamable;
+ }
+
+ public TageableRegistry getTageable() {
+ return tageable;
+ }
+
+ public TranslatableRegistry getTranslatable() {
+ return translatable;
+ }
+
+ public VersionableRegistry getVersionable() {
+ return versionable;
+ }
+
+ public XmppComentableRegistry getXmppComentable() {
+ return xmppComentable;
+ }
+
+ public XmppNotifyCapableRegistry getXmppNotificyCapable() {
+ return xmppNotifyCapable;
+ }
+
+ public boolean isComentable(String typeId) {
+ return comentable.contains(typeId);
+ }
+
+ public boolean isDragable(String typeId) {
+ return dragable.contains(typeId);
+ }
+
+ public boolean isDropable(String typeId) {
+ return dropable.contains(typeId);
+ }
+
+ public boolean isEmailSubscribeAble(String typeId) {
+ return emailSubscribeAble.contains(typeId);
+ }
+
+ public boolean isLicensable(String typeId) {
+ return licensable.contains(typeId);
+ }
+
+ public boolean isPublishModerable(String typeId) {
+ return publishModerable.contains(typeId);
+ }
+
+ public boolean isRateable(String typeId) {
+ return rateable.contains(typeId);
+ }
+
+ public boolean isRenamable(String typeId) {
+ return renamable.contains(typeId);
+ }
+
+ public boolean isTageable(String typeId) {
+ return tageable.contains(typeId);
+ }
+
+ public boolean isTranslatable(String typeId) {
+ return translatable.contains(typeId);
+ }
+
+ public boolean isVersionable(String typeId) {
+ return versionable.contains(typeId);
+ }
+
+ public boolean isXmppComentable(String typeId) {
+ return xmppComentable.contains(typeId);
+ }
+
+ public boolean isXmppNotifyCapable(String typeId) {
+ return xmppNotifyCapable.contains(typeId);
+ }
+
+}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/DragableRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/DragableRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/DragableRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class DragableRegistry extends AbstractContentRegistry {
+}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/DropableRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/DropableRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/DropableRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class DropableRegistry extends AbstractContentRegistry {
+}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/EmailSubscribeAbleRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/EmailSubscribeAbleRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/EmailSubscribeAbleRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class EmailSubscribeAbleRegistry extends AbstractContentRegistry {
+}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/LicensableRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/LicensableRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/LicensableRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class LicensableRegistry extends AbstractContentRegistry {
+}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/PublishModerableRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/PublishModerableRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/PublishModerableRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class PublishModerableRegistry extends AbstractContentRegistry {
+}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/RateableRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/RateableRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/RateableRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class RateableRegistry extends AbstractContentRegistry {
+}
Copied: trunk/src/main/java/org/ourproject/kune/platf/client/registry/RenamableRegistry.java (from rev 949, trunk/src/main/java/org/ourproject/kune/platf/client/actions/RenamableContentRegistry.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/RenamableContentRegistry.java 2008-11-11 13:33:36 UTC (rev 949)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/RenamableRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class RenamableRegistry extends AbstractContentRegistry {
+}
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/client/registry/RenamableRegistry.java
___________________________________________________________________
Name: svn:mergeinfo
+
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/TageableRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/TageableRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/TageableRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class TageableRegistry extends AbstractContentRegistry {
+}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/TranslatableRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/TranslatableRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/TranslatableRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class TranslatableRegistry extends AbstractContentRegistry {
+}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/VersionableRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/VersionableRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/VersionableRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class VersionableRegistry extends AbstractContentRegistry {
+}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/XmppComentableRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/XmppComentableRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/XmppComentableRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class XmppComentableRegistry extends AbstractContentRegistry {
+}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/registry/XmppNotifyCapableRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/registry/XmppNotifyCapableRegistry.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/registry/XmppNotifyCapableRegistry.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,4 @@
+package org.ourproject.kune.platf.client.registry;
+
+public class XmppNotifyCapableRegistry extends AbstractContentRegistry {
+}
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -22,9 +22,7 @@
import org.ourproject.kune.platf.client.actions.ContentActionRegistry;
import org.ourproject.kune.platf.client.actions.ContentIconsRegistry;
import org.ourproject.kune.platf.client.actions.ContextActionRegistry;
-import org.ourproject.kune.platf.client.actions.DragDropContentRegistry;
import org.ourproject.kune.platf.client.actions.GroupActionRegistry;
-import org.ourproject.kune.platf.client.actions.RenamableContentRegistry;
import org.ourproject.kune.platf.client.actions.UserActionRegistry;
import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbarPresenter;
@@ -40,6 +38,7 @@
import org.ourproject.kune.platf.client.app.HistoryWrapperDefault;
import org.ourproject.kune.platf.client.app.ToolGroup;
import org.ourproject.kune.platf.client.dto.StateToken;
+import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
import org.ourproject.kune.platf.client.rpc.ContentService;
import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
@@ -417,27 +416,6 @@
}
});
- register(Singleton.class, new Factory<DragDropContentRegistry>(DragDropContentRegistry.class) {
- @Override
- public DragDropContentRegistry create() {
- return new DragDropContentRegistry();
- }
- });
-
- register(Singleton.class, new Factory<RenamableContentRegistry>(RenamableContentRegistry.class) {
- @Override
- public RenamableContentRegistry create() {
- return new RenamableContentRegistry();
- }
- });
-
- register(Singleton.class, new Factory<ContentIconsRegistry>(ContentIconsRegistry.class) {
- @Override
- public ContentIconsRegistry create() {
- return new ContentIconsRegistry();
- }
- });
-
register(NoDecoration.class, new Factory<ActionContentToolbar>(ActionContentToolbar.class) {
@Override
public ActionContentToolbar create() {
@@ -463,8 +441,9 @@
public ContextNavigator create() {
final ContextNavigatorPresenter presenter = new ContextNavigatorPresenter($(StateManager.class),
$(Session.class), $$(ContentServiceAsync.class), i18n, $(EntityTitle.class),
- $(ContentIconsRegistry.class), $(DragDropContentRegistry.class), $(ActionContextToolbar.class),
- $(ContextActionRegistry.class), $$(FileDownloadUtils.class), true);
+ $(ContentIconsRegistry.class), $(ContentCapabilitiesRegistry.class),
+ $(ActionContextToolbar.class), $(ContextActionRegistry.class), $$(FileDownloadUtils.class),
+ true);
final ContextNavigatorPanel panel = new ContextNavigatorPanel(presenter, i18n,
$(WorkspaceSkeleton.class), $(ActionManager.class));
presenter.init(panel);
Added: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneRegistryModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneRegistryModule.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneRegistryModule.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -0,0 +1,148 @@
+package org.ourproject.kune.platf.client.services;
+
+import org.ourproject.kune.platf.client.actions.ContentIconsRegistry;
+import org.ourproject.kune.platf.client.registry.CanBeHomepageRegistry;
+import org.ourproject.kune.platf.client.registry.ComentableRegistry;
+import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
+import org.ourproject.kune.platf.client.registry.DragableRegistry;
+import org.ourproject.kune.platf.client.registry.DropableRegistry;
+import org.ourproject.kune.platf.client.registry.EmailSubscribeAbleRegistry;
+import org.ourproject.kune.platf.client.registry.LicensableRegistry;
+import org.ourproject.kune.platf.client.registry.PublishModerableRegistry;
+import org.ourproject.kune.platf.client.registry.RateableRegistry;
+import org.ourproject.kune.platf.client.registry.RenamableRegistry;
+import org.ourproject.kune.platf.client.registry.TageableRegistry;
+import org.ourproject.kune.platf.client.registry.TranslatableRegistry;
+import org.ourproject.kune.platf.client.registry.VersionableRegistry;
+import org.ourproject.kune.platf.client.registry.XmppComentableRegistry;
+import org.ourproject.kune.platf.client.registry.XmppNotifyCapableRegistry;
+
+import com.calclab.suco.client.ioc.decorator.Singleton;
+import com.calclab.suco.client.ioc.module.AbstractModule;
+import com.calclab.suco.client.ioc.module.Factory;
+
+public class KuneRegistryModule extends AbstractModule {
+
+ @Override
+ protected void onInstall() {
+
+ register(Singleton.class, new Factory<CanBeHomepageRegistry>(CanBeHomepageRegistry.class) {
+ @Override
+ public CanBeHomepageRegistry create() {
+ return new CanBeHomepageRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<ComentableRegistry>(ComentableRegistry.class) {
+ @Override
+ public ComentableRegistry create() {
+ return new ComentableRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<DragableRegistry>(DragableRegistry.class) {
+ @Override
+ public DragableRegistry create() {
+ return new DragableRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<DropableRegistry>(DropableRegistry.class) {
+ @Override
+ public DropableRegistry create() {
+ return new DropableRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<EmailSubscribeAbleRegistry>(EmailSubscribeAbleRegistry.class) {
+ @Override
+ public EmailSubscribeAbleRegistry create() {
+ return new EmailSubscribeAbleRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<LicensableRegistry>(LicensableRegistry.class) {
+ @Override
+ public LicensableRegistry create() {
+ return new LicensableRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<PublishModerableRegistry>(PublishModerableRegistry.class) {
+ @Override
+ public PublishModerableRegistry create() {
+ return new PublishModerableRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<RateableRegistry>(RateableRegistry.class) {
+ @Override
+ public RateableRegistry create() {
+ return new RateableRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<TageableRegistry>(TageableRegistry.class) {
+ @Override
+ public TageableRegistry create() {
+ return new TageableRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<RenamableRegistry>(RenamableRegistry.class) {
+ @Override
+ public RenamableRegistry create() {
+ return new RenamableRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<TranslatableRegistry>(TranslatableRegistry.class) {
+ @Override
+ public TranslatableRegistry create() {
+ return new TranslatableRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<VersionableRegistry>(VersionableRegistry.class) {
+ @Override
+ public VersionableRegistry create() {
+ return new VersionableRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<XmppComentableRegistry>(XmppComentableRegistry.class) {
+ @Override
+ public XmppComentableRegistry create() {
+ return new XmppComentableRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<XmppNotifyCapableRegistry>(XmppNotifyCapableRegistry.class) {
+ @Override
+ public XmppNotifyCapableRegistry create() {
+ return new XmppNotifyCapableRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<ContentIconsRegistry>(ContentIconsRegistry.class) {
+ @Override
+ public ContentIconsRegistry create() {
+ return new ContentIconsRegistry();
+ }
+ });
+
+ register(Singleton.class, new Factory<ContentCapabilitiesRegistry>(ContentCapabilitiesRegistry.class) {
+ @Override
+ public ContentCapabilitiesRegistry create() {
+ return new ContentCapabilitiesRegistry($(CanBeHomepageRegistry.class), $(ComentableRegistry.class),
+ $(DragableRegistry.class), $(DropableRegistry.class), $(EmailSubscribeAbleRegistry.class),
+ $(LicensableRegistry.class), $(PublishModerableRegistry.class), $(RateableRegistry.class),
+ $(TageableRegistry.class), $(RenamableRegistry.class), $(TranslatableRegistry.class),
+ $(VersionableRegistry.class), $(XmppComentableRegistry.class),
+ $(XmppNotifyCapableRegistry.class));
+ }
+ });
+
+ }
+
+}
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -21,9 +21,9 @@
import org.ourproject.kune.chat.client.ChatEngine;
import org.ourproject.kune.platf.client.actions.ActionManager;
import org.ourproject.kune.platf.client.actions.ContentIconsRegistry;
-import org.ourproject.kune.platf.client.actions.RenamableContentRegistry;
import org.ourproject.kune.platf.client.actions.UserActionRegistry;
import org.ourproject.kune.platf.client.app.ApplicationComponentGroup;
+import org.ourproject.kune.platf.client.registry.RenamableRegistry;
import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync;
@@ -271,7 +271,7 @@
final EntityTitlePresenter presenter = new EntityTitlePresenter($(I18nUITranslationService.class),
$(KuneErrorHandler.class), $(StateManager.class), $(Session.class),
$$(ContentServiceAsync.class), $$(ContextNavigator.class), $(ContentIconsRegistry.class),
- $(RenamableContentRegistry.class));
+ $(RenamableRegistry.class));
final EntityTitlePanel panel = new EntityTitlePanel($(WorkspaceSkeleton.class), presenter);
presenter.init(panel);
return presenter;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/tool/FoldableAbstractClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/tool/FoldableAbstractClientTool.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/tool/FoldableAbstractClientTool.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -1,23 +1,20 @@
package org.ourproject.kune.platf.client.tool;
import org.ourproject.kune.platf.client.actions.ContentIconsRegistry;
-import org.ourproject.kune.platf.client.actions.DragDropContentRegistry;
-import org.ourproject.kune.platf.client.actions.RenamableContentRegistry;
+import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
import org.ourproject.kune.workspace.client.themes.WsThemePresenter;
public abstract class FoldableAbstractClientTool extends AbstractClientTool {
- protected final DragDropContentRegistry dragDropContentRegistry;
protected final ContentIconsRegistry contentIconsRegistry;
- protected final RenamableContentRegistry renamableContentRegistry;
+ protected final ContentCapabilitiesRegistry contentCapabilitiesRegistry;
public FoldableAbstractClientTool(String shortName, String longName, ToolSelector toolSelector,
WsThemePresenter wsThemePresenter, WorkspaceSkeleton ws, final ContentIconsRegistry contentIconsRegistry,
- final DragDropContentRegistry dragDropContentRegistry, RenamableContentRegistry renamableContentRegistry) {
+ ContentCapabilitiesRegistry contentCapabilitiesRegistry) {
super(shortName, longName, toolSelector, wsThemePresenter, ws);
- this.dragDropContentRegistry = dragDropContentRegistry;
this.contentIconsRegistry = contentIconsRegistry;
- this.renamableContentRegistry = renamableContentRegistry;
+ this.contentCapabilitiesRegistry = contentCapabilitiesRegistry;
registerDragDropTypes();
registerIcons();
registerRenamableTypes();
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -39,6 +39,9 @@
/**
* GlobalizeLanguages generated by hbm2java from original rails globalize schema
+ *
+ * http://en.wikipedia.org/wiki/Calendar_date
+ * http://en.wikipedia.org/wiki/Date_and_time_notation_by_country
*/
@Entity
@Indexed
@@ -119,7 +122,7 @@
this.code = code;
}
- // code is iso6391 || iso6392 || rfc3306 (see DatabaInicializer)
+ // code is iso6391 || iso6392 || rfc3306 (see DatabaseInicializer)
public I18nLanguage(final Long id, final String code, final String direction, final String englishName,
final String englishNameLocale, final String englishNameModifier, final String iso6391,
final String iso6392, final String iso6393, final Boolean macroLanguage, final String nativeName,
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -26,7 +26,6 @@
import org.ourproject.kune.platf.client.actions.ActionItemCollection;
import org.ourproject.kune.platf.client.actions.ActionRegistry;
import org.ourproject.kune.platf.client.actions.ContentIconsRegistry;
-import org.ourproject.kune.platf.client.actions.DragDropContentRegistry;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO;
@@ -39,6 +38,7 @@
import org.ourproject.kune.platf.client.dto.StateContentDTO;
import org.ourproject.kune.platf.client.dto.StateToken;
import org.ourproject.kune.platf.client.dto.UserInfoDTO;
+import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
import org.ourproject.kune.platf.client.state.Session;
@@ -66,16 +66,16 @@
private final EntityTitle entityTitle;
private boolean editOnNextStateChange;
private final ContentIconsRegistry contentIconsRegistry;
- private final DragDropContentRegistry dragDropContentRegistry;
private final ActionRegistry<StateToken> actionRegistry;
private final ActionToolbar<StateToken> toolbar;
private final Provider<FileDownloadUtils> downloadUtilsProvider;
private final boolean useGenericImageIcon;
+ private final ContentCapabilitiesRegistry capabilitiesRegistry;
public ContextNavigatorPresenter(final StateManager stateManager, final Session session,
final Provider<ContentServiceAsync> contentServiceProvider, final I18nUITranslationService i18n,
final EntityTitle entityTitle, final ContentIconsRegistry contentIconsRegistry,
- final DragDropContentRegistry dragDropContentRegistry, final ActionToolbar<StateToken> toolbar,
+ ContentCapabilitiesRegistry capabilitiesRegistry, final ActionToolbar<StateToken> toolbar,
final ActionRegistry<StateToken> actionRegistry, Provider<FileDownloadUtils> downloadUtilsProvider,
boolean useGenericImageIcon) {
this.stateManager = stateManager;
@@ -84,7 +84,7 @@
this.i18n = i18n;
this.entityTitle = entityTitle;
this.contentIconsRegistry = contentIconsRegistry;
- this.dragDropContentRegistry = dragDropContentRegistry;
+ this.capabilitiesRegistry = capabilitiesRegistry;
this.actionRegistry = actionRegistry;
this.toolbar = toolbar;
this.downloadUtilsProvider = downloadUtilsProvider;
@@ -280,9 +280,9 @@
final String contentTypeIcon = getIcon(stateToken, contentTypeId, mimeType);
final String tooltip = getTooltip(stateToken, mimeType);
final ContextNavigatorItem item = new ContextNavigatorItem(genId(stateToken), genId(parentStateToken),
- contentTypeIcon, title, tooltip, status, stateToken, dragDropContentRegistry.isDraggable(contentTypeId,
- rights.isAdministrable()), dragDropContentRegistry.isDroppable(contentTypeId,
- rights.isAdministrable()), actionRegistry.getCurrentActions(stateToken, contentTypeId,
+ contentTypeIcon, title, tooltip, status, stateToken, capabilitiesRegistry.isDragable(contentTypeId)
+ && rights.isAdministrable(), capabilitiesRegistry.isDropable(contentTypeId)
+ && rights.isAdministrable(), actionRegistry.getCurrentActions(stateToken, contentTypeId,
session.isLogged(), rights, false));
view.addItem(item);
return toolbarActions;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteToastMessagePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteToastMessagePanel.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SiteToastMessagePanel.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -2,6 +2,7 @@
import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import com.google.gwt.user.client.ui.HTML;
import com.gwtextux.client.widgets.window.ToastWindow;
public class SiteToastMessagePanel implements SiteToastMessageView {
@@ -10,7 +11,9 @@
}
public void showMessage(String title, String message, SiteErrorType type) {
- ToastWindow toastWindow = new ToastWindow(title, message);
+ HTML html = new HTML(message);
+ html.addStyleName("kune-Margin-Medium-trbl");
+ ToastWindow toastWindow = new ToastWindow(title, html.toString());
String iconCls = "";
switch (type) {
case info:
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2008-11-12 04:32:06 UTC (rev 950)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2008-11-13 03:38:02 UTC (rev 951)
@@ -23,11 +23,11 @@
import org.ourproject.kune.platf.client.View;
import org.ourproject.kune.platf.client.actions.ContentIconsRegistry;
-import org.ourproject.kune.platf.client.actions.RenamableContentRegistry;
import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
import org.ourproject.kune.platf.client.dto.StateContainerDTO;
import org.ourproject.kune.platf.client.dto.StateContentDTO;
import org.ourproject.kune.platf.client.dto.StateToken;
+import org.ourproject.kune.platf.client.registry.RenamableRegistry;
import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
import org.ourproject.kune.platf.client.services.I18nTranslationService;
import org.ourproject.kune.platf.client.services.KuneErrorHandler;
@@ -50,13 +50,13 @@
private final Session session;
private final Provider<ContextNavigator> contextNavigatorProvider;
private final ContentIconsRegistry iconsRegistry;
- private final RenamableContentRegistry renamableContentRegistry;
+ private final RenamableRegistry renamableContentRegistry;
public EntityTitlePresenter(final I18nTranslationService i18n, final KuneErrorHandler errorHandler,
final StateManager stateManager, final Session session,
final Provider<ContentServiceAsync> contentServiceProvider,
final Provider<ContextNavigator> contextNavigatorProvider, final ContentIconsRegistry iconsRegistry,
- RenamableContentRegistry renamableContentRegistry) {
+ RenamableRegistry renamableContentRegistry) {
this.i18n = i18n;
this.errorHandler = errorHandler;
this.session = session;
More information about the kune-commits
mailing list