Mon Mar 2 20:32:12 CET 2009

Author: vjrj
Date: 2009-03-02 20:32:02 +0100 (Mon, 02 Mar 2009)
New Revision: 1054

Added:
   trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListener.java
   trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListenerCollection.java
   trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationService.java
   trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationServiceMocked.java
   trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/SimpleToolbar.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/ConfirmationAsk.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementGroup.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/skel/ActionCntCtxToolbarPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/upload/
   trunk/src/main/java/org/ourproject/kune/workspace/client/upload/AbstractUploader.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderView.java
Removed:
   trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionCntCtxToolbarPanel.java
   trunk/src/main/java/org/ourproject/kune/platf/client/app/TextEditorInsertElementGroup.java
   trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nChangeListener.java
   trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nChangeListenerCollection.java
   trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nUITranslationService.java
   trunk/src/main/java/org/ourproject/kune/platf/client/tool/
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/AbstractUploader.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderView.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/SiteErrorType.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/site/rpc/
   trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SimpleToolbar.java
Modified:
   trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java
   trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.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/BlogViewerPanel.java
   trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java
   trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java
   trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.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/chat/client/ChatEngineDefault.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/ctx/room/AddRoomPanel.java
   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/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/DocumentViewerPanel.java
   trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java
   trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java
   trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java
   trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.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/GalleryViewerPanel.java
   trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java
   trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java
   trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java
   trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionShortcut.java
   trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java
   trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationService.java
   trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationServiceMocked.java
   trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneCoreModule.java
   trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java
   trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/MessageToolbar.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/WizardDialog.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/NotifyUser.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RTEditorPanel.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RTEditorPresenter.java
   trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java
   trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java
   trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java
   trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java
   trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java
   trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java
   trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java
   trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java
   trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java
   trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java
   trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.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/WikiViewerPanel.java
   trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java
   trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/KuneWorkspaceModule.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AccessListsPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmailPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupView.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptions.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsView.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptions.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractView.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/site/WorkspaceNotifyUser.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/MessagePresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SimpleMessagePanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SiteBar.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java
   trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionShortcutTest.java
   trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java
   trunk/src/test/java/org/ourproject/kune/platf/integration/selenium/EntityLogoSeleniumTest.java
   trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java
   trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java
Log:
code reorganization

Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java
===================================================================

--- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -27,14 +27,13 @@
 import org.ourproject.kune.blogs.client.cnt.BlogViewer;
 import org.ourproject.kune.platf.client.actions.ContentActionRegistry;
 import org.ourproject.kune.platf.client.actions.ContextActionRegistry;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
 import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.services.KuneErrorHandler;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
-import org.ourproject.kune.platf.client.ui.upload.FileUploader;
 import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
 import org.ourproject.kune.workspace.client.AbstractFoldableContentActions;
 import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
@@ -42,6 +41,7 @@
 import org.ourproject.kune.workspace.client.editor.TextEditor;
 import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
 import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink;
+import org.ourproject.kune.workspace.client.upload.FileUploader;
 
 import com.calclab.suco.client.ioc.Provider;
 

Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -33,16 +33,15 @@
 import org.ourproject.kune.platf.client.actions.ContextActionRegistry;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
 import org.ourproject.kune.platf.client.app.ToolGroup;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 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;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.services.KuneErrorHandler;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
-import org.ourproject.kune.platf.client.ui.upload.FileUploader;
 import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
 import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
 import org.ourproject.kune.workspace.client.cxt.ContextPropEditor;
@@ -52,6 +51,7 @@
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.themes.WsThemePresenter;
 import org.ourproject.kune.workspace.client.tool.ToolSelector;
+import org.ourproject.kune.workspace.client.upload.FileUploader;
 
 import com.calclab.suco.client.ioc.decorator.Singleton;
 import com.calclab.suco.client.ioc.module.AbstractModule;

Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,8 +19,8 @@
  */
 package org.ourproject.kune.blogs.client;
 
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.themes.WsThemePresenter;
 import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool;

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.blogs.client.cnt;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -24,7 +24,7 @@
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
 import org.ourproject.kune.platf.client.dto.StateContainerDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.blogs.client.cnt;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -23,7 +23,7 @@
 import org.ourproject.kune.platf.client.actions.ContentActionRegistry;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
 import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;

Modified: trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -21,7 +21,7 @@
 
 import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException;
 import org.ourproject.kune.platf.client.errors.ContentNotPermittedException;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.server.content.ContainerManager;
 import org.ourproject.kune.platf.server.content.ContentManager;
 import org.ourproject.kune.platf.server.domain.Container;

Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -32,7 +32,7 @@
 import org.ourproject.kune.platf.client.dto.AccessRolDTO;
 import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.wiki.client.WikiClientTool;
 

Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -32,10 +32,10 @@
 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.i18n.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 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.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;

Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,8 +19,8 @@
  */
 package org.ourproject.kune.chat.client;
 
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.themes.WsThemePresenter;
 import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool;

Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -26,7 +26,7 @@
 import org.ourproject.kune.platf.client.dto.InitDataDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
 import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.ui.WindowUtils;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.chat.client.cnt;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -24,7 +24,7 @@
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
 import org.ourproject.kune.platf.client.dto.StateContainerDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.TextUtils;

Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.chat.client.ctx.room;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.TextUtils;
 
 import com.calclab.emiteuimodule.client.dialog.BasicDialogExtended;

Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -27,14 +27,13 @@
 import org.ourproject.kune.docs.client.cnt.DocumentViewer;
 import org.ourproject.kune.platf.client.actions.ContentActionRegistry;
 import org.ourproject.kune.platf.client.actions.ContextActionRegistry;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
 import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.services.KuneErrorHandler;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
-import org.ourproject.kune.platf.client.ui.upload.FileUploader;
 import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
 import org.ourproject.kune.workspace.client.AbstractFoldableContentActions;
 import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
@@ -42,6 +41,7 @@
 import org.ourproject.kune.workspace.client.editor.TextEditor;
 import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
 import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink;
+import org.ourproject.kune.workspace.client.upload.FileUploader;
 
 import com.calclab.suco.client.ioc.Provider;
 

Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -33,16 +33,15 @@
 import org.ourproject.kune.platf.client.actions.ContextActionRegistry;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
 import org.ourproject.kune.platf.client.app.ToolGroup;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 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;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.services.KuneErrorHandler;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
-import org.ourproject.kune.platf.client.ui.upload.FileUploader;
 import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
 import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
 import org.ourproject.kune.workspace.client.cxt.ContextPropEditor;
@@ -52,6 +51,7 @@
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.themes.WsThemePresenter;
 import org.ourproject.kune.workspace.client.tool.ToolSelector;
+import org.ourproject.kune.workspace.client.upload.FileUploader;
 
 import com.calclab.suco.client.ioc.decorator.Singleton;
 import com.calclab.suco.client.ioc.module.AbstractModule;

Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,8 +19,8 @@
  */
 package org.ourproject.kune.docs.client;
 
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.themes.WsThemePresenter;
 import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool;

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.docs.client.cnt;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -23,7 +23,7 @@
 import org.ourproject.kune.platf.client.actions.ActionRegistry;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.docs.client.cnt;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -23,7 +23,7 @@
 import org.ourproject.kune.platf.client.actions.ContentActionRegistry;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
 import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;

Modified: trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -23,7 +23,7 @@
 
 import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException;
 import org.ourproject.kune.platf.client.errors.ContentNotPermittedException;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.server.content.ContainerManager;
 import org.ourproject.kune.platf.server.content.ContentManager;
 import org.ourproject.kune.platf.server.domain.Container;

Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -26,14 +26,13 @@
 import org.ourproject.kune.gallery.client.cnt.GalleryViewer;
 import org.ourproject.kune.platf.client.actions.ContentActionRegistry;
 import org.ourproject.kune.platf.client.actions.ContextActionRegistry;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
 import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.services.KuneErrorHandler;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
-import org.ourproject.kune.platf.client.ui.upload.FileUploader;
 import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
 import org.ourproject.kune.workspace.client.AbstractFoldableContentActions;
 import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
@@ -41,6 +40,7 @@
 import org.ourproject.kune.workspace.client.editor.TextEditor;
 import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
 import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink;
+import org.ourproject.kune.workspace.client.upload.FileUploader;
 
 import com.calclab.suco.client.ioc.Provider;
 

Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -33,16 +33,15 @@
 import org.ourproject.kune.platf.client.actions.ContextActionRegistry;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
 import org.ourproject.kune.platf.client.app.ToolGroup;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 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;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.services.KuneErrorHandler;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
-import org.ourproject.kune.platf.client.ui.upload.FileUploader;
 import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
 import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
 import org.ourproject.kune.workspace.client.cxt.ContextPropEditor;
@@ -52,6 +51,7 @@
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.themes.WsThemePresenter;
 import org.ourproject.kune.workspace.client.tool.ToolSelector;
+import org.ourproject.kune.workspace.client.upload.FileUploader;
 
 import com.calclab.suco.client.ioc.decorator.Singleton;
 import com.calclab.suco.client.ioc.module.AbstractModule;

Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,8 +19,8 @@
  */
 package org.ourproject.kune.gallery.client;
 
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.themes.WsThemePresenter;
 import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool;

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.gallery.client.cnt;
 
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.BasicThumb;

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -26,7 +26,7 @@
 import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
 import org.ourproject.kune.platf.client.dto.StateContainerDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.gallery.client.cnt;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -23,7 +23,7 @@
 import org.ourproject.kune.platf.client.actions.ContentActionRegistry;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
 import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;

Modified: trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -21,7 +21,7 @@
 
 import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException;
 import org.ourproject.kune.platf.client.errors.ContentNotPermittedException;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.server.content.ContainerManager;
 import org.ourproject.kune.platf.server.domain.Container;
 import org.ourproject.kune.platf.server.domain.Content;

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,23 +19,20 @@
  \*/
 package org.ourproject.kune.platf.client.actions;
 
-import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
 
 import com.calclab.suco.client.events.Listener0;
 
 public class ActionManager {
 
-    private final WorkspaceSkeleton ws;
-
-    public ActionManager(final WorkspaceSkeleton ws) {
-        this.ws = ws;
+    public ActionManager() {
     }
 
     public void doAction(final ActionItem<?> actionItem) {
         final ActionDescriptor<?> action = actionItem.getAction();
         final Object item = actionItem.getItem();
         if (action.isMustBeConfirmed()) {
-            ws.askConfirmation(action.getConfirmationTitle(), action.getConfirmationText(), new Listener0() {
+            NotifyUser.askConfirmation(action.getConfirmationTitle(), action.getConfirmationText(), new Listener0() {
                 public void onEvent() {
                     fire(action, item);
                 }

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionShortcut.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionShortcut.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionShortcut.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,6 +1,6 @@
 package org.ourproject.kune.platf.client.actions;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 
 import com.google.gwt.user.client.ui.KeyboardListener;
 

Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionCntCtxToolbarPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionCntCtxToolbarPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionCntCtxToolbarPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,72 +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.platf.client.actions.toolbar;
-
-import org.ourproject.kune.platf.client.actions.ActionManager;
-import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
-
-import com.calclab.suco.client.ioc.Provider;
-
-public class ActionCntCtxToolbarPanel<T> extends ActionToolbarPanel<T> {
-
-    public enum Position {
-        content, context
-    }
-
-    private final Position position;
-
-    public ActionCntCtxToolbarPanel(final Position position, final Provider<ActionManager> actionManagerProvider,
-            final WorkspaceSkeleton ws) {
-        super(actionManagerProvider, ws);
-        this.position = position;
-    }
-
-    public void attach() {
-        if (!topbar.isAttached()) {
-            switch (position) {
-            case content:
-                ws.getEntityWorkspace().getContentTopBar().removeAll();
-                ws.getEntityWorkspace().getContentTopBar().add(topbar);
-                ws.getEntityWorkspace().getContentBottomBar().add(bottombar);
-                break;
-            case context:
-            default:
-                ws.getEntityWorkspace().getContextTopBar().removeAll();
-                ws.getEntityWorkspace().getContextTopBar().add(topbar);
-                ws.getEntityWorkspace().getContextBottomBar().add(bottombar);
-            }
-        }
-    }
-
-    public void detach() {
-        if (topbar.isAttached()) {
-            switch (position) {
-            case content:
-                ws.getEntityWorkspace().getContentTopBar().remove(topbar);
-                ws.getEntityWorkspace().getContentBottomBar().remove(bottombar);
-                break;
-            case context:
-            default:
-                ws.getEntityWorkspace().getContextTopBar().remove(topbar);
-                ws.getEntityWorkspace().getContextBottomBar().remove(bottombar);
-            }
-        }
-    }
-}

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -32,8 +32,7 @@
 import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor;
 import org.ourproject.kune.platf.client.actions.ActionToolbarPosition;
 import org.ourproject.kune.platf.client.actions.ActionToolbarPushButtonDescriptor;
-import org.ourproject.kune.workspace.client.skel.SimpleToolbar;
-import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.calclab.suco.client.ioc.Provider;
@@ -57,10 +56,8 @@
     private final Provider<ActionManager> actionManagerProvider;
     protected final SimpleToolbar topbar;
     protected final SimpleToolbar bottombar;
-    protected final WorkspaceSkeleton ws;
 
-    public ActionToolbarPanel(final Provider<ActionManager> actionManagerProvider, final WorkspaceSkeleton ws) {
-        this.ws = ws;
+    public ActionToolbarPanel(final Provider<ActionManager> actionManagerProvider) {
         topbar = new SimpleToolbar();
         bottombar = new SimpleToolbar();
         topbar.setWidth("100%");

Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/app/TextEditorInsertElementGroup.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/app/TextEditorInsertElementGroup.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/app/TextEditorInsertElementGroup.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,46 +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.platf.client.app;
-
-import org.ourproject.kune.workspace.client.editor.insert.abstractlink.TextEditorInsertAbstract;
-
-import com.calclab.suco.client.ioc.Container;
-import com.calclab.suco.client.ioc.Provider;
-import com.calclab.suco.client.ioc.decorator.ProviderCollection;
-import com.calclab.suco.client.ioc.decorator.Singleton;
-
-public class TextEditorInsertElementGroup extends ProviderCollection {
-
-    public TextEditorInsertElementGroup(final Container container) {
-        super(container, Singleton.instance);
-    }
-
-    public void createAll() {
-        for (final Provider<?> p : getProviders()) {
-            p.get();
-        }
-    }
-
-    public void resetAll() {
-        for (final Provider<?> p : getProviders()) {
-            ((TextEditorInsertAbstract) p.get()).reset();
-        }
-    }
-}

Copied: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListener.java (from rev 1052, trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nChangeListener.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nChangeListener.java	2009-02-26 01:46:09 UTC (rev 1052)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListener.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,27 @@
+/*
+ *
+ * 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.platf.client.i18n;
+
+import com.google.gwt.user.client.EventListener;
+
+public interface I18nChangeListener extends EventListener {
+
+    void onI18nLanguageChange();
+}

Copied: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListenerCollection.java (from rev 1052, trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nChangeListenerCollection.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nChangeListenerCollection.java	2009-02-26 01:46:09 UTC (rev 1052)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListenerCollection.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,44 @@
+/*
+ *
+ * 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.platf.client.i18n;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * A helper class for implementers of the SourcesI18nChangeEvents interface.
+ * This subclass of {@link ArrayList} assumes that all objects added to it will
+ * be of type {@link org.ourproject.kune.platf.client.i18n.I18nChangeListener}.
+ */
+public class I18nChangeListenerCollection extends ArrayList<I18nChangeListener> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Fires a locale change event to all listeners.
+     * 
+     */
+    public void fireI18nLanguageChange() {
+        for (Iterator<I18nChangeListener> it = iterator(); it.hasNext();) {
+            I18nChangeListener listener = it.next();
+            listener.onI18nLanguageChange();
+        }
+    }
+}

Copied: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationService.java (from rev 1052, trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationService.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationService.java	2009-02-26 01:46:09 UTC (rev 1052)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationService.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,162 @@
+/*
+ *
+ * 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.platf.client.i18n;
+
+import java.util.Date;
+
+public abstract class I18nTranslationService {
+    protected static final String TRANSLATION_NOTE_REGEXP = " (\\[)%NT (.*)(\\])$";
+    protected static final String NOTE_FOR_TRANSLATOR_TAG_BEGIN = " [%NT ";
+    protected static final String NOTE_FOR_TRANSLATOR_TAG_END = "]";
+    // Also in I18nTranslation
+    protected static final String UNTRANSLATED_VALUE = null;
+
+    public String decodeHtml(final String textToDecode) {
+        String text = textToDecode;
+        // text = text.replaceAll("&copy;", "©");
+        return text;
+    }
+
+    public String formatDate(final String format, final Date date) {
+        // TODO: 18n dates
+        return null;
+        // cc = c.sub(/^%[EO]?(.)$/o, '%\\1')
+        // case cc
+        // when '%A'; o << "#{::Date::DAYNAMES[wday]}
+        // [weekday]".t(::Date::DAYNAMES[wday])
+        // when '%a'; o << "#{::Date::ABBR_DAYNAMES[wday]} [abbreviated
+        // weekday]".t(::Date::ABBR_DAYNAMES[wday])
+        // when '%B'; o << "#{::Date::MONTHNAMES[mon]}
+        // [month]".t(::Date::MONTHNAMES[mon])
+        // when '%b'; o << "#{::Date::ABBR_MONTHNAMES[mon]} [abbreviated
+        // month]".t(::Date::ABBR_MONTHNAMES[mon])
+        // when '%c'; o << ((Locale.active? && !Locale.active.date_format.nil?)
+        // ?
+        // localize(Locale.active.date_format) : strftime('%Y-%m-%d'))
+        // when '%p'; o << if hour < 12 then 'AM [Ante Meridiem]'.t("am") else
+        // 'PM [Post
+        // Meridiem]'.t("am") end
+        // when '%P'; o << if hour < 12 then 'AM [Ante Meridiem]'.t("AM") else
+        // 'PM [Post
+        // Meridiem]'.t("PM") end
+        // else; o << c
+    }
+
+    public String removeNT(final String string) {
+        return string.replaceAll(TRANSLATION_NOTE_REGEXP, "");
+    }
+
+    /**
+     * In production, this method uses a hashmap. In development, if the text is
+     * not in the hashmap, it makes a server petition (that stores the text
+     * pending for translation in db).
+     * 
+     * Warning: text is escaped as html before insert in the db. Don't use html
+     * here (o user this method with params).
+     * 
+     * @param text
+     * @return text translated in the current language
+     */
+    public String t(final String text) {
+        return null;
+    }
+
+    /**
+     * Use [%d] to reference the Integer parameters
+     * 
+     */
+    public String t(final String text, final Integer... args) {
+        String translation = t(text);
+        for (Integer arg : args) {
+            translation = translation.replaceFirst("\\[%d\\]", arg.toString());
+        }
+        return decodeHtml(translation);
+    }
+
+    /**
+     * Use [%d] to reference the Long parameter
+     * 
+     */
+    public String t(final String text, final Long... args) {
+        String translation = t(text);
+        for (Long arg : args) {
+            translation = translation.replaceFirst("\\[%d\\]", arg.toString());
+        }
+        return decodeHtml(translation);
+    }
+
+    /**
+     * Use [%s] to reference the string parameter
+     * 
+     */
+    public String t(final String text, final String... args) {
+        String translation = t(text);
+        for (String arg : args) {
+            translation = translation.replaceFirst("\\[%s\\]", arg);
+        }
+        return decodeHtml(translation);
+    }
+
+    /**
+     * Adds [%NT noteForTranslators] at the end of text. This tag is later
+     * renderer in the translator panel to inform translator how to do this
+     * translation
+     * 
+     */
+    public String tWithNT(final String text, final String noteForTranslators) {
+        return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END);
+    }
+
+    /**
+     * Use [%d] to reference the Integer parameter.
+     * 
+     * Also adds [%NT noteForTranslators] at the end of text. This tag is later
+     * renderer in the translator panel to inform translator how to do this
+     * translation
+     * 
+     */
+    public String tWithNT(final String text, final String noteForTranslators, final Integer... args) {
+        return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END, args);
+    }
+
+    /**
+     * Use [%d] to reference the Long parameter.
+     * 
+     * Also adds [%NT noteForTranslators] at the end of text. This tag is later
+     * renderer in the translator panel to inform translator how to do this
+     * translation
+     * 
+     */
+    public String tWithNT(final String text, final String noteForTranslators, final Long... args) {
+        return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END, args);
+    }
+
+    /**
+     * Use [%s] to reference the String parameter.
+     * 
+     * Also adds [%NT noteForTranslators] at the end of text. This tag is later
+     * renderer in the translator panel to inform translator how to do this
+     * translation
+     * 
+     */
+    public String tWithNT(final String text, final String noteForTranslators, final String... args) {
+        return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END, args);
+    }
+}

Copied: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationServiceMocked.java (from rev 1052, trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationServiceMocked.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationServiceMocked.java	2009-02-26 01:46:09 UTC (rev 1052)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationServiceMocked.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,30 @@
+/*
+ *
+ * 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.platf.client.i18n;
+
+import org.ourproject.kune.platf.client.ui.TextUtils;
+
+public class I18nTranslationServiceMocked extends I18nTranslationService {
+    public String t(final String text) {
+        String encodeText = TextUtils.escapeHtmlLight(text);
+        String translation = removeNT(encodeText);
+        return decodeHtml(translation);
+    }
+}

Copied: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java (from rev 1052, trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nUITranslationService.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nUITranslationService.java	2009-02-26 01:46:09 UTC (rev 1052)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,226 @@
+/*
+ *
+ * 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.platf.client.i18n;
+
+import java.util.Date;
+import java.util.HashMap;
+
+import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
+import org.ourproject.kune.platf.client.rpc.I18nServiceAsync;
+import org.ourproject.kune.platf.client.state.Session;
+import org.ourproject.kune.platf.client.ui.Location;
+import org.ourproject.kune.platf.client.ui.TextUtils;
+import org.ourproject.kune.platf.client.ui.WindowUtils;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.calclab.suco.client.events.Listener0;
+import com.google.gwt.i18n.client.DateTimeFormat;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+public class I18nUITranslationService extends I18nTranslationService {
+    private HashMap<String, String> lexicon;
+    private String currentLanguageCode;
+    private I18nChangeListenerCollection i18nChangeListeners;
+    private I18nLanguageDTO currentLang;
+    private I18nServiceAsync i18nService;
+    private Session session;
+
+    /*
+     * If a UI element need to be fired when (for instance) the language changes
+     * use this. Useful if you widget have to take in account text language
+     * direction, for instance.
+     */
+    public void addI18nChangeListener(final I18nChangeListener listener) {
+        if (i18nChangeListeners == null) {
+            i18nChangeListeners = new I18nChangeListenerCollection();
+        }
+        i18nChangeListeners.add(listener);
+    }
+
+    public void changeCurrentLanguage(final String newLanguage) {
+        if (!newLanguage.equals(this.currentLanguageCode)) {
+            setCurrentLanguage(newLanguage);
+            changeLocale(newLanguage);
+        }
+    }
+
+    public String formatDateWithLocale(final Date date) {
+        String dateFormat = currentLang.getDateFormat();
+        final DateTimeFormat fmt;
+        if (dateFormat == null) {
+            fmt = DateTimeFormat.getFormat("M/d/yyyy h:mm a");
+        } else {
+            String abrevMonthInEnglish = DateTimeFormat.getFormat("MMM").format(date);
+            String monthToTranslate = abrevMonthInEnglish + " [%NT abbreviated month]";
+            dateFormat = dateFormat.replaceFirst("MMM", "'" + t(monthToTranslate) + "'");
+            fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a");
+        }
+        String dateFormated = fmt.format(date);
+        return dateFormated;
+    }
+
+    public String getCurrentLanguage() {
+        return currentLanguageCode;
+    }
+
+    public HashMap<String, String> getLexicon() {
+        return lexicon;
+    }
+
+    public void init(final I18nServiceAsync i18nService, final Session session, final Listener0 onReady) {
+        this.i18nService = i18nService;
+        this.session = session;
+        final Location loc = WindowUtils.getLocation();
+        final String locale = loc.getParameter("locale");
+        i18nService.getInitialLanguage(locale, new AsyncCallback<I18nLanguageDTO>() {
+            public void onFailure(final Throwable caught) {
+                Log.error("Workspace adaptation to your language failed");
+            }
+
+            public void onSuccess(final I18nLanguageDTO result) {
+                currentLang = result;
+                currentLanguageCode = currentLang.getCode();
+                session.setCurrentLanguage(currentLang);
+                i18nService.getLexicon(currentLang.getCode(), new AsyncCallback<HashMap<String, String>>() {
+                    public void onFailure(final Throwable caught) {
+                        Log.error("Workspace adaptation to your language failed");
+                    }
+
+                    public void onSuccess(final HashMap<String, String> result) {
+                        lexicon = result;
+                        onReady.onEvent();
+                    }
+                });
+            }
+        });
+    }
+
+    public void removeI18nChangeListener(final I18nChangeListener listener) {
+        if (i18nChangeListeners != null) {
+            i18nChangeListeners.remove(listener);
+        }
+    }
+
+    public void setCurrentLanguage(final String newLanguage) {
+        this.currentLanguageCode = newLanguage;
+    }
+
+    public void setLexicon(final HashMap<String, String> lexicon) {
+        this.lexicon = lexicon;
+        fireI18nLanguageChange();
+    }
+
+    public void setTranslationAfterSave(final String text, final String translation) {
+        lexicon.put(text, translation);
+        fireI18nLanguageChange();
+    }
+
+    /**
+     * In production, this method uses a hashmap. In development, if the text is
+     * not in the hashmap, it makes a server petition (that stores the text
+     * pending for translation in db).
+     * 
+     * Warning: text is escaped as html before insert in the db. Don't use html
+     * here (o user this method with params).
+     * 
+     * @param text
+     * @return text translated in the current language
+     */
+    @Override
+    public String t(final String text) {
+        final String encodeText = TextUtils.escapeHtmlLight(text);
+        String translation = lexicon.get(encodeText);
+        if (lexicon.containsKey(encodeText)) {
+            if (translation == UNTRANSLATED_VALUE) {
+                // Not translated but in db, return text
+                translation = removeNT(encodeText);
+            }
+        } else {
+            // Not translated and not in db, make a petition for translation
+            if (session.isLogged()) {
+                i18nService.getTranslation(session.getUserHash(), currentLanguageCode, text,
+                        new AsyncCallback<String>() {
+                            public void onFailure(final Throwable caught) {
+                            }
+
+                            public void onSuccess(final String result) {
+                            }
+                        });
+                Log.debug("Registering in db '" + text + "' as pending translation");
+                lexicon.put(encodeText, UNTRANSLATED_VALUE);
+            }
+            translation = removeNT(encodeText);
+        }
+        return decodeHtml(translation);
+    }
+
+    /**
+     * 
+     * See in:
+     * http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread
+     * /5e4e25050d3be984/7035ec39354d06aa?lnk=gst&q=get+locale&rnum=23
+     * 
+     * JSNI method to change the locale of the application - it effectively
+     * parses the existing URL and creates a new one for the chosen locale.
+     * 
+     * It additionally launches any JavaScript debugger that might be attached
+     * to the system (Windows only). To disable this functionality just remove
+     * the "debugger" line.
+     * 
+     * @param newLocale
+     *            String value of the new locale to go to.
+     */
+    private native void changeLocale(String newLocale)
+    /*-{
+       // Uncomment the "debugger;" line to see how to set debug statements in JSNI code
+       // When in web mode, if your browser has a JavaScript debugger attached, it will
+       // launch at this point in the code (when the user changes locale through the menu system).
+       // debugger;
+
+       // Get the current location
+       var currLocation = $wnd.location.toString();
+       // Get rid of any GWT History tokens that might be present
+       var noHistoryCurrLocArray = currLocation.split("#");
+       var noHistoryCurrLoc = noHistoryCurrLocArray[0];
+       var currHistory = noHistoryCurrLocArray[1];
+       // Get rid of any locale string
+       var locArray = noHistoryCurrLoc.split("?");
+       // Build the new href location and then send the browser there.
+       // $wnd.location.href = locArray[0]+"?locale="+newLocale+"#"+currHistory;
+       $wnd.location.href = locArray[0]+"?locale="+newLocale
+
+       // extjs part:
+       // commented because the error: "Ext is not defined"
+       // we have to try other way
+       // var head = document.getElementsByTagName("head")[0];
+       // var script = document.createElement('script');
+       // script.id = 'localScript';
+       // script.type = 'text/javascript';
+       // script.src = "js/ext/locale/ext-lang-"+newLocale+".js";
+       // head.appendChild(script);
+       }-*/;
+
+    private void fireI18nLanguageChange() {
+        if (i18nChangeListeners != null) {
+            i18nChangeListeners.fireI18nLanguageChange();
+        }
+    }
+
+}

Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nChangeListener.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nChangeListener.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nChangeListener.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,27 +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.platf.client.services;
-
-import com.google.gwt.user.client.EventListener;
-
-public interface I18nChangeListener extends EventListener {
-
-    void onI18nLanguageChange();
-}

Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nChangeListenerCollection.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nChangeListenerCollection.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nChangeListenerCollection.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,44 +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.platf.client.services;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- * A helper class for implementers of the SourcesI18nChangeEvents interface.
- * This subclass of {@link ArrayList} assumes that all objects added to it will
- * be of type {@link org.ourproject.kune.platf.client.services.I18nChangeListener}.
- */
-public class I18nChangeListenerCollection extends ArrayList<I18nChangeListener> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Fires a locale change event to all listeners.
-     * 
-     */
-    public void fireI18nLanguageChange() {
-        for (Iterator<I18nChangeListener> it = iterator(); it.hasNext();) {
-            I18nChangeListener listener = it.next();
-            listener.onI18nLanguageChange();
-        }
-    }
-}

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationService.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationService.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,162 +1,6 @@
-/*
- *
- * 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.platf.client.services;
 
-import java.util.Date;
+ at Deprecated
+public class I18nTranslationService extends org.ourproject.kune.platf.client.i18n.I18nTranslationService {
 
-public abstract class I18nTranslationService {
-    protected static final String TRANSLATION_NOTE_REGEXP = " (\\[)%NT (.*)(\\])$";
-    protected static final String NOTE_FOR_TRANSLATOR_TAG_BEGIN = " [%NT ";
-    protected static final String NOTE_FOR_TRANSLATOR_TAG_END = "]";
-    // Also in I18nTranslation
-    protected static final String UNTRANSLATED_VALUE = null;
-
-    public String decodeHtml(final String textToDecode) {
-        String text = textToDecode;
-        // text = text.replaceAll("&copy;", "©");
-        return text;
-    }
-
-    public String formatDate(final String format, final Date date) {
-        // TODO: 18n dates
-        return null;
-        // cc = c.sub(/^%[EO]?(.)$/o, '%\\1')
-        // case cc
-        // when '%A'; o << "#{::Date::DAYNAMES[wday]}
-        // [weekday]".t(::Date::DAYNAMES[wday])
-        // when '%a'; o << "#{::Date::ABBR_DAYNAMES[wday]} [abbreviated
-        // weekday]".t(::Date::ABBR_DAYNAMES[wday])
-        // when '%B'; o << "#{::Date::MONTHNAMES[mon]}
-        // [month]".t(::Date::MONTHNAMES[mon])
-        // when '%b'; o << "#{::Date::ABBR_MONTHNAMES[mon]} [abbreviated
-        // month]".t(::Date::ABBR_MONTHNAMES[mon])
-        // when '%c'; o << ((Locale.active? && !Locale.active.date_format.nil?)
-        // ?
-        // localize(Locale.active.date_format) : strftime('%Y-%m-%d'))
-        // when '%p'; o << if hour < 12 then 'AM [Ante Meridiem]'.t("am") else
-        // 'PM [Post
-        // Meridiem]'.t("am") end
-        // when '%P'; o << if hour < 12 then 'AM [Ante Meridiem]'.t("AM") else
-        // 'PM [Post
-        // Meridiem]'.t("PM") end
-        // else; o << c
-    }
-
-    public String removeNT(final String string) {
-        return string.replaceAll(TRANSLATION_NOTE_REGEXP, "");
-    }
-
-    /**
-     * In production, this method uses a hashmap. In development, if the text is
-     * not in the hashmap, it makes a server petition (that stores the text
-     * pending for translation in db).
-     * 
-     * Warning: text is escaped as html before insert in the db. Don't use html
-     * here (o user this method with params).
-     * 
-     * @param text
-     * @return text translated in the current language
-     */
-    public String t(final String text) {
-        return null;
-    }
-
-    /**
-     * Use [%d] to reference the Integer parameters
-     * 
-     */
-    public String t(final String text, final Integer... args) {
-        String translation = t(text);
-        for (Integer arg : args) {
-            translation = translation.replaceFirst("\\[%d\\]", arg.toString());
-        }
-        return decodeHtml(translation);
-    }
-
-    /**
-     * Use [%d] to reference the Long parameter
-     * 
-     */
-    public String t(final String text, final Long... args) {
-        String translation = t(text);
-        for (Long arg : args) {
-            translation = translation.replaceFirst("\\[%d\\]", arg.toString());
-        }
-        return decodeHtml(translation);
-    }
-
-    /**
-     * Use [%s] to reference the string parameter
-     * 
-     */
-    public String t(final String text, final String... args) {
-        String translation = t(text);
-        for (String arg : args) {
-            translation = translation.replaceFirst("\\[%s\\]", arg);
-        }
-        return decodeHtml(translation);
-    }
-
-    /**
-     * Adds [%NT noteForTranslators] at the end of text. This tag is later
-     * renderer in the translator panel to inform translator how to do this
-     * translation
-     * 
-     */
-    public String tWithNT(final String text, final String noteForTranslators) {
-        return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END);
-    }
-
-    /**
-     * Use [%d] to reference the Integer parameter.
-     * 
-     * Also adds [%NT noteForTranslators] at the end of text. This tag is later
-     * renderer in the translator panel to inform translator how to do this
-     * translation
-     * 
-     */
-    public String tWithNT(final String text, final String noteForTranslators, final Integer... args) {
-        return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END, args);
-    }
-
-    /**
-     * Use [%d] to reference the Long parameter.
-     * 
-     * Also adds [%NT noteForTranslators] at the end of text. This tag is later
-     * renderer in the translator panel to inform translator how to do this
-     * translation
-     * 
-     */
-    public String tWithNT(final String text, final String noteForTranslators, final Long... args) {
-        return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END, args);
-    }
-
-    /**
-     * Use [%s] to reference the String parameter.
-     * 
-     * Also adds [%NT noteForTranslators] at the end of text. This tag is later
-     * renderer in the translator panel to inform translator how to do this
-     * translation
-     * 
-     */
-    public String tWithNT(final String text, final String noteForTranslators, final String... args) {
-        return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END, args);
-    }
 }

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationServiceMocked.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationServiceMocked.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nTranslationServiceMocked.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,26 +1,8 @@
-/*
- *
- * 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.platf.client.services;
 
 import org.ourproject.kune.platf.client.ui.TextUtils;
 
+ at Deprecated
 public class I18nTranslationServiceMocked extends I18nTranslationService {
     public String t(final String text) {
         String encodeText = TextUtils.escapeHtmlLight(text);

Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nUITranslationService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nUITranslationService.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/I18nUITranslationService.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,226 +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.platf.client.services;
-
-import java.util.Date;
-import java.util.HashMap;
-
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.rpc.I18nServiceAsync;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.ui.Location;
-import org.ourproject.kune.platf.client.ui.TextUtils;
-import org.ourproject.kune.platf.client.ui.WindowUtils;
-
-import com.allen_sauer.gwt.log.client.Log;
-import com.calclab.suco.client.events.Listener0;
-import com.google.gwt.i18n.client.DateTimeFormat;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-public class I18nUITranslationService extends I18nTranslationService {
-    private HashMap<String, String> lexicon;
-    private String currentLanguageCode;
-    private I18nChangeListenerCollection i18nChangeListeners;
-    private I18nLanguageDTO currentLang;
-    private I18nServiceAsync i18nService;
-    private Session session;
-
-    /*
-     * If a UI element need to be fired when (for instance) the language changes
-     * use this. Useful if you widget have to take in account text language
-     * direction, for instance.
-     */
-    public void addI18nChangeListener(final I18nChangeListener listener) {
-        if (i18nChangeListeners == null) {
-            i18nChangeListeners = new I18nChangeListenerCollection();
-        }
-        i18nChangeListeners.add(listener);
-    }
-
-    public void changeCurrentLanguage(final String newLanguage) {
-        if (!newLanguage.equals(this.currentLanguageCode)) {
-            setCurrentLanguage(newLanguage);
-            changeLocale(newLanguage);
-        }
-    }
-
-    public String formatDateWithLocale(final Date date) {
-        String dateFormat = currentLang.getDateFormat();
-        final DateTimeFormat fmt;
-        if (dateFormat == null) {
-            fmt = DateTimeFormat.getFormat("M/d/yyyy h:mm a");
-        } else {
-            String abrevMonthInEnglish = DateTimeFormat.getFormat("MMM").format(date);
-            String monthToTranslate = abrevMonthInEnglish + " [%NT abbreviated month]";
-            dateFormat = dateFormat.replaceFirst("MMM", "'" + t(monthToTranslate) + "'");
-            fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a");
-        }
-        String dateFormated = fmt.format(date);
-        return dateFormated;
-    }
-
-    public String getCurrentLanguage() {
-        return currentLanguageCode;
-    }
-
-    public HashMap<String, String> getLexicon() {
-        return lexicon;
-    }
-
-    public void init(final I18nServiceAsync i18nService, final Session session, final Listener0 onReady) {
-        this.i18nService = i18nService;
-        this.session = session;
-        final Location loc = WindowUtils.getLocation();
-        final String locale = loc.getParameter("locale");
-        i18nService.getInitialLanguage(locale, new AsyncCallback<I18nLanguageDTO>() {
-            public void onFailure(final Throwable caught) {
-                Log.error("Workspace adaptation to your language failed");
-            }
-
-            public void onSuccess(final I18nLanguageDTO result) {
-                currentLang = result;
-                currentLanguageCode = currentLang.getCode();
-                session.setCurrentLanguage(currentLang);
-                i18nService.getLexicon(currentLang.getCode(), new AsyncCallback<HashMap<String, String>>() {
-                    public void onFailure(final Throwable caught) {
-                        Log.error("Workspace adaptation to your language failed");
-                    }
-
-                    public void onSuccess(final HashMap<String, String> result) {
-                        lexicon = result;
-                        onReady.onEvent();
-                    }
-                });
-            }
-        });
-    }
-
-    public void removeI18nChangeListener(final I18nChangeListener listener) {
-        if (i18nChangeListeners != null) {
-            i18nChangeListeners.remove(listener);
-        }
-    }
-
-    public void setCurrentLanguage(final String newLanguage) {
-        this.currentLanguageCode = newLanguage;
-    }
-
-    public void setLexicon(final HashMap<String, String> lexicon) {
-        this.lexicon = lexicon;
-        fireI18nLanguageChange();
-    }
-
-    public void setTranslationAfterSave(final String text, final String translation) {
-        lexicon.put(text, translation);
-        fireI18nLanguageChange();
-    }
-
-    /**
-     * In production, this method uses a hashmap. In development, if the text is
-     * not in the hashmap, it makes a server petition (that stores the text
-     * pending for translation in db).
-     * 
-     * Warning: text is escaped as html before insert in the db. Don't use html
-     * here (o user this method with params).
-     * 
-     * @param text
-     * @return text translated in the current language
-     */
-    @Override
-    public String t(final String text) {
-        final String encodeText = TextUtils.escapeHtmlLight(text);
-        String translation = lexicon.get(encodeText);
-        if (lexicon.containsKey(encodeText)) {
-            if (translation == UNTRANSLATED_VALUE) {
-                // Not translated but in db, return text
-                translation = removeNT(encodeText);
-            }
-        } else {
-            // Not translated and not in db, make a petition for translation
-            if (session.isLogged()) {
-                i18nService.getTranslation(session.getUserHash(), currentLanguageCode, text,
-                        new AsyncCallback<String>() {
-                            public void onFailure(final Throwable caught) {
-                            }
-
-                            public void onSuccess(final String result) {
-                            }
-                        });
-                Log.debug("Registering in db '" + text + "' as pending translation");
-                lexicon.put(encodeText, UNTRANSLATED_VALUE);
-            }
-            translation = removeNT(encodeText);
-        }
-        return decodeHtml(translation);
-    }
-
-    /**
-     * 
-     * See in:
-     * http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread
-     * /5e4e25050d3be984/7035ec39354d06aa?lnk=gst&q=get+locale&rnum=23
-     * 
-     * JSNI method to change the locale of the application - it effectively
-     * parses the existing URL and creates a new one for the chosen locale.
-     * 
-     * It additionally launches any JavaScript debugger that might be attached
-     * to the system (Windows only). To disable this functionality just remove
-     * the "debugger" line.
-     * 
-     * @param newLocale
-     *            String value of the new locale to go to.
-     */
-    private native void changeLocale(String newLocale)
-    /*-{
-       // Uncomment the "debugger;" line to see how to set debug statements in JSNI code
-       // When in web mode, if your browser has a JavaScript debugger attached, it will
-       // launch at this point in the code (when the user changes locale through the menu system).
-       // debugger;
-
-       // Get the current location
-       var currLocation = $wnd.location.toString();
-       // Get rid of any GWT History tokens that might be present
-       var noHistoryCurrLocArray = currLocation.split("#");
-       var noHistoryCurrLoc = noHistoryCurrLocArray[0];
-       var currHistory = noHistoryCurrLocArray[1];
-       // Get rid of any locale string
-       var locArray = noHistoryCurrLoc.split("?");
-       // Build the new href location and then send the browser there.
-       // $wnd.location.href = locArray[0]+"?locale="+newLocale+"#"+currHistory;
-       $wnd.location.href = locArray[0]+"?locale="+newLocale
-
-       // extjs part:
-       // commented because the error: "Ext is not defined"
-       // we have to try other way
-       // var head = document.getElementsByTagName("head")[0];
-       // var script = document.createElement('script');
-       // script.id = 'localScript';
-       // script.type = 'text/javascript';
-       // script.src = "js/ext/locale/ext-lang-"+newLocale+".js";
-       // head.appendChild(script);
-       }-*/;
-
-    private void fireI18nLanguageChange() {
-        if (i18nChangeListeners != null) {
-            i18nChangeListeners.fireI18nLanguageChange();
-        }
-    }
-
-}

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneCoreModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneCoreModule.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneCoreModule.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -21,7 +21,6 @@
 
 import org.ourproject.kune.platf.client.app.ApplicationComponentGroup;
 import org.ourproject.kune.platf.client.app.EntityOptionsGroup;
-import org.ourproject.kune.platf.client.app.TextEditorInsertElementGroup;
 import org.ourproject.kune.platf.client.app.ToolGroup;
 
 import com.calclab.suco.client.ioc.module.AbstractModule;
@@ -33,6 +32,5 @@
         registerDecorator(ApplicationComponentGroup.class, new ApplicationComponentGroup(container));
         registerDecorator(ToolGroup.class, new ToolGroup(container));
         registerDecorator(EntityOptionsGroup.class, new EntityOptionsGroup(container));
-        registerDecorator(TextEditorInsertElementGroup.class, new TextEditorInsertElementGroup(container));
     }
 }

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -29,6 +29,7 @@
 import org.ourproject.kune.platf.client.errors.LastAdminInGroupException;
 import org.ourproject.kune.platf.client.errors.SessionExpiredException;
 import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KunePlatformModule.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -26,6 +26,8 @@
 import org.ourproject.kune.platf.client.app.HistoryWrapper;
 import org.ourproject.kune.platf.client.app.HistoryWrapperDefault;
 import org.ourproject.kune.platf.client.app.ToolGroup;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
 import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
 import org.ourproject.kune.platf.client.rpc.I18nService;

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.platf.client.ui;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 
 import com.gwtext.client.core.Connection;
 import com.gwtext.client.core.UrlParam;

Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/SimpleToolbar.java (from rev 1052, trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SimpleToolbar.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SimpleToolbar.java	2009-02-26 01:46:09 UTC (rev 1052)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/SimpleToolbar.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,97 @@
+/*
+ *
+ * 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.platf.client.ui;
+
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.HasVerticalAlignment.VerticalAlignmentConstant;
+
+public class SimpleToolbar extends Composite {
+
+    private final HorizontalPanel childPanel;
+    private final HorizontalPanel mainPanel;
+
+    public SimpleToolbar() {
+        mainPanel = new HorizontalPanel();
+        childPanel = new HorizontalPanel();
+        mainPanel.add(childPanel);
+        initWidget(mainPanel);
+        mainPanel.setWidth("100%");
+    }
+
+    public void add(final Widget widget) {
+        childPanel.add(widget);
+        childPanel.setCellVerticalAlignment(widget, VerticalPanel.ALIGN_MIDDLE);
+    }
+
+    public void add(final Widget widget, VerticalAlignmentConstant valign) {
+        childPanel.add(widget);
+        childPanel.setCellVerticalAlignment(widget, valign);
+    }
+
+    public Widget addFill() {
+        final Label emptyLabel = new Label("");
+        this.add(emptyLabel);
+        childPanel.setCellWidth(emptyLabel, "100%");
+        return emptyLabel;
+    }
+
+    public Widget addSeparator() {
+        final Label emptyLabel = new Label("");
+        emptyLabel.setStyleName("ytb-sep");
+        emptyLabel.addStyleName("k-toolbar-sep");
+        this.add(emptyLabel);
+        return emptyLabel;
+    }
+
+    public Widget addSpacer() {
+        final Label emptyLabel = new Label("");
+        emptyLabel.setStyleName("ytb-spacer");
+        this.add(emptyLabel);
+        return emptyLabel;
+    }
+
+    public void remove(final Widget widget) {
+        childPanel.remove(widget);
+    }
+
+    public void removeAll() {
+        childPanel.clear();
+    }
+
+    public void setCellWidth(Widget widget, String width) {
+        childPanel.setCellWidth(widget, width);
+    }
+
+    public void setCleanStyle() {
+        setStyleName("x-toolbar");
+        addStyleName("x-panel");
+        addStyleName("k-blank-toolbar");
+    }
+
+    @Override
+    public void setHeight(String height) {
+        mainPanel.setHeight(height);
+        mainPanel.setCellHeight(childPanel, height);
+    }
+}
\ No newline at end of file

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/MessageToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/MessageToolbar.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/MessageToolbar.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.platf.client.ui.dialogs;
 
 import org.ourproject.kune.platf.client.services.Images;
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.Label;
@@ -57,7 +57,7 @@
         toolbar.setVisible(false);
     }
 
-    public void setErrorMessage(final String message, final SiteErrorType type) {
+    public void setErrorMessage(final String message, final Level type) {
         errorLabel.setText(message);
         errorIcon.setVisible(true);
         toolbar.setVisible(true);

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/WizardDialog.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/WizardDialog.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/WizardDialog.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.platf.client.ui.dialogs;
 
 import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
 
 import com.google.gwt.user.client.ui.DeckPanel;

Copied: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java (from rev 1052, trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java	2009-02-26 01:46:09 UTC (rev 1052)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileConstants.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,34 @@
+/*
+ *
+ * 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.platf.client.ui.download;
+
+public interface FileConstants {
+    String HASH = "hash";
+    String TOKEN = "token";
+    String DOWNLOAD = "download";
+    String IMGSIZE = "imgsize";
+    String FILENAME = "filename";
+    String TYPE_ID = "typeid";
+    String LOGO_FORM_FIELD = "k-elogov-ff";
+    int LOGO_ICON_DEFAULT_HEIGHT = 60;
+    int LOGO_ICON_DEFAULT_WIDTH = 468;
+    int LOGO_ICON_MIN_HEIGHT = 28;
+    int LOGO_ICON_MIN_WIDTH = 468;
+}

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -48,7 +48,7 @@
     }
 
     public String getImageResizedUrl(final StateToken token, ImageSize imageSize) {
-        return calculateUrl(token, false) + "&" + new UrlParam(FileParams.IMGSIZE, imageSize.toString());
+        return calculateUrl(token, false) + "&" + new UrlParam(FileConstants.IMGSIZE, imageSize.toString());
     }
 
     public String getImageUrl(final StateToken token) {
@@ -67,12 +67,12 @@
     }
 
     public String getLogoImageUrl(StateToken token) {
-        return new Url(LOGODOWNLOADSERVLET, new UrlParam(FileParams.TOKEN, token.toString())).toString();
+        return new Url(LOGODOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, token.toString())).toString();
     }
 
     private String calculateUrl(final StateToken token, final boolean download) {
-        return new Url(DOWNLOADSERVLET, new UrlParam(FileParams.TOKEN, token.toString()), new UrlParam(FileParams.HASH,
-                session.getUserHash()), new UrlParam(FileParams.DOWNLOAD, download)).toString();
+        return new Url(DOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, token.toString()), new UrlParam(FileConstants.HASH,
+                session.getUserHash()), new UrlParam(FileConstants.DOWNLOAD, download)).toString();
     }
 
 }

Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileParams.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,29 +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.platf.client.ui.download;
-
-public interface FileParams {
-    String HASH = "hash";
-    String TOKEN = "token";
-    String DOWNLOAD = "download";
-    String IMGSIZE = "imgsize";
-    String FILENAME = "filename";
-    String TYPE_ID = "typeid";
-}

Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/ConfirmationAsk.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/ConfirmationAsk.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/ConfirmationAsk.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,35 @@
+package org.ourproject.kune.platf.client.ui.noti;
+
+import com.calclab.suco.client.events.Listener0;
+
+public class ConfirmationAsk {
+
+    private final String title;
+    private final String message;
+    private final Listener0 onConfirmed;
+    private final Listener0 onCancel;
+
+    public ConfirmationAsk(final String title, final String message, final Listener0 onConfirmed,
+            final Listener0 onCancel) {
+        this.title = title;
+        this.message = message;
+        this.onConfirmed = onConfirmed;
+        this.onCancel = onCancel;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public Listener0 getOnCancel() {
+        return onCancel;
+    }
+
+    public Listener0 getOnConfirmed() {
+        return onConfirmed;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+}

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/NotifyUser.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/NotifyUser.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/NotifyUser.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.platf.client.ui.noti;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 
 import com.calclab.suco.client.events.Event;
 import com.calclab.suco.client.events.Event0;
@@ -38,12 +38,19 @@
 
     private static Event2<String, String> onAlert;
 
+    private static Event<ConfirmationAsk> onConfirmationAsk;
+
     private static Event<String> onProgress;
 
     private static Event0 onHideProgress;
 
     private static I18nTranslationService i18n;
 
+    public static void askConfirmation(String confirmationTitle, String confirmationText, Listener0 onConfirm,
+            Listener0 onCancel) {
+        onConfirmationAsk.fire(new ConfirmationAsk(confirmationTitle, confirmationText, onConfirm, onCancel));
+    }
+
     public static void error(final String message) {
         onNotify.fire(Level.error, message);
     }
@@ -91,15 +98,20 @@
     public NotifyUser(I18nTranslationService i18n) {
         NotifyUser.i18n = i18n;
         onNotify = new Event2<Level, String>("onNotify");
-        onAlert = new Event2<String, String>("onNotify");
+        onAlert = new Event2<String, String>("onAlert");
         onProgress = new Event<String>("onProgress");
         onHideProgress = new Event0("onHideProgress");
+        onConfirmationAsk = new Event<ConfirmationAsk>("onConfirmationAsk");
     }
 
     public void addAlerter(final Listener2<String, String> listener) {
         onAlert.add(listener);
     }
 
+    public void addConfirmationAsker(final Listener<ConfirmationAsk> listener) {
+        onConfirmationAsk.add(listener);
+    }
+
     public void addHideProgressNotifier(final Listener0 listener) {
         onHideProgress.add(listener);
     }
@@ -111,4 +123,5 @@
     public void addProgressNotifier(final Listener<String> listener) {
         onProgress.add(listener);
     }
+
 }

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RTEditorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RTEditorPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RTEditorPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -3,7 +3,7 @@
 import java.util.Date;
 
 import org.ourproject.kune.platf.client.actions.ActionCollection;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.ui.rte.RichTextArea.BasicFormatter;
 import org.ourproject.kune.platf.client.ui.rte.RichTextArea.ExtendedFormatter;
 import org.ourproject.kune.platf.client.ui.rte.RichTextArea.FontSize;

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RTEditorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RTEditorPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RTEditorPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -11,7 +11,7 @@
 import org.ourproject.kune.platf.client.actions.ActionToolbarPushButtonDescriptor;
 import org.ourproject.kune.platf.client.actions.ContentEditorActionRegistry;
 import org.ourproject.kune.platf.client.dto.AccessRolDTO;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
 import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources;

Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/AbstractUploader.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/AbstractUploader.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/AbstractUploader.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,36 +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.platf.client.ui.upload;
-
-import org.ourproject.kune.platf.client.ui.download.FileParams;
-
-import com.gwtext.client.core.UrlParam;
-
-public class AbstractUploader {
-
-    public UrlParam[] genUploadParams(final String userhash, final String currentStateToken, final String typeId) {
-        // Warning take into account param[size]
-        final UrlParam param[] = new UrlParam[3];
-        param[0] = new UrlParam(FileParams.HASH, userhash);
-        param[1] = new UrlParam(FileParams.TOKEN, currentStateToken);
-        param[2] = new UrlParam(FileParams.TYPE_ID, typeId);
-        return param;
-    }
-}

Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,40 +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.platf.client.ui.upload;
-
-import org.ourproject.kune.platf.client.dto.StateToken;
-
-import com.calclab.suco.client.events.Listener;
-
-public interface FileUploader {
-
-    void addOnUploadCompleteListener(Listener<StateToken> listener);
-
-    boolean hasUploadingFiles();
-
-    void hide();
-
-    void resetPermittedExtensions();
-
-    void setPermittedExtensions(String extensions);
-
-    void show();
-
-}

Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,195 +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.platf.client.ui.upload;
-
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
-import org.ourproject.kune.platf.client.ui.TextUtils;
-import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
-import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
-
-import com.allen_sauer.gwt.log.client.Log;
-import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.DeferredCommand;
-import com.gwtext.client.core.EventObject;
-import com.gwtext.client.widgets.Button;
-import com.gwtext.client.widgets.ToolbarButton;
-import com.gwtext.client.widgets.Window;
-import com.gwtext.client.widgets.event.ButtonListenerAdapter;
-import com.gwtextux.client.widgets.upload.UploadDialog;
-import com.gwtextux.client.widgets.upload.UploadDialogListenerAdapter;
-
-public class FileUploaderDialog extends AbstractUploader implements FileUploaderView {
-
-    protected static final String SITE_FILE_UPLOADER = "k-site-file-uploader";
-
-    private static final String URL = "/kune/servlets/FileUploadManager";
-
-    private UploadDialog dialog;
-    private ToolbarButton traybarButton;
-    private final I18nUITranslationService i18n;
-    private final WorkspaceSkeleton ws;
-    private final FileUploaderPresenter presenter;
-
-    public FileUploaderDialog(final FileUploaderPresenter presenter, final I18nUITranslationService i18n,
-            final WorkspaceSkeleton ws) {
-        this.presenter = presenter;
-        this.i18n = i18n;
-        this.ws = ws;
-        createDialog(false);
-    }
-
-    public void destroy() {
-        if (hasUploadingFiles()) {
-            dialog.stopUpload();
-            NotifyUser.important(i18n.t("Upload cancelled after signing out"));
-        }
-        if (dialog != null) {
-            dialog.destroy();
-            dialog = null;
-        }
-        if (traybarButton != null) {
-            traybarButton.destroy();
-            traybarButton = null;
-        }
-    }
-
-    public boolean hasUploadingFiles() {
-        return dialog.hasUnuploadedFiles();
-    }
-
-    public void hide() {
-        dialog.hide();
-    }
-
-    public void resetPermittedExtensions() {
-        final String[] extensions = {};
-        setPermittedExtensions(extensions);
-    }
-
-    public void setPermittedExtensions(final String extensions) {
-        final Object[] objs = TextUtils.splitTags(extensions).toArray();
-        final String[] exts = new String[objs.length];
-        for (int i = 0; i < objs.length; i++) {
-            exts[i] = (String) objs[i];
-        }
-        setPermittedExtensions(exts);
-    }
-
-    public void setUploadParams(final String userhash, final String currentStateToken, final String typeId) {
-        dialog.setBaseParams(genUploadParams(userhash, currentStateToken, typeId));
-    }
-
-    public void show() {
-        if (traybarButton == null) {
-            traybarButton = new ToolbarButton();
-            traybarButton.setTooltip(i18n.t("Show/hide uploader window"));
-            traybarButton.setIcon("images/nav/upload.png");
-            traybarButton.addListener(new ButtonListenerAdapter() {
-                @Override
-                public void onClick(final Button button, final EventObject e) {
-                    if (dialog.isVisible()) {
-                        dialog.hide();
-                    } else {
-                        dialog.show();
-                    }
-                }
-            });
-            ws.getSiteTraybar().addButton(traybarButton);
-        }
-        if (dialog == null) {
-            createDialog(true);
-        } else {
-            dialog.show();
-        }
-    }
-
-    private void createDialog(final boolean show) {
-        dialog = new UploadDialog(i18n.t("File uploader"), false, true) {
-            {
-                setAllowCloseOnUpload(true);
-                setResetOnHide(false);
-                setClosable(true);
-                setCloseAction(Window.HIDE);
-                setMinimizable(true);
-                setUploadAutostart(false);
-            }
-        };
-        // dialog.setId(SITE_FILE_UPLOADER);
-        dialog.addListener(new UploadDialogListenerAdapter() {
-            @Override
-            public boolean onBeforeAdd(final UploadDialog source, final String filename) {
-                boolean mustAdd = presenter.checkFolderChange();
-                if (!mustAdd) {
-                    NotifyUser.important(i18n.t("Please, wait until current uploads are finished to upload new files into another location"));
-                }
-                return mustAdd;
-            }
-
-            @Override
-            public void onMinimize(final Window source) {
-                dialog.hide();
-            }
-
-            @Override
-            public void onUploadComplete(final UploadDialog source) {
-                if (!dialog.isVisible()) {
-                    NotifyUser.info(i18n.t("Upload completed"));
-                    traybarButton.destroy();
-                    traybarButton = null;
-                }
-                presenter.onUploadComplete();
-            }
-
-            @Override
-            public void onUploadError(final UploadDialog source, final String filename, final JavaScriptObject data) {
-                showError();
-            }
-
-            @Override
-            public void onUploadFailed(final UploadDialog source, final String filename) {
-                showError();
-            }
-
-            private void showError() {
-                if (!dialog.isVisible()) {
-                    NotifyUser.veryImportant(i18n.t("Error uploading"));
-                }
-            }
-
-        });
-        dialog.setUrl(URL);
-        if (show) {
-            dialog.show();
-        }
-    }
-
-    private void setPermittedExtensions(final String[] extensions) {
-        DeferredCommand.addCommand(new Command() {
-            public void execute() {
-                if (dialog == null) {
-                    createDialog(false);
-                }
-                Log.info("PermittedExtensions: " + extensions.toString() + " length: " + extensions.length);
-                dialog.setPermittedExtensions(extensions);
-            }
-        });
-    }
-}

Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,101 +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.platf.client.ui.upload;
-
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool;
-
-import com.calclab.suco.client.events.Event;
-import com.calclab.suco.client.events.Listener;
-import com.calclab.suco.client.events.Listener0;
-
-public class FileUploaderPresenter implements FileUploader {
-
-    private FileUploaderView view;
-    private final Session session;
-    private StateToken currentUploadStateToken;
-    private final Event<StateToken> onUploadComplete;
-
-    public FileUploaderPresenter(final Session session) {
-        this.session = session;
-        this.onUploadComplete = new Event<StateToken>("onUploadComplete");
-    }
-
-    public void addOnUploadCompleteListener(final Listener<StateToken> slot) {
-        onUploadComplete.add(slot);
-    }
-
-    public boolean checkFolderChange() {
-        final StateToken currentFolderStateToken = session.getCurrentStateToken().copy().clearDocument();
-        if (sameContainer()) {
-            view.setUploadParams(session.getUserHash(), currentFolderStateToken.toString(),
-                    currentFolderStateToken.getTool() + "." + FoldableAbstractClientTool.UPLOADEDFILE_SUFFIX);
-            return true;
-        }
-        if (view.hasUploadingFiles()) {
-            return false;
-        } else {
-            currentUploadStateToken = currentFolderStateToken;
-            view.setUploadParams(session.getUserHash(), currentFolderStateToken.toString(),
-                    currentFolderStateToken.getTool() + "." + FoldableAbstractClientTool.UPLOADEDFILE_SUFFIX);
-            return true;
-        }
-    }
-
-    public boolean hasUploadingFiles() {
-        return view.hasUploadingFiles();
-    }
-
-    public void hide() {
-        view.hide();
-    }
-
-    public void init(final FileUploaderView view) {
-        this.view = view;
-        session.onUserSignOut(new Listener0() {
-            public void onEvent() {
-                view.destroy();
-            }
-        });
-    }
-
-    public void onUploadComplete() {
-        onUploadComplete.fire(currentUploadStateToken);
-    }
-
-    public void resetPermittedExtensions() {
-        view.resetPermittedExtensions();
-    }
-
-    public void setPermittedExtensions(final String extensions) {
-        view.setPermittedExtensions(extensions);
-    }
-
-    public void show() {
-        view.show();
-    }
-
-    private boolean sameContainer() {
-        final StateToken currentStateToken = session.getCurrentStateToken();
-        currentUploadStateToken = currentUploadStateToken == null ? currentStateToken : currentUploadStateToken;
-        return currentUploadStateToken.equals(currentStateToken);
-    }
-}

Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderView.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderView.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,38 +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.platf.client.ui.upload;
-
-public interface FileUploaderView {
-
-    void destroy();
-
-    boolean hasUploadingFiles();
-
-    void hide();
-
-    void resetPermittedExtensions();
-
-    void setPermittedExtensions(String extensions);
-
-    void setUploadParams(String userhash, String currentUploadStateToken, String typeId);
-
-    void show();
-
-}

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -24,13 +24,13 @@
 import org.ourproject.kune.app.server.AbstractExtendedModule;
 import org.ourproject.kune.chat.server.managers.XmppManager;
 import org.ourproject.kune.chat.server.managers.XmppManagerDefault;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.rpc.ContentService;
 import org.ourproject.kune.platf.client.rpc.GroupService;
 import org.ourproject.kune.platf.client.rpc.I18nService;
 import org.ourproject.kune.platf.client.rpc.SiteService;
 import org.ourproject.kune.platf.client.rpc.SocialNetworkService;
 import org.ourproject.kune.platf.client.rpc.UserService;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
 import org.ourproject.kune.platf.server.access.AccessRightsService;
 import org.ourproject.kune.platf.server.access.AccessRightsServiceDefault;
 import org.ourproject.kune.platf.server.access.AccessService;

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.platf.server.i18n;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.TextUtils;
 import org.ourproject.kune.platf.server.UserSession;
 import org.ourproject.kune.platf.server.domain.I18nTranslation;

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -28,7 +28,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.ui.download.FileParams;
+import org.ourproject.kune.platf.client.ui.download.FileConstants;
 import org.ourproject.kune.platf.server.domain.Group;
 import org.ourproject.kune.platf.server.manager.GroupManager;
 
@@ -46,7 +46,7 @@
             IOException {
 
         // final String userHash = req.getParameter(FileParams.HASH);
-        final StateToken stateToken = new StateToken(req.getParameter(FileParams.TOKEN));
+        final StateToken stateToken = new StateToken(req.getParameter(FileConstants.TOKEN));
 
         Group group = Group.NO_GROUP;
         try {

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -30,7 +30,8 @@
 
 import org.apache.commons.fileupload.FileItem;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import org.ourproject.kune.platf.client.ui.download.FileConstants;
 import org.ourproject.kune.platf.server.access.AccessRol;
 import org.ourproject.kune.platf.server.auth.ActionLevel;
 import org.ourproject.kune.platf.server.auth.Authenticated;
@@ -38,7 +39,6 @@
 import org.ourproject.kune.platf.server.domain.BasicMimeType;
 import org.ourproject.kune.platf.server.domain.Group;
 import org.ourproject.kune.platf.server.manager.GroupManager;
-import org.ourproject.kune.workspace.client.entityheader.EntityHeaderView;
 
 import com.google.inject.Inject;
 import com.wideplay.warp.persist.TransactionType;
@@ -76,7 +76,7 @@
         File tmpDestFile = File.createTempFile("logoDest", "");
 
         boolean result = ImageUtilsDefault.scaleImageToMax(origFile.getAbsolutePath(), tmpDestFile.getAbsolutePath(),
-                EntityHeaderView.LOGO_ICON_DEFAULT_HEIGHT);
+                FileConstants.LOGO_ICON_DEFAULT_HEIGHT);
         if (result) {
             group.setLogo(FileUtils.getBytesFromFile(tmpDestFile));
             group.setLogoMime(mimeType);
@@ -126,7 +126,7 @@
     protected String createXmlResponse(final boolean success, final String message) {
         String error = "";
         if (!success) {
-            error = "<errors><field><id>" + EntityHeaderView.LOGO_FORM_FIELD + "</id><msg><![CDATA[" + message
+            error = "<errors><field><id>" + FileConstants.LOGO_FORM_FIELD + "</id><msg><![CDATA[" + message
                     + "]]></msg></field></errors>";
         }
         return "<response success=\"" + success + "\">" + error + "</response>";

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -31,7 +31,7 @@
 
 import org.ourproject.kune.platf.client.dto.StateToken;
 import org.ourproject.kune.platf.client.errors.ContentNotFoundException;
-import org.ourproject.kune.platf.client.ui.download.FileParams;
+import org.ourproject.kune.platf.client.ui.download.FileConstants;
 import org.ourproject.kune.platf.client.ui.download.ImageSize;
 import org.ourproject.kune.platf.server.access.AccessRol;
 import org.ourproject.kune.platf.server.auth.ActionLevel;
@@ -71,10 +71,10 @@
     protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException,
             IOException {
 
-        final String userHash = req.getParameter(FileParams.HASH);
-        final StateToken stateToken = new StateToken(req.getParameter(FileParams.TOKEN));
-        final String downloadS = req.getParameter(FileParams.DOWNLOAD);
-        String imageSizeS = req.getParameter(FileParams.IMGSIZE);
+        final String userHash = req.getParameter(FileConstants.HASH);
+        final StateToken stateToken = new StateToken(req.getParameter(FileConstants.TOKEN));
+        final String downloadS = req.getParameter(FileConstants.DOWNLOAD);
+        String imageSizeS = req.getParameter(FileConstants.IMGSIZE);
 
         try {
             Content cnt = getContentForDownload(userHash, stateToken);

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -26,7 +26,7 @@
 
 import net.sf.json.JSONObject;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 
 import com.google.inject.Inject;
 

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -27,7 +27,7 @@
 
 import org.apache.commons.fileupload.FileItem;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.download.ImageSize;
 import org.ourproject.kune.platf.server.UserSession;
 import org.ourproject.kune.platf.server.access.AccessRol;

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -38,7 +38,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.ui.download.FileParams;
+import org.ourproject.kune.platf.client.ui.download.FileConstants;
 import org.ourproject.kune.platf.server.properties.KuneProperties;
 
 import com.google.inject.Inject;
@@ -98,13 +98,13 @@
                     final String name = item.getFieldName();
                     final String value = item.getString();
                     log.info("name: " + name + " value: " + value);
-                    if (name.equals(FileParams.HASH)) {
+                    if (name.equals(FileConstants.HASH)) {
                         userHash = value;
                     }
-                    if (name.equals(FileParams.TOKEN)) {
+                    if (name.equals(FileConstants.TOKEN)) {
                         stateToken = new StateToken(value);
                     }
-                    if (name.equals(FileParams.TYPE_ID)) {
+                    if (name.equals(FileConstants.TYPE_ID)) {
                         typeId = value;
                     }
                 } else {

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.platf.server.state;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.server.access.AccessRightsService;
 import org.ourproject.kune.platf.server.content.ContentManager;
 import org.ourproject.kune.platf.server.domain.Container;

Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -26,14 +26,13 @@
 
 import org.ourproject.kune.platf.client.actions.ContentActionRegistry;
 import org.ourproject.kune.platf.client.actions.ContextActionRegistry;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
 import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.services.KuneErrorHandler;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
-import org.ourproject.kune.platf.client.ui.upload.FileUploader;
 import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
 import org.ourproject.kune.wiki.client.cnt.WikiViewer;
 import org.ourproject.kune.workspace.client.AbstractFoldableContentActions;
@@ -42,6 +41,7 @@
 import org.ourproject.kune.workspace.client.editor.TextEditor;
 import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
 import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink;
+import org.ourproject.kune.workspace.client.upload.FileUploader;
 
 import com.calclab.suco.client.ioc.Provider;
 

Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -23,16 +23,15 @@
 import org.ourproject.kune.platf.client.actions.ContextActionRegistry;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
 import org.ourproject.kune.platf.client.app.ToolGroup;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 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;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.services.KuneErrorHandler;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
-import org.ourproject.kune.platf.client.ui.upload.FileUploader;
 import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
 import org.ourproject.kune.wiki.client.cnt.WikiFolderContent;
 import org.ourproject.kune.wiki.client.cnt.WikiFolderContentPanel;
@@ -52,6 +51,7 @@
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.themes.WsThemePresenter;
 import org.ourproject.kune.workspace.client.tool.ToolSelector;
+import org.ourproject.kune.workspace.client.upload.FileUploader;
 
 import com.calclab.suco.client.ioc.decorator.Singleton;
 import com.calclab.suco.client.ioc.module.AbstractModule;

Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,8 +19,8 @@
  */
 package org.ourproject.kune.wiki.client;
 
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.themes.WsThemePresenter;
 import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool;

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.wiki.client.cnt;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -24,7 +24,7 @@
 import org.ourproject.kune.platf.client.dto.ContainerDTO;
 import org.ourproject.kune.platf.client.dto.StateContainerDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.wiki.client.cnt;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -22,7 +22,7 @@
 import org.ourproject.kune.platf.client.actions.ContentActionRegistry;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
 import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;

Modified: trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -23,7 +23,7 @@
 
 import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException;
 import org.ourproject.kune.platf.client.errors.ContentNotPermittedException;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.server.content.ContainerManager;
 import org.ourproject.kune.platf.server.content.ContentManager;
 import org.ourproject.kune.platf.server.domain.AccessLists;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -44,16 +44,15 @@
 import org.ourproject.kune.platf.client.dto.StateContentDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
 import org.ourproject.kune.platf.client.errors.SessionExpiredException;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
 import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
 import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.services.KuneErrorHandler;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
-import org.ourproject.kune.platf.client.ui.upload.FileUploader;
 import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
 import org.ourproject.kune.workspace.client.cnt.FoldableContent;
 import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
@@ -61,6 +60,7 @@
 import org.ourproject.kune.workspace.client.editor.TextEditor;
 import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
 import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink;
+import org.ourproject.kune.workspace.client.upload.FileUploader;
 
 import com.calclab.suco.client.events.Listener;
 import com.calclab.suco.client.events.Listener0;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/KuneWorkspaceModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/KuneWorkspaceModule.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/KuneWorkspaceModule.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -27,7 +27,6 @@
 import org.ourproject.kune.platf.client.actions.UserActionRegistry;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionBuddiesSummaryToolbar;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionBuddiesSummaryToolbarPresenter;
-import org.ourproject.kune.platf.client.actions.toolbar.ActionCntCtxToolbarPanel;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbar;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContentToolbarPresenter;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionContextToolbar;
@@ -41,9 +40,10 @@
 import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter;
 import org.ourproject.kune.platf.client.app.ApplicationComponentGroup;
 import org.ourproject.kune.platf.client.app.EntityOptionsGroup;
-import org.ourproject.kune.platf.client.app.TextEditorInsertElementGroup;
 import org.ourproject.kune.platf.client.dto.StateToken;
 import org.ourproject.kune.platf.client.dto.UserSimpleDTO;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.registry.AuthorableRegistry;
 import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
 import org.ourproject.kune.platf.client.registry.RenamableRegistry;
@@ -55,8 +55,6 @@
 import org.ourproject.kune.platf.client.rpc.SocialNetworkService;
 import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync;
 import org.ourproject.kune.platf.client.rpc.UserServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.services.ImageUtils;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.platf.client.services.KuneErrorHandler;
@@ -65,9 +63,6 @@
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
 import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette;
-import org.ourproject.kune.platf.client.ui.upload.FileUploader;
-import org.ourproject.kune.platf.client.ui.upload.FileUploaderDialog;
-import org.ourproject.kune.platf.client.ui.upload.FileUploaderPresenter;
 import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
 import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
 import org.ourproject.kune.workspace.client.ctxnav.ContextNavigatorPanel;
@@ -80,6 +75,7 @@
 import org.ourproject.kune.workspace.client.editor.TextEditorPanel;
 import org.ourproject.kune.workspace.client.editor.TextEditorPresenter;
 import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElement;
+import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElementGroup;
 import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElementPanel;
 import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElementPresenter;
 import org.ourproject.kune.workspace.client.editor.insert.linkemail.TextEditorInsertLinkEmail;
@@ -194,6 +190,7 @@
 import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserMenu;
 import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserMenuPanel;
 import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserMenuPresenter;
+import org.ourproject.kune.workspace.client.skel.ActionCntCtxToolbarPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.socialnet.BuddiesSummary;
 import org.ourproject.kune.workspace.client.socialnet.BuddiesSummaryPanel;
@@ -223,6 +220,9 @@
 import org.ourproject.kune.workspace.client.title.RenameAction;
 import org.ourproject.kune.workspace.client.tool.ToolSelector;
 import org.ourproject.kune.workspace.client.tool.ToolSelectorPresenter;
+import org.ourproject.kune.workspace.client.upload.FileUploader;
+import org.ourproject.kune.workspace.client.upload.FileUploaderDialog;
+import org.ourproject.kune.workspace.client.upload.FileUploaderPresenter;
 
 import com.calclab.suco.client.events.Listener0;
 import com.calclab.suco.client.ioc.decorator.NoDecoration;
@@ -236,6 +236,8 @@
     @Override
     protected void onInstall() {
 
+        registerDecorator(TextEditorInsertElementGroup.class, new TextEditorInsertElementGroup(container));
+
         register(Singleton.class, new Factory<SocialNetworkServiceAsync>(SocialNetworkServiceAsync.class) {
             @Override
             public SocialNetworkServiceAsync create() {
@@ -471,23 +473,21 @@
         register(Singleton.class, new Factory<ActionManager>(ActionManager.class) {
             @Override
             public ActionManager create() {
-                return new ActionManager($(WorkspaceSkeleton.class));
+                return new ActionManager();
             }
         });
 
         register(Singleton.class, new Factory<ActionGroupSummaryToolbar>(ActionGroupSummaryToolbar.class) {
             @Override
             public ActionGroupSummaryToolbar create() {
-                final ActionToolbarPanel<StateToken> panel = new ActionToolbarPanel<StateToken>(
-                        $$(ActionManager.class), $(WorkspaceSkeleton.class));
+                final ActionToolbarPanel<StateToken> panel = new ActionToolbarPanel<StateToken>($$(ActionManager.class));
                 final ActionGroupSummaryToolbarPresenter toolbar = new ActionGroupSummaryToolbarPresenter(panel);
                 return toolbar;
             }
         }, new Factory<ActionParticipationToolbar>(ActionParticipationToolbar.class) {
             @Override
             public ActionParticipationToolbar create() {
-                final ActionToolbarPanel<StateToken> panel = new ActionToolbarPanel<StateToken>(
-                        $$(ActionManager.class), $(WorkspaceSkeleton.class));
+                final ActionToolbarPanel<StateToken> panel = new ActionToolbarPanel<StateToken>($$(ActionManager.class));
                 final ActionParticipationSummaryToolbarPresenter toolbar = new ActionParticipationSummaryToolbarPresenter(
                         panel);
                 return toolbar;
@@ -496,7 +496,7 @@
             @Override
             public ActionBuddiesSummaryToolbar create() {
                 final ActionToolbarPanel<UserSimpleDTO> panel = new ActionToolbarPanel<UserSimpleDTO>(
-                        $$(ActionManager.class), $(WorkspaceSkeleton.class));
+                        $$(ActionManager.class));
                 final ActionBuddiesSummaryToolbarPresenter toolbar = new ActionBuddiesSummaryToolbarPresenter(panel);
                 return toolbar;
             }
@@ -964,5 +964,6 @@
                 return presenter;
             }
         });
+
     }
 }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.cnt;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.platf.client.ui.IconLabel;
 import org.ourproject.kune.platf.client.ui.KuneUiUtils;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -28,7 +28,7 @@
 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.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -22,7 +22,7 @@
 import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
 import org.ourproject.kune.platf.client.dto.StateContainerDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.ui.upload.FileUploader;
+import org.ourproject.kune.workspace.client.upload.FileUploader;
 
 public interface ContextNavigator {
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -24,7 +24,7 @@
 import org.ourproject.kune.platf.client.actions.MenuItemsContainer;
 import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

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	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -38,15 +38,15 @@
 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.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.KuneUiUtils;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
 import org.ourproject.kune.platf.client.ui.download.ImageSize;
-import org.ourproject.kune.platf.client.ui.upload.FileUploader;
 import org.ourproject.kune.workspace.client.title.RenameAction;
+import org.ourproject.kune.workspace.client.upload.FileUploader;
 
 import com.calclab.suco.client.events.Listener;
 import com.calclab.suco.client.events.Listener0;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AccessListsPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AccessListsPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AccessListsPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -25,7 +25,7 @@
 import org.ourproject.kune.platf.client.dto.AccessListsDTO;
 import org.ourproject.kune.platf.client.dto.GroupDTO;
 import org.ourproject.kune.platf.client.dto.GroupListDTO;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.platf.client.ui.IconLabel;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -25,7 +25,7 @@
 import org.ourproject.kune.platf.client.dto.AccessListsDTO;
 import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
 import org.ourproject.kune.platf.client.dto.UserSimpleDTO;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.platf.client.ui.ContextPropertyPanel;
 import org.ourproject.kune.workspace.client.i18n.LanguageSelector;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.editor;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette;
 import org.ourproject.kune.platf.client.ui.rte.RichTextArea;
 import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElement;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -28,7 +28,7 @@
 import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
 import org.ourproject.kune.platf.client.dto.AccessRolDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
 import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLink;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.editor;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.KuneUiUtils;
 import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette;
 import org.ourproject.kune.platf.client.ui.rte.RichTextArea;

Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementGroup.java (from rev 1052, trunk/src/main/java/org/ourproject/kune/platf/client/app/TextEditorInsertElementGroup.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/app/TextEditorInsertElementGroup.java	2009-02-26 01:46:09 UTC (rev 1052)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementGroup.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,46 @@
+/*
+ *
+ * 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.workspace.client.editor.insert;
+
+import org.ourproject.kune.workspace.client.editor.insert.abstractlink.TextEditorInsertAbstract;
+
+import com.calclab.suco.client.ioc.Container;
+import com.calclab.suco.client.ioc.Provider;
+import com.calclab.suco.client.ioc.decorator.ProviderCollection;
+import com.calclab.suco.client.ioc.decorator.Singleton;
+
+public class TextEditorInsertElementGroup extends ProviderCollection {
+
+    public TextEditorInsertElementGroup(final Container container) {
+        super(container, Singleton.instance);
+    }
+
+    public void createAll() {
+        for (final Provider<?> p : getProviders()) {
+            p.get();
+        }
+    }
+
+    public void resetAll() {
+        for (final Provider<?> p : getProviders()) {
+            ((TextEditorInsertAbstract) p.get()).reset();
+        }
+    }
+}

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,8 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.editor.insert;
 
-import org.ourproject.kune.platf.client.app.TextEditorInsertElementGroup;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.workspace.client.options.AbstractOptionsPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmailPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmailPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmailPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.editor.insert.linkemail;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
 import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElementView;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.editor.insert.linkext;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.TextUtils;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
 import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElementView;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -21,7 +21,7 @@
 
 import org.ourproject.kune.platf.client.dto.LinkDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.WindowUtils;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
 import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElementView;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -25,6 +25,7 @@
 import org.ourproject.kune.platf.client.dto.GroupDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
 import org.ourproject.kune.platf.client.services.Images;
+import org.ourproject.kune.platf.client.ui.download.FileConstants;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.themes.WsTheme;
@@ -72,11 +73,12 @@
         final String imageUrl = downloadProvider.get().getImageUrl(stateToken);
         Image logo;
         if (clipped) {
-            logo = new Image(imageUrl, 0, 0, LOGO_ICON_DEFAULT_WIDTH, LOGO_ICON_DEFAULT_HEIGHT);
+            logo = new Image(imageUrl, 0, 0, FileConstants.LOGO_ICON_DEFAULT_WIDTH,
+                    FileConstants.LOGO_ICON_DEFAULT_HEIGHT);
         } else {
             logo = new Image(imageUrl);
-            logo.setWidth("" + LOGO_ICON_DEFAULT_WIDTH);
-            logo.setHeight("" + LOGO_ICON_DEFAULT_HEIGHT);
+            logo.setWidth("" + FileConstants.LOGO_ICON_DEFAULT_WIDTH);
+            logo.setHeight("" + FileConstants.LOGO_ICON_DEFAULT_HEIGHT);
         }
         add(logo);
     }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -26,14 +26,6 @@
 
 public interface EntityHeaderView {
 
-    int LOGO_ICON_DEFAULT_HEIGHT = 60;
-    int LOGO_ICON_DEFAULT_WIDTH = 468;
-
-    int LOGO_ICON_MIN_HEIGHT = 28;
-    int LOGO_ICON_MIN_WIDTH = 468;
-
-    String LOGO_FORM_FIELD = "k-elogov-ff";
-
     void addWidget(View view);
 
     void reloadImage(GroupDTO group);

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -25,8 +25,8 @@
 import org.ourproject.kune.platf.client.actions.UserActionRegistry;
 import org.ourproject.kune.platf.client.dto.AccessRolDTO;
 import org.ourproject.kune.platf.client.dto.UserSimpleDTO;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
-import org.ourproject.kune.platf.client.services.I18nTranslationServiceMocked;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationServiceMocked;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.workspace.client.i18n;
 
 import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.platf.client.ui.AbstractSearcherPanel;
 import org.ourproject.kune.platf.client.ui.TextUtils;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -21,8 +21,8 @@
 
 import org.ourproject.kune.platf.client.View;
 import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.rpc.I18nServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.i18n;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 
 import com.gwtext.client.data.SimpleStore;
 import com.gwtext.client.data.Store;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,8 +20,8 @@
 package org.ourproject.kune.workspace.client.licensefoot;
 
 import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
-import org.ourproject.kune.workspace.client.skel.SimpleToolbar;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 
 import com.google.gwt.user.client.Window;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,8 +20,8 @@
 package org.ourproject.kune.workspace.client.licensewizard;
 
 import org.ourproject.kune.platf.client.dto.LicenseDTO;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.licensewizard;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.dialogs.WizardDialog;
 import org.ourproject.kune.platf.client.ui.dialogs.WizardListener;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.licensewizard.pages;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.TextUtils;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.licensewizard.pages;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.platf.client.ui.IconLabel;
 import org.ourproject.kune.platf.client.ui.KuneWindowUtils;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -23,7 +23,7 @@
 import java.util.List;
 
 import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.licensewizard.pages;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils;
 import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.licensewizard.pages;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,13 +20,14 @@
 package org.ourproject.kune.workspace.client.newgroup;
 
 import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.platf.client.ui.KuneUiUtils;
 import org.ourproject.kune.platf.client.ui.KuneWindowUtils;
 import org.ourproject.kune.platf.client.ui.dialogs.BasicDialogExtended;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils;
 import org.ourproject.kune.platf.client.ui.dialogs.MessageToolbar;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 import org.ourproject.kune.workspace.client.WorkspaceMessages;
 import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard;
 
@@ -175,8 +176,8 @@
         KuneUiUtils.setQuickTip(licenseImage, license.getLongName());
     }
 
-    public void setMessage(final String message, final SiteErrorType type) {
-        messageErrorBar.setErrorMessage(message, type);
+    public void setMessage(final String message, final Level level) {
+        messageErrorBar.setErrorMessage(message, level);
     }
 
     private FormPanel createNewGroupInitialDataForm(final NewGroupPresenter presenter) {

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -25,12 +25,13 @@
 import org.ourproject.kune.platf.client.dto.LicenseDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
 import org.ourproject.kune.platf.client.errors.GroupNameInUseException;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
 import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 import org.ourproject.kune.workspace.client.WorkspaceMessages;
 import org.ourproject.kune.workspace.client.site.SiteToken;
 
@@ -116,10 +117,10 @@
                         throw caught;
                     } catch (final GroupNameInUseException e) {
                         view.unMask();
-                        setMessage(i18n.t(WorkspaceMessages.NAME_IN_ALREADY_IN_USE), SiteErrorType.error);
+                        setMessage(i18n.t(WorkspaceMessages.NAME_IN_ALREADY_IN_USE), Level.error);
                     } catch (final Throwable e) {
                         view.unMask();
-                        setMessage(i18n.t("Error creating group"), SiteErrorType.error);
+                        setMessage(i18n.t("Error creating group"), Level.error);
                         GWT.log("Other kind of exception in group registration", null);
                         throw new RuntimeException();
                     }
@@ -138,8 +139,8 @@
         }
     }
 
-    public void setMessage(final String message, final SiteErrorType type) {
-        view.setMessage(message, type);
+    public void setMessage(final String message, final Level level) {
+        view.setMessage(message, level);
     }
 
     private GroupType getTypeOfGroup() {

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupView.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupView.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -21,6 +21,7 @@
 
 import org.ourproject.kune.platf.client.View;
 import org.ourproject.kune.platf.client.dto.LicenseDTO;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 
 public interface NewGroupView extends View {
 
@@ -54,7 +55,7 @@
 
     void setLicense(LicenseDTO license);
 
-    void setMessage(String message, SiteErrorType type);
+    void setMessage(String message, Level level);
 
     void show();
 

Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/SiteErrorType.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/SiteErrorType.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/SiteErrorType.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,24 +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.workspace.client.newgroup;
-
-public enum SiteErrorType {
-    error, veryimp, imp, info
-}

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.workspace.client.nohomepage;
 
 import org.ourproject.kune.platf.client.PlatfMessages;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.workspace.client.skel.EntityWorkspace;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptions.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptions.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,13 +20,13 @@
 package org.ourproject.kune.workspace.client.options;
 
 import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 
 public interface AbstractOptions {
 
     public void hideMessages();
 
-    public void setErrorMessage(String message, SiteErrorType type);
+    public void setErrorMessage(String message, Level level);
 
     void addOptionTab(View view);
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -24,7 +24,7 @@
 import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
 import org.ourproject.kune.platf.client.ui.dialogs.MessageToolbar;
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.calclab.suco.client.events.Listener0;
@@ -108,8 +108,8 @@
         return dialog.isVisible();
     }
 
-    public void setErrorMessage(final String message, final SiteErrorType type) {
-        messageErrorBar.setErrorMessage(message, type);
+    public void setErrorMessage(final String message, final Level level) {
+        messageErrorBar.setErrorMessage(message, level);
     }
 
     public void setFirstTabActive() {

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.workspace.client.options;
 
 import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 
 public abstract class AbstractOptionsPresenter {
 
@@ -46,8 +46,8 @@
         this.view = view;
     }
 
-    public void setErrorMessage(String message, SiteErrorType type) {
-        view.setErrorMessage(message, type);
+    public void setErrorMessage(String message, Level level) {
+        view.setErrorMessage(message, level);
     }
 
     public void show() {

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsView.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsView.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.workspace.client.options;
 
 import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 
 public interface AbstractOptionsView extends View {
 
@@ -32,6 +32,6 @@
 
     void hideMessages();
 
-    void setErrorMessage(final String message, final SiteErrorType type);
+    void setErrorMessage(final String message, final Level level);
 
 }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptions.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptions.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.workspace.client.options;
 
 import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 
 public interface EntityOptions extends AbstractOptions {
 
@@ -30,7 +30,7 @@
 
     public void hideMessages();
 
-    public void setErrorMessage(String message, SiteErrorType type);
+    public void setErrorMessage(String message, Level level);
 
     public void show();
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -21,7 +21,7 @@
 
 import org.ourproject.kune.platf.client.PlatfMessages;
 import org.ourproject.kune.platf.client.app.EntityOptionsGroup;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
 import org.ourproject.kune.workspace.client.entityheader.EntityHeaderButton;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.workspace.client.options.license;
 
 import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.KuneUiUtils;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,11 +20,10 @@
 package org.ourproject.kune.workspace.client.options.logo;
 
 import org.ourproject.kune.platf.client.PlatfMessages;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils;
-import org.ourproject.kune.platf.client.ui.download.FileParams;
+import org.ourproject.kune.platf.client.ui.download.FileConstants;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
-import org.ourproject.kune.workspace.client.entityheader.EntityHeaderView;
 import org.ourproject.kune.workspace.client.options.EntityOptionsView;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 
@@ -85,17 +84,17 @@
         });
         dialogInfoLabel = new Label();
         super.add(dialogInfoLabel);
-        file = new TextField("File", EntityHeaderView.LOGO_FORM_FIELD);
+        file = new TextField("File", FileConstants.LOGO_FORM_FIELD);
         EventCallback keyListener = new EventCallback() {
             public void execute(EventObject e) {
                 // setEnableFileField();
             }
         };
         file.addKeyPressListener(keyListener);
-        file.setId(EntityHeaderView.LOGO_FORM_FIELD);
+        file.setId(FileConstants.LOGO_FORM_FIELD);
         file.setInputType("file");
-        userhashField = new Hidden(FileParams.HASH, FileParams.HASH);
-        tokenField = new Hidden(FileParams.TOKEN, FileParams.TOKEN);
+        userhashField = new Hidden(FileConstants.HASH, FileConstants.HASH);
+        tokenField = new Hidden(FileConstants.TOKEN, FileConstants.TOKEN);
         super.add(userhashField);
         super.add(tokenField);
         super.add(file);
@@ -139,7 +138,7 @@
     public void setNormalGroupsLabels() {
         dialogInfoLabel.setHtml(i18n.t("Select an image in your computer as the logo for this group. "
                 + "For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images.",
-                EntityHeaderView.LOGO_ICON_DEFAULT_HEIGHT, EntityHeaderView.LOGO_ICON_DEFAULT_HEIGHT)
+                FileConstants.LOGO_ICON_DEFAULT_HEIGHT, FileConstants.LOGO_ICON_DEFAULT_HEIGHT)
                 + DefaultFormUtils.brbr());
         super.setTitle(PlatfMessages.ENT_LOGO_SELECTOR_NORMAL_TITLE);
         doLayoutIfNeeded();
@@ -148,7 +147,7 @@
     public void setPersonalGroupsLabels() {
         dialogInfoLabel.setHtml(i18n.t("Select an image in your computer as your avatar. "
                 + "For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images.",
-                EntityHeaderView.LOGO_ICON_DEFAULT_HEIGHT, EntityHeaderView.LOGO_ICON_DEFAULT_HEIGHT)
+                FileConstants.LOGO_ICON_DEFAULT_HEIGHT, FileConstants.LOGO_ICON_DEFAULT_HEIGHT)
                 + "<br/><br/>");
         super.setTitle(PlatfMessages.ENT_LOGO_SELECTOR_PERSON_TITLE);
         doLayoutIfNeeded();

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.options.pscape;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.BasicThumb;
 import org.ourproject.kune.platf.client.ui.TextUtils;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -22,7 +22,7 @@
 import java.util.HashMap;
 
 import org.ourproject.kune.platf.client.dto.ToolSimpleDTO;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
 import org.ourproject.kune.workspace.client.options.EntityOptionsView;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -25,11 +25,11 @@
 import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
 import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
 import org.ourproject.kune.platf.client.dto.ToolSimpleDTO;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 import org.ourproject.kune.workspace.client.options.EntityOptions;
 
 import com.calclab.suco.client.events.Listener2;
@@ -128,7 +128,7 @@
                 checked, new AsyncCallback<Object>() {
                     public void onFailure(Throwable caught) {
                         view.setChecked(toolName, !checked);
-                        entityOptions.setErrorMessage(i18n.t("Error configuring the tool"), SiteErrorType.error);
+                        entityOptions.setErrorMessage(i18n.t("Error configuring the tool"), Level.error);
                     }
 
                     public void onSuccess(Object result) {

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.rate;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -22,10 +22,10 @@
 import org.ourproject.kune.platf.client.dto.RateResultDTO;
 import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
 import org.ourproject.kune.platf.client.dto.StateContentDTO;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 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.services.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.rate;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.workspace.client.skel.Toolbar;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.workspace.client.search;
 
 import org.ourproject.kune.platf.client.dto.LinkDTO;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 
 import com.calclab.suco.client.events.Listener;
 import com.google.gwt.user.client.Command;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -21,7 +21,7 @@
 
 import org.ourproject.kune.platf.client.dto.LinkDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.search;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
 
 public class GroupLiveSearchPanel extends EntityLiveSearcherPanel {

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.search;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.AbstractSearcherPanel;
 import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.search;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
 
 public class UserLiveSearcherPanel extends EntityLiveSearcherPanel {

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  \*/
 package org.ourproject.kune.workspace.client.signin;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
 import org.ourproject.kune.workspace.client.WorkspaceMessages;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.workspace.client.signin;
 
 import org.ourproject.kune.platf.client.PlatfMessages;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.ui.KuneUiUtils;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -28,12 +28,12 @@
 import org.ourproject.kune.platf.client.dto.UserInfoDTO;
 import org.ourproject.kune.platf.client.errors.EmailAddressInUseException;
 import org.ourproject.kune.platf.client.errors.GroupNameInUseException;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.rpc.UserServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 
 import com.calclab.emiteuimodule.client.SubscriptionMode;
 import com.calclab.suco.client.ioc.Provider;
@@ -97,11 +97,11 @@
                     try {
                         throw caught;
                     } catch (final EmailAddressInUseException e) {
-                        view.setErrorMessage(i18n.t(PlatfMessages.EMAIL_IN_USE), SiteErrorType.error);
+                        view.setErrorMessage(i18n.t(PlatfMessages.EMAIL_IN_USE), Level.error);
                     } catch (final GroupNameInUseException e) {
-                        view.setErrorMessage(i18n.t(PlatfMessages.NAME_IN_USE), SiteErrorType.error);
+                        view.setErrorMessage(i18n.t(PlatfMessages.NAME_IN_USE), Level.error);
                     } catch (final Throwable e) {
-                        view.setErrorMessage(i18n.t("Error during registration."), SiteErrorType.error);
+                        view.setErrorMessage(i18n.t("Error during registration."), Level.error);
                         GWT.log("Other kind of exception in user registration" + e.getMessage() + ", "
                                 + e.getLocalizedMessage(), null);
                         e.printStackTrace();

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -21,12 +21,12 @@
 
 import java.util.Date;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.ui.dialogs.BasicDialogExtended;
 import org.ourproject.kune.platf.client.ui.dialogs.MessageToolbar;
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 
 import com.calclab.suco.client.events.Listener0;
 import com.google.gwt.core.client.GWT;
@@ -83,7 +83,7 @@
         GWT.log("Received hash: " + userHash, null);
     }
 
-    public void setErrorMessage(final String message, final SiteErrorType type) {
-        messageErrorBar.setErrorMessage(message, type);
+    public void setErrorMessage(final String message, final Level level) {
+        messageErrorBar.setErrorMessage(message, level);
     }
 }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -21,7 +21,7 @@
 
 import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
 import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractView.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractView.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.workspace.client.signin;
 
 import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 
 public interface SignInAbstractView extends View {
 
@@ -38,7 +38,7 @@
 
     void setCookie(String userHash);
 
-    void setErrorMessage(final String message, final SiteErrorType type);
+    void setErrorMessage(final String message, final Level level);
 
     void show();
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  \*/
 package org.ourproject.kune.workspace.client.signin;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
 
 import com.gwtext.client.core.EventObject;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.workspace.client.signin;
 
 import org.ourproject.kune.platf.client.PlatfMessages;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.platf.client.ui.KuneUiUtils;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -24,12 +24,12 @@
 import org.ourproject.kune.platf.client.dto.UserDTO;
 import org.ourproject.kune.platf.client.dto.UserInfoDTO;
 import org.ourproject.kune.platf.client.errors.UserAuthException;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.rpc.UserServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 import org.ourproject.kune.workspace.client.site.SiteToken;
 
 import com.allen_sauer.gwt.log.client.Log;
@@ -96,10 +96,9 @@
                     try {
                         throw caught;
                     } catch (final UserAuthException e) {
-                        view.setErrorMessage(i18n.t(PlatfMessages.INCORRECT_NICKNAME_EMAIL_OR_PASSWORD),
-                                SiteErrorType.error);
+                        view.setErrorMessage(i18n.t(PlatfMessages.INCORRECT_NICKNAME_EMAIL_OR_PASSWORD), Level.error);
                     } catch (final Throwable e) {
-                        view.setErrorMessage("Error in login", SiteErrorType.error);
+                        view.setErrorMessage("Error in login", Level.error);
                         Log.error("Other kind of exception in SignInPresenter/doLogin");
                     }
                 }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInView.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.signin;
 
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 
 public interface SignInView extends SignInAbstractView {
 
@@ -45,7 +45,7 @@
 
     void setCookie(final String userHash);
 
-    void setErrorMessage(final String message, final SiteErrorType type);
+    void setErrorMessage(final String message, final Level level);
 
     void show();
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/WorkspaceNotifyUser.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/site/WorkspaceNotifyUser.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/WorkspaceNotifyUser.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,6 +1,7 @@
 package org.ourproject.kune.workspace.client.site;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import org.ourproject.kune.platf.client.ui.noti.ConfirmationAsk;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 import org.ourproject.kune.workspace.client.site.msg.SiteToastMessage;
@@ -52,6 +53,11 @@
                 ws.get().showAlertMessage(title, msg);
             }
         });
+        notifyUser.addConfirmationAsker(new Listener<ConfirmationAsk>() {
+            public void onEvent(ConfirmationAsk ask) {
+                ws.get().askConfirmation(ask.getTitle(), ask.getMessage(), ask.getOnConfirmed(), ask.getOnCancel());
+            }
+        });
     }
 
 }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/MessagePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/MessagePresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/MessagePresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,12 +19,12 @@
  */
 package org.ourproject.kune.workspace.client.site.msg;
 
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 
 public interface MessagePresenter {
 
     void resetMessage();
 
-    void setMessage(final String message, final SiteErrorType type);
+    void setMessage(final String message, final Level level);
 
 }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SimpleMessagePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SimpleMessagePanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/SimpleMessagePanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.workspace.client.site.msg;
 
 import org.ourproject.kune.platf.client.services.Images;
-import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
 
 import com.google.gwt.user.client.ui.AbstractImagePrototype;
 import com.google.gwt.user.client.ui.HTML;
@@ -67,16 +67,16 @@
         this.message.setHTML(text);
     }
 
-    public void setMessage(final String text, final SiteErrorType lastMessageType, final SiteErrorType type) {
+    public void setMessage(final String text, final Level lastMessageType, final Level type) {
         AbstractImagePrototype imagePrototype = null;
         switch (type) {
         case error:
             imagePrototype = images.error();
             break;
-        case veryimp:
+        case veryImportant:
             imagePrototype = images.important();
             break;
-        case imp:
+        case important:
             imagePrototype = images.emblemImportant();
             break;
         case info:

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  \*/
 package org.ourproject.kune.workspace.client.sitebar.sitenewgroup;
 
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.workspace.client.site.SiteToken;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  \*/
 package org.ourproject.kune.workspace.client.sitebar.siteoptions;
 
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.workspace.client.i18n.I18nTranslator;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,10 +19,10 @@
  \*/
 package org.ourproject.kune.workspace.client.sitebar.sitepublic;
 
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.platf.client.ui.IconLabel;
-import org.ourproject.kune.workspace.client.skel.SimpleToolbar;
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 
 import com.google.gwt.user.client.Window;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,8 +20,8 @@
 package org.ourproject.kune.workspace.client.sitebar.sitesearch;
 
 import org.ourproject.kune.platf.client.services.Images;
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
-import org.ourproject.kune.workspace.client.skel.SimpleToolbar;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 
 import com.google.gwt.user.client.ui.ClickListener;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.workspace.client.sitebar.sitesearch;
 
 import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.workspace.client.search.SiteSearcher;
 
 import com.calclab.suco.client.ioc.Provider;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  \*/
 package org.ourproject.kune.workspace.client.sitebar.sitesign;
 
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.workspace.client.site.SiteToken;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  \*/
 package org.ourproject.kune.workspace.client.sitebar.sitesign;
 
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -21,9 +21,9 @@
 
 import org.ourproject.kune.platf.client.PlatfMessages;
 import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.ui.MenuItemCollection;
-import org.ourproject.kune.workspace.client.skel.SimpleToolbar;
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 
 import com.google.gwt.user.client.ui.ClickListener;

Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/ActionCntCtxToolbarPanel.java (from rev 1052, trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionCntCtxToolbarPanel.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionCntCtxToolbarPanel.java	2009-02-26 01:46:09 UTC (rev 1052)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/ActionCntCtxToolbarPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,76 @@
+/*
+ *
+ * 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.workspace.client.skel;
+
+import org.ourproject.kune.platf.client.actions.ActionManager;
+import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel;
+
+import com.calclab.suco.client.ioc.Provider;
+
+public class ActionCntCtxToolbarPanel<T> extends ActionToolbarPanel<T> {
+
+    public enum Position {
+        content, context
+    }
+
+    private final Position position;
+    private final WorkspaceSkeleton ws;
+
+    public ActionCntCtxToolbarPanel(final Position position, final Provider<ActionManager> actionManagerProvider,
+            final WorkspaceSkeleton ws) {
+        super(actionManagerProvider);
+        this.position = position;
+        this.ws = ws;
+    }
+
+    @Override
+    public void attach() {
+        if (!topbar.isAttached()) {
+            switch (position) {
+            case content:
+                ws.getEntityWorkspace().getContentTopBar().removeAll();
+                ws.getEntityWorkspace().getContentTopBar().add(topbar);
+                ws.getEntityWorkspace().getContentBottomBar().add(bottombar);
+                break;
+            case context:
+            default:
+                ws.getEntityWorkspace().getContextTopBar().removeAll();
+                ws.getEntityWorkspace().getContextTopBar().add(topbar);
+                ws.getEntityWorkspace().getContextBottomBar().add(bottombar);
+            }
+        }
+    }
+
+    @Override
+    public void detach() {
+        if (topbar.isAttached()) {
+            switch (position) {
+            case content:
+                ws.getEntityWorkspace().getContentTopBar().remove(topbar);
+                ws.getEntityWorkspace().getContentBottomBar().remove(bottombar);
+                break;
+            case context:
+            default:
+                ws.getEntityWorkspace().getContextTopBar().remove(topbar);
+                ws.getEntityWorkspace().getContextBottomBar().remove(bottombar);
+            }
+        }
+    }
+}

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,6 +20,7 @@
 package org.ourproject.kune.workspace.client.skel;
 
 import org.ourproject.kune.platf.client.ui.RoundedPanel;
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
 import org.ourproject.kune.workspace.client.themes.WsTheme;
 
 import com.google.gwt.user.client.ui.Widget;

Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SimpleToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SimpleToolbar.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SimpleToolbar.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,97 +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.workspace.client.skel;
-
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.HasVerticalAlignment.VerticalAlignmentConstant;
-
-public class SimpleToolbar extends Composite {
-
-    private final HorizontalPanel childPanel;
-    private final HorizontalPanel mainPanel;
-
-    public SimpleToolbar() {
-        mainPanel = new HorizontalPanel();
-        childPanel = new HorizontalPanel();
-        mainPanel.add(childPanel);
-        initWidget(mainPanel);
-        mainPanel.setWidth("100%");
-    }
-
-    public void add(final Widget widget) {
-        childPanel.add(widget);
-        childPanel.setCellVerticalAlignment(widget, VerticalPanel.ALIGN_MIDDLE);
-    }
-
-    public void add(final Widget widget, VerticalAlignmentConstant valign) {
-        childPanel.add(widget);
-        childPanel.setCellVerticalAlignment(widget, valign);
-    }
-
-    public Widget addFill() {
-        final Label emptyLabel = new Label("");
-        this.add(emptyLabel);
-        childPanel.setCellWidth(emptyLabel, "100%");
-        return emptyLabel;
-    }
-
-    public Widget addSeparator() {
-        final Label emptyLabel = new Label("");
-        emptyLabel.setStyleName("ytb-sep");
-        emptyLabel.addStyleName("k-toolbar-sep");
-        this.add(emptyLabel);
-        return emptyLabel;
-    }
-
-    public Widget addSpacer() {
-        final Label emptyLabel = new Label("");
-        emptyLabel.setStyleName("ytb-spacer");
-        this.add(emptyLabel);
-        return emptyLabel;
-    }
-
-    public void remove(final Widget widget) {
-        childPanel.remove(widget);
-    }
-
-    public void removeAll() {
-        childPanel.clear();
-    }
-
-    public void setCellWidth(Widget widget, String width) {
-        childPanel.setCellWidth(widget, width);
-    }
-
-    public void setCleanStyle() {
-        setStyleName("x-toolbar");
-        addStyleName("x-panel");
-        addStyleName("k-blank-toolbar");
-    }
-
-    @Override
-    public void setHeight(String height) {
-        mainPanel.setHeight(height);
-        mainPanel.setCellHeight(childPanel, height);
-    }
-}
\ No newline at end of file

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SiteBar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SiteBar.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SiteBar.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,6 +19,8 @@
  \*/
 package org.ourproject.kune.workspace.client.skel;
 
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
+
 import com.google.gwt.user.client.ui.Widget;
 import com.gwtext.client.widgets.Panel;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,6 +19,8 @@
  \*/
 package org.ourproject.kune.workspace.client.skel;
 
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
+
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,6 +19,7 @@
  \*/
 package org.ourproject.kune.workspace.client.skel;
 
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
 import org.ourproject.kune.workspace.client.themes.WsTheme;
 
 import com.calclab.suco.client.events.Listener0;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -28,9 +28,9 @@
 import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
 import org.ourproject.kune.platf.client.dto.UserSimpleDTO;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.BasicThumb;
-import org.ourproject.kune.workspace.client.skel.SimpleToolbar;
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
 import org.ourproject.kune.workspace.client.skel.SummaryPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -39,10 +39,10 @@
 import org.ourproject.kune.platf.client.dto.UserBuddiesDataDTO;
 import org.ourproject.kune.platf.client.dto.UserBuddiesVisibilityDTO;
 import org.ourproject.kune.platf.client.dto.UserSimpleDTO;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
 import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync;
 import org.ourproject.kune.platf.client.rpc.UserServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.ImageUtils;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -25,11 +25,11 @@
 import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
 import org.ourproject.kune.platf.client.dto.GroupDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
 import org.ourproject.kune.platf.client.ui.gridmenu.GridDragConfiguration;
 import org.ourproject.kune.platf.client.ui.gridmenu.GridItem;
 import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel;
-import org.ourproject.kune.workspace.client.skel.SimpleToolbar;
 import org.ourproject.kune.workspace.client.skel.SummaryPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.themes.WsTheme;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -40,10 +40,10 @@
 import org.ourproject.kune.platf.client.dto.SocialNetworkVisibilityDTO;
 import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
 import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
 import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.services.ImageDescriptor;
 import org.ourproject.kune.platf.client.services.ImageUtils;
 import org.ourproject.kune.platf.client.state.Session;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -24,10 +24,10 @@
 import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
 import org.ourproject.kune.platf.client.dto.GroupDTO;
 import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
 import org.ourproject.kune.platf.client.ui.gridmenu.GridItem;
 import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel;
-import org.ourproject.kune.workspace.client.skel.SimpleToolbar;
 import org.ourproject.kune.workspace.client.skel.SummaryPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.themes.WsTheme;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -27,8 +27,8 @@
 import org.ourproject.kune.platf.client.dto.GroupDTO;
 import org.ourproject.kune.platf.client.dto.ParticipationDataDTO;
 import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.services.ImageUtils;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -30,19 +30,19 @@
 import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO;
 import org.ourproject.kune.platf.client.dto.SocialNetworkRequestResult;
 import org.ourproject.kune.platf.client.dto.StateToken;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
 import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.MenuItem;
 import org.ourproject.kune.platf.client.ui.MenuItemCollection;
+import org.ourproject.kune.platf.client.ui.download.FileConstants;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
 import org.ourproject.kune.platf.client.ui.gridmenu.CustomMenu;
 import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup;
 import org.ourproject.kune.platf.client.ui.gridmenu.GridItem;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
-import org.ourproject.kune.workspace.client.entityheader.EntityHeaderView;
 
 import com.calclab.suco.client.events.Listener;
 import com.calclab.suco.client.ioc.Provider;
@@ -129,7 +129,7 @@
     protected String createTooltipWithLogo(String shortName, StateToken token, boolean hasLogo, boolean isPersonal) {
         return "<table><tr><td>"
                 + (hasLogo ? downloadProvider.get().getLogoAvatarHtml(token, hasLogo, isPersonal,
-                        EntityHeaderView.LOGO_ICON_DEFAULT_HEIGHT, 3) : "") + "</td><td>"
+                        FileConstants.LOGO_ICON_DEFAULT_HEIGHT, 3) : "") + "</td><td>"
                 + i18n.t(isPersonal ? "Nickname: [%s]" : "Group short name: [%s]", shortName) + "</td></tr></table>";
     }
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -1,6 +1,6 @@
 package org.ourproject.kune.workspace.client.socialnet.other;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.services.Images;
 import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
 import org.ourproject.kune.workspace.client.entityheader.EntityHeaderButton;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.tags;
 
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.KuneUiUtils;
 import org.ourproject.kune.workspace.client.skel.SummaryPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  \*/
 package org.ourproject.kune.workspace.client.themes;
 
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 
 import com.calclab.suco.client.events.Listener2;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -19,7 +19,7 @@
  */
 package org.ourproject.kune.workspace.client.title;
 
-import org.ourproject.kune.workspace.client.skel.SimpleToolbar;
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 
 import com.google.gwt.user.client.ui.Label;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -25,8 +25,8 @@
 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.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.registry.AuthorableRegistry;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.StateManager;
 
 import com.calclab.suco.client.events.Listener;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -20,7 +20,7 @@
 package org.ourproject.kune.workspace.client.title;
 
 import org.ourproject.kune.platf.client.ui.IconLabelEditable;
-import org.ourproject.kune.workspace.client.skel.SimpleToolbar;
+import org.ourproject.kune.platf.client.ui.SimpleToolbar;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 
 import com.calclab.suco.client.events.Listener2;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -23,8 +23,8 @@
 import org.ourproject.kune.platf.client.dto.StateToken;
 import org.ourproject.kune.platf.client.errors.NameInUseException;
 import org.ourproject.kune.platf.client.errors.NameNotPermittedException;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
 

Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/AbstractUploader.java (from rev 1052, trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/AbstractUploader.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/AbstractUploader.java	2009-02-26 01:46:09 UTC (rev 1052)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/AbstractUploader.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,36 @@
+/*
+ *
+ * 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.workspace.client.upload;
+
+import org.ourproject.kune.platf.client.ui.download.FileConstants;
+
+import com.gwtext.client.core.UrlParam;
+
+public class AbstractUploader {
+
+    public UrlParam[] genUploadParams(final String userhash, final String currentStateToken, final String typeId) {
+        // Warning take into account param[size]
+        final UrlParam param[] = new UrlParam[3];
+        param[0] = new UrlParam(FileConstants.HASH, userhash);
+        param[1] = new UrlParam(FileConstants.TOKEN, currentStateToken);
+        param[2] = new UrlParam(FileConstants.TYPE_ID, typeId);
+        return param;
+    }
+}

Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java (from rev 1052, trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java	2009-02-26 01:46:09 UTC (rev 1052)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,40 @@
+/*
+ *
+ * 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.workspace.client.upload;
+
+import org.ourproject.kune.platf.client.dto.StateToken;
+
+import com.calclab.suco.client.events.Listener;
+
+public interface FileUploader {
+
+    void addOnUploadCompleteListener(Listener<StateToken> listener);
+
+    boolean hasUploadingFiles();
+
+    void hide();
+
+    void resetPermittedExtensions();
+
+    void setPermittedExtensions(String extensions);
+
+    void show();
+
+}

Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java (from rev 1053, trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,195 @@
+/*
+ *
+ * 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.workspace.client.upload;
+
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
+import org.ourproject.kune.platf.client.ui.TextUtils;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
+import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.DeferredCommand;
+import com.gwtext.client.core.EventObject;
+import com.gwtext.client.widgets.Button;
+import com.gwtext.client.widgets.ToolbarButton;
+import com.gwtext.client.widgets.Window;
+import com.gwtext.client.widgets.event.ButtonListenerAdapter;
+import com.gwtextux.client.widgets.upload.UploadDialog;
+import com.gwtextux.client.widgets.upload.UploadDialogListenerAdapter;
+
+public class FileUploaderDialog extends AbstractUploader implements FileUploaderView {
+
+    protected static final String SITE_FILE_UPLOADER = "k-site-file-uploader";
+
+    private static final String URL = "/kune/servlets/FileUploadManager";
+
+    private UploadDialog dialog;
+    private ToolbarButton traybarButton;
+    private final I18nUITranslationService i18n;
+    private final WorkspaceSkeleton ws;
+    private final FileUploaderPresenter presenter;
+
+    public FileUploaderDialog(final FileUploaderPresenter presenter, final I18nUITranslationService i18n,
+            final WorkspaceSkeleton ws) {
+        this.presenter = presenter;
+        this.i18n = i18n;
+        this.ws = ws;
+        createDialog(false);
+    }
+
+    public void destroy() {
+        if (hasUploadingFiles()) {
+            dialog.stopUpload();
+            NotifyUser.important(i18n.t("Upload cancelled after signing out"));
+        }
+        if (dialog != null) {
+            dialog.destroy();
+            dialog = null;
+        }
+        if (traybarButton != null) {
+            traybarButton.destroy();
+            traybarButton = null;
+        }
+    }
+
+    public boolean hasUploadingFiles() {
+        return dialog.hasUnuploadedFiles();
+    }
+
+    public void hide() {
+        dialog.hide();
+    }
+
+    public void resetPermittedExtensions() {
+        final String[] extensions = {};
+        setPermittedExtensions(extensions);
+    }
+
+    public void setPermittedExtensions(final String extensions) {
+        final Object[] objs = TextUtils.splitTags(extensions).toArray();
+        final String[] exts = new String[objs.length];
+        for (int i = 0; i < objs.length; i++) {
+            exts[i] = (String) objs[i];
+        }
+        setPermittedExtensions(exts);
+    }
+
+    public void setUploadParams(final String userhash, final String currentStateToken, final String typeId) {
+        dialog.setBaseParams(genUploadParams(userhash, currentStateToken, typeId));
+    }
+
+    public void show() {
+        if (traybarButton == null) {
+            traybarButton = new ToolbarButton();
+            traybarButton.setTooltip(i18n.t("Show/hide uploader window"));
+            traybarButton.setIcon("images/nav/upload.png");
+            traybarButton.addListener(new ButtonListenerAdapter() {
+                @Override
+                public void onClick(final Button button, final EventObject e) {
+                    if (dialog.isVisible()) {
+                        dialog.hide();
+                    } else {
+                        dialog.show();
+                    }
+                }
+            });
+            ws.getSiteTraybar().addButton(traybarButton);
+        }
+        if (dialog == null) {
+            createDialog(true);
+        } else {
+            dialog.show();
+        }
+    }
+
+    private void createDialog(final boolean show) {
+        dialog = new UploadDialog(i18n.t("File uploader"), false, true) {
+            {
+                setAllowCloseOnUpload(true);
+                setResetOnHide(false);
+                setClosable(true);
+                setCloseAction(Window.HIDE);
+                setMinimizable(true);
+                setUploadAutostart(false);
+            }
+        };
+        // dialog.setId(SITE_FILE_UPLOADER);
+        dialog.addListener(new UploadDialogListenerAdapter() {
+            @Override
+            public boolean onBeforeAdd(final UploadDialog source, final String filename) {
+                boolean mustAdd = presenter.checkFolderChange();
+                if (!mustAdd) {
+                    NotifyUser.important(i18n.t("Please, wait until current uploads are finished to upload new files into another location"));
+                }
+                return mustAdd;
+            }
+
+            @Override
+            public void onMinimize(final Window source) {
+                dialog.hide();
+            }
+
+            @Override
+            public void onUploadComplete(final UploadDialog source) {
+                if (!dialog.isVisible()) {
+                    NotifyUser.info(i18n.t("Upload completed"));
+                    traybarButton.destroy();
+                    traybarButton = null;
+                }
+                presenter.onUploadComplete();
+            }
+
+            @Override
+            public void onUploadError(final UploadDialog source, final String filename, final JavaScriptObject data) {
+                showError();
+            }
+
+            @Override
+            public void onUploadFailed(final UploadDialog source, final String filename) {
+                showError();
+            }
+
+            private void showError() {
+                if (!dialog.isVisible()) {
+                    NotifyUser.veryImportant(i18n.t("Error uploading"));
+                }
+            }
+
+        });
+        dialog.setUrl(URL);
+        if (show) {
+            dialog.show();
+        }
+    }
+
+    private void setPermittedExtensions(final String[] extensions) {
+        DeferredCommand.addCommand(new Command() {
+            public void execute() {
+                if (dialog == null) {
+                    createDialog(false);
+                }
+                Log.info("PermittedExtensions: " + extensions.toString() + " length: " + extensions.length);
+                dialog.setPermittedExtensions(extensions);
+            }
+        });
+    }
+}

Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java (from rev 1053, trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,101 @@
+/*
+ *
+ * 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.workspace.client.upload;
+
+import org.ourproject.kune.platf.client.dto.StateToken;
+import org.ourproject.kune.platf.client.state.Session;
+import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool;
+
+import com.calclab.suco.client.events.Event;
+import com.calclab.suco.client.events.Listener;
+import com.calclab.suco.client.events.Listener0;
+
+public class FileUploaderPresenter implements FileUploader {
+
+    private FileUploaderView view;
+    private final Session session;
+    private StateToken currentUploadStateToken;
+    private final Event<StateToken> onUploadComplete;
+
+    public FileUploaderPresenter(final Session session) {
+        this.session = session;
+        this.onUploadComplete = new Event<StateToken>("onUploadComplete");
+    }
+
+    public void addOnUploadCompleteListener(final Listener<StateToken> slot) {
+        onUploadComplete.add(slot);
+    }
+
+    public boolean checkFolderChange() {
+        final StateToken currentFolderStateToken = session.getCurrentStateToken().copy().clearDocument();
+        if (sameContainer()) {
+            view.setUploadParams(session.getUserHash(), currentFolderStateToken.toString(),
+                    currentFolderStateToken.getTool() + "." + FoldableAbstractClientTool.UPLOADEDFILE_SUFFIX);
+            return true;
+        }
+        if (view.hasUploadingFiles()) {
+            return false;
+        } else {
+            currentUploadStateToken = currentFolderStateToken;
+            view.setUploadParams(session.getUserHash(), currentFolderStateToken.toString(),
+                    currentFolderStateToken.getTool() + "." + FoldableAbstractClientTool.UPLOADEDFILE_SUFFIX);
+            return true;
+        }
+    }
+
+    public boolean hasUploadingFiles() {
+        return view.hasUploadingFiles();
+    }
+
+    public void hide() {
+        view.hide();
+    }
+
+    public void init(final FileUploaderView view) {
+        this.view = view;
+        session.onUserSignOut(new Listener0() {
+            public void onEvent() {
+                view.destroy();
+            }
+        });
+    }
+
+    public void onUploadComplete() {
+        onUploadComplete.fire(currentUploadStateToken);
+    }
+
+    public void resetPermittedExtensions() {
+        view.resetPermittedExtensions();
+    }
+
+    public void setPermittedExtensions(final String extensions) {
+        view.setPermittedExtensions(extensions);
+    }
+
+    public void show() {
+        view.show();
+    }
+
+    private boolean sameContainer() {
+        final StateToken currentStateToken = session.getCurrentStateToken();
+        currentUploadStateToken = currentUploadStateToken == null ? currentStateToken : currentUploadStateToken;
+        return currentUploadStateToken.equals(currentStateToken);
+    }
+}

Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderView.java (from rev 1052, trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderView.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderView.java	2009-02-26 01:46:09 UTC (rev 1052)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderView.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -0,0 +1,38 @@
+/*
+ *
+ * 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.workspace.client.upload;
+
+public interface FileUploaderView {
+
+    void destroy();
+
+    boolean hasUploadingFiles();
+
+    void hide();
+
+    void resetPermittedExtensions();
+
+    void setPermittedExtensions(String extensions);
+
+    void setUploadParams(String userhash, String currentUploadStateToken, String typeId);
+
+    void show();
+
+}

Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionShortcutTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionShortcutTest.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionShortcutTest.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -5,7 +5,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.ourproject.kune.platf.client.services.I18nTranslationServiceMocked;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationServiceMocked;
 
 import com.google.gwt.user.client.ui.KeyboardListener;
 

Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -9,8 +9,8 @@
 import org.ourproject.kune.docs.client.DocumentClientTool;
 import org.ourproject.kune.platf.client.dto.StateToken;
 import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.ui.upload.FileUploaderPresenter;
-import org.ourproject.kune.platf.client.ui.upload.FileUploaderView;
+import org.ourproject.kune.workspace.client.upload.FileUploaderPresenter;
+import org.ourproject.kune.workspace.client.upload.FileUploaderView;
 
 public class FileUploaderPresenterTest {
 

Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/selenium/EntityLogoSeleniumTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/selenium/EntityLogoSeleniumTest.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/selenium/EntityLogoSeleniumTest.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -4,7 +4,7 @@
 import java.io.IOException;
 
 import org.junit.Ignore;
-import org.ourproject.kune.workspace.client.entityheader.EntityHeaderView;
+import org.ourproject.kune.platf.client.ui.download.FileConstants;
 import org.ourproject.kune.workspace.client.options.EntityOptionsPanel;
 import org.ourproject.kune.workspace.client.options.logo.EntityOptionsLogoPanel;
 
@@ -24,8 +24,7 @@
         // PlatfMessages.ENT_OPTIONS_GROUP_TITLE);
         click(EntityOptionsLogoPanel.SET_LOGO_ID);
         File dir = new File(".");
-        type(EntityHeaderView.LOGO_FORM_FIELD, dir.getCanonicalPath() + File.separator + "img" + File.separator
-                + filename);
+        type(FileConstants.LOGO_FORM_FIELD, dir.getCanonicalPath() + File.separator + "img" + File.separator + filename);
         click(EntityOptionsLogoPanel.SET_LOGO_ID);
     }
 }

Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -9,7 +9,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
 import org.ourproject.kune.platf.server.PersistenceTest;
 import org.ourproject.kune.platf.server.domain.I18nCountry;
 import org.ourproject.kune.platf.server.domain.I18nLanguage;

Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java	2009-03-02 13:25:37 UTC (rev 1053)
+++ trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java	2009-03-02 19:32:02 UTC (rev 1054)
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
-import org.ourproject.kune.platf.client.services.I18nUITranslationService;
+import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
 import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLink;


