[kune-commits] r1163 - in trunk/src: main/java/cc/kune/core main/java/cc/kune/core/client main/java/cc/kune/core/client/actions main/java/cc/kune/core/client/cookies main/java/cc/kune/core/client/errors main/java/cc/kune/core/client/i18n main/java/cc/kune/core/client/notify main/java/cc/kune/core/client/rpcservices main/java/cc/kune/core/client/state main/java/cc/kune/core/client/utils main/java/cc/kune/core/client/ws main/java/cc/kune/core/shared main/java/cc/kune/core/shared/dto main/java/cc/kune/core/shared/i18n main/java/org/ourproject/kune/app/server main/java/org/ourproject/kune/blogs/client main/java/org/ourproject/kune/blogs/client/cnt main/java/org/ourproject/kune/blogs/client/ctx main/java/org/ourproject/kune/blogs/server main/java/org/ourproject/kune/chat/client main/java/org/ourproject/kune/chat/client/cnt main/java/org/ourproject/kune/chat/client/ctx main/java/org/ourproject/kune/chat/client/ctx/room main/java/org/ourproject/kune/chat/server main/java/org/ourproject/kune/docs/client main/java/org/ourproject/kune/docs/client/cnt main/java/org/ourproject/kune/docs/client/ctx main/java/org/ourproject/kune/docs/server main/java/org/ourproject/kune/gallery/client main/java/org/ourproject/kune/gallery/client/cnt main/java/org/ourproject/kune/gallery/client/ctx main/java/org/ourproject/kune/gallery/server main/java/org/ourproject/kune/platf/client main/java/org/ourproject/kune/platf/client/actions main/java/org/ourproject/kune/platf/client/actions/common main/java/org/ourproject/kune/platf/client/actions/toolbar main/java/org/ourproject/kune/platf/client/actions/ui main/java/org/ourproject/kune/platf/client/app main/java/org/ourproject/kune/platf/client/errors main/java/org/ourproject/kune/platf/client/i18n main/java/org/ourproject/kune/platf/client/rpc main/java/org/ourproject/kune/platf/client/services main/java/org/ourproject/kune/platf/client/shortcuts main/java/org/ourproject/kune/platf/client/state main/java/org/ourproject/kune/platf/client/ui main/java/org/ourproject/kune/platf/client/ui/dialogs main/java/org/ourproject/kune/platf/client/ui/download main/java/org/ourproject/kune/platf/client/ui/noti main/java/org/ourproject/kune/platf/client/ui/palette main/java/org/ourproject/kune/platf/client/ui/rte/basic main/java/org/ourproject/kune/platf/client/ui/rte/edithtml main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview main/java/org/ourproject/kune/platf/client/ui/rte/insertimg main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext main/java/org/ourproject/kune/platf/client/ui/rte/insertlink main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/asian main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/occidental main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8 main/java/org/ourproject/kune/platf/client/ui/rte/inserttable main/java/org/ourproject/kune/platf/client/ui/rte/saving main/java/org/ourproject/kune/platf/server main/java/org/ourproject/kune/platf/server/access main/java/org/ourproject/kune/platf/server/auth main/java/org/ourproject/kune/platf/server/content main/java/org/ourproject/kune/platf/server/domain main/java/org/ourproject/kune/platf/server/i18n main/java/org/ourproject/kune/platf/server/init main/java/org/ourproject/kune/platf/server/manager main/java/org/ourproject/kune/platf/server/manager/file main/java/org/ourproject/kune/platf/server/manager/impl main/java/org/ourproject/kune/platf/server/mapper main/java/org/ourproject/kune/platf/server/rest main/java/org/ourproject/kune/platf/server/rpc main/java/org/ourproject/kune/platf/server/state main/java/org/ourproject/kune/platf/server/users main/java/org/ourproject/kune/platf/server/utils main/java/org/ourproject/kune/wiki/client main/java/org/ourproject/kune/wiki/client/cnt main/java/org/ourproject/kune/wiki/client/ctx main/java/org/ourproject/kune/wiki/server main/java/org/ourproject/kune/workspace/client main/java/org/ourproject/kune/workspace/client/cnt main/java/org/ourproject/kune/workspace/client/ctxnav main/java/org/ourproject/kune/workspace/client/cxt main/java/org/ourproject/kune/workspace/client/editor main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg main/java/org/ourproject/kune/workspace/client/editor/insertlocallink main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia main/java/org/ourproject/kune/workspace/client/entityheader main/java/org/ourproject/kune/workspace/client/entityheader/maxmin main/java/org/ourproject/kune/workspace/client/hello main/java/org/ourproject/kune/workspace/client/i18n main/java/org/ourproject/kune/workspace/client/licensefoot main/java/org/ourproject/kune/workspace/client/licensewizard main/java/org/ourproject/kune/workspace/client/licensewizard/pages main/java/org/ourproject/kune/workspace/client/newgroup main/java/org/ourproject/kune/workspace/client/nohomepage main/java/org/ourproject/kune/workspace/client/options main/java/org/ourproject/kune/workspace/client/options/license main/java/org/ourproject/kune/workspace/client/options/logo main/java/org/ourproject/kune/workspace/client/options/pscape main/java/org/ourproject/kune/workspace/client/options/tools main/java/org/ourproject/kune/workspace/client/rate main/java/org/ourproject/kune/workspace/client/search main/java/org/ourproject/kune/workspace/client/signin main/java/org/ourproject/kune/workspace/client/site main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch main/java/org/ourproject/kune/workspace/client/sitebar/sitesign main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu main/java/org/ourproject/kune/workspace/client/socialnet main/java/org/ourproject/kune/workspace/client/socialnet/other main/java/org/ourproject/kune/workspace/client/socialnet/toolbar main/java/org/ourproject/kune/workspace/client/tags main/java/org/ourproject/kune/workspace/client/themes main/java/org/ourproject/kune/workspace/client/title main/java/org/ourproject/kune/workspace/client/tool main/java/org/ourproject/kune/workspace/client/upload main/java/org/ourproject/kune/workspace/client/wave main/resources test/java test/java/cc test/java/cc/kune test/java/cc/kune/core test/java/cc/kune/core/client test/java/cc/kune/core/client/state test/java/org/ourproject/kune/blogs/server test/java/org/ourproject/kune/gallery/server test/java/org/ourproject/kune/platf/client test/java/org/ourproject/kune/platf/client/actions test/java/org/ourproject/kune/platf/client/dto test/java/org/ourproject/kune/platf/client/ui test/java/org/ourproject/kune/platf/client/ui/dialogs/upload test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia test/java/org/ourproject/kune/platf/client/ui/rte/saving test/java/org/ourproject/kune/platf/integration test/java/org/ourproject/kune/platf/integration/content test/java/org/ourproject/kune/platf/integration/kuneservice test/java/org/ourproject/kune/platf/integration/site test/java/org/ourproject/kune/platf/integration/socialnet test/java/org/ourproject/kune/platf/server/access test/java/org/ourproject/kune/platf/server/auth test/java/org/ourproject/kune/platf/server/manager test/java/org/ourproject/kune/platf/server/manager/file test/java/org/ourproject/kune/platf/server/manager/impl test/java/org/ourproject/kune/platf/server/mapper test/java/org/ourproject/kune/testhelper/ctx test/java/org/ourproject/kune/workspace/client/entityheader test/java/org/ourproject/kune/workspace/client/licensewizard test/java/org/ourproject/kune/workspace/client/socialnet test/java/org/ourproject/kune/workspace/client/tags test/java/org/ourproject/kune/workspace/client/tool
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Thu Dec 9 17:03:54 CET 2010
Author: vjrj_
Date: 2010-12-09 17:03:51 +0100 (Thu, 09 Dec 2010)
New Revision: 1163
Added:
trunk/src/main/java/cc/kune/core/client/actions/
trunk/src/main/java/cc/kune/core/client/actions/BeforeActionCollection.java
trunk/src/main/java/cc/kune/core/client/actions/BeforeActionListener.java
trunk/src/main/java/cc/kune/core/client/cookies/
trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java
trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java
trunk/src/main/java/cc/kune/core/client/errors/
trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java
trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java
trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java
trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java
trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java
trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java
trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java
trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java
trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java
trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java
trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java
trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java
trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java
trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java
trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java
trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java
trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java
trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java
trunk/src/main/java/cc/kune/core/client/errors/UIException.java
trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java
trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java
trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java
trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java
trunk/src/main/java/cc/kune/core/client/i18n/
trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java
trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java
trunk/src/main/java/cc/kune/core/client/notify/
trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java
trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java
trunk/src/main/java/cc/kune/core/client/rpcservices/
trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java
trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java
trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java
trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java
trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java
trunk/src/main/java/cc/kune/core/client/rpcservices/I18nService.java
trunk/src/main/java/cc/kune/core/client/rpcservices/I18nServiceAsync.java
trunk/src/main/java/cc/kune/core/client/rpcservices/SiteService.java
trunk/src/main/java/cc/kune/core/client/rpcservices/SiteServiceAsync.java
trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java
trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java
trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java
trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java
trunk/src/main/java/cc/kune/core/client/state/
trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java
trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java
trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java
trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java
trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java
trunk/src/main/java/cc/kune/core/client/state/Session.java
trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java
trunk/src/main/java/cc/kune/core/client/state/StateManager.java
trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java
trunk/src/main/java/cc/kune/core/client/utils/
trunk/src/main/java/cc/kune/core/client/utils/Location.java
trunk/src/main/java/cc/kune/core/client/utils/TextUtils.java
trunk/src/main/java/cc/kune/core/client/utils/WindowUtils.java
trunk/src/main/java/cc/kune/core/shared/
trunk/src/main/java/cc/kune/core/shared/dto/
trunk/src/main/java/cc/kune/core/shared/dto/SubscriptionMode.java
trunk/src/main/java/cc/kune/core/shared/i18n/
trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java
trunk/src/test/java/cc/
trunk/src/test/java/cc/kune/
trunk/src/test/java/cc/kune/core/
trunk/src/test/java/cc/kune/core/client/
trunk/src/test/java/cc/kune/core/client/state/
Removed:
trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionCollection.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionListener.java
trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapper.java
trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapperDefault.java
trunk/src/main/java/org/ourproject/kune/platf/client/dto/
trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyGroupMemberException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyUserMemberException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContainerNotPermittedException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotFoundException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotPermittedException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/DefaultException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/EmailAddressInUseException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNameInUseException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNotFoundException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/I18nNotFoundException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameInUseException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameNotPermittedException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/SessionExpiredException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/UIException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/UnknownPropertyException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserAuthException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserMustBeLoggedException.java
trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserNotFoundException.java
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/rpc/AsyncCallbackSimple.java
trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java
trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java
trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java
trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java
trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nService.java
trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nServiceAsync.java
trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteService.java
trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteServiceAsync.java
trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java
trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkServiceAsync.java
trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserService.java
trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserServiceAsync.java
trunk/src/main/java/org/ourproject/kune/platf/client/services/ErrorHandler.java
trunk/src/main/java/org/ourproject/kune/platf/client/state/AccessRightsClientManager.java
trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProvider.java
trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java
trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java
trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java
trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java
trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/TextUtils.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java
trunk/src/test/java/org/ourproject/kune/platf/client/state/
Modified:
trunk/src/main/java/cc/kune/core/Core.gwt.xml
trunk/src/main/java/cc/kune/core/client/CoreEventBus.java
trunk/src/main/java/cc/kune/core/client/CoreGinModule.java
trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java
trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java
trunk/src/main/java/cc/kune/core/shared/dto/AccessListsDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/AccessRolDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/AdmissionTypeDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/BasicMimeTypeDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/ChatUserParamsDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/CommentDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/ContainerSimpleDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/ContentStatusDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/ExtMediaDescripDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/GroupType.java
trunk/src/main/java/cc/kune/core/shared/dto/I18nCountryDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageSimpleDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/I18nTranslationDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/LicenseDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/LinkDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/ParticipationDataDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/RateResultDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/RoomDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/SearchResultDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkRequestResult.java
trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkVisibilityDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/StateAbstractDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/StateNoContentDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java
trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java
trunk/src/main/java/cc/kune/core/shared/dto/TagCloudResultDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/TagCountDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/TagDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/TimeZoneDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/ToolSimpleDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesDataDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesVisibilityDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/UserDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/UserInfoDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java
trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java
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/client/ctx/BlogContextPresenter.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/ChatContextPresenter.java
trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java
trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPresenter.java
trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.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/client/ctx/DocumentContextPresenter.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/GalleryFolderContentView.java
trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java
trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java
trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java
trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionItem.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonAndItemDescriptor.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuAndItemDescriptor.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuCheckItemDescriptor.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuDescriptor.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuRadioDescriptor.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarPushButtonDescriptor.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/common/GotoGroupAction.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComposedGuiItem.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemBinding.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuSeparatorBinding.java
trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java
trunk/src/main/java/org/ourproject/kune/platf/client/i18n/Resources.java
trunk/src/main/java/org/ourproject/kune/platf/client/services/CoreModule.java
trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java
trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.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/palette/SimplePalettePanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/asian/InsertSpecialAsianCharPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/occidental/InsertSpecialOccCharPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/inserttable/InsertTableDialogPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditor.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java
trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java
trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java
trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java
trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptor.java
trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java
trunk/src/main/java/org/ourproject/kune/platf/server/auth/SessionServiceDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManager.java
trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManagerDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java
trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java
trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentUtils.java
trunk/src/main/java/org/ourproject/kune/platf/server/domain/ChatUserParams.java
trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java
trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java
trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java
trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasStateToken.java
trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java
trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.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/manager/file/FileUtils.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertiesManagerDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java
trunk/src/main/java/org/ourproject/kune/platf/server/mapper/Mapper.java
trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java
trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java
trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java
trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java
trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java
trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java
trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java
trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java
trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java
trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java
trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java
trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoService.java
trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/utils/FilenameUtils.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/client/ctx/WikiContextPresenter.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/ActionsModule.java
trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentIconsRegistry.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/ContextNavigatorItem.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/ctxnav/ContextNavigatorView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AccessListsPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextBottomToolbar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextTopToolbar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextActionRegistry.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditor.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/FoldableContextPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.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/LanguageSelector.java
trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java
trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicenseView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java
trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java
trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.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/nohomepage/NoHomePagePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicenseView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/GroupOptionsPublicSpaceConfPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/UserOptionsPublicSpaceConfPresenter.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/options/tools/EntityOptionsToolsConfView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.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/rate/RatePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java
trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcher.java
trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPresenter.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/SiteSearcherPresenter.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/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/site/WorkspaceNotifyUser.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPresenter.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/siteoptions/SiteOptionsPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLink.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.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/SiteSignInLinkPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLink.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.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/BuddiesSummaryView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummary.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/GroupMembersSummaryView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.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/ParticipationSummaryView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UserActionRegistry.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbarPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbarPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationSummaryToolbarPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationToolbar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummary.java
trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java
trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java
trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java
trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java
trunk/src/main/java/org/ourproject/kune/workspace/client/tool/FoldableAbstractClientTool.java
trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenter.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/wave/WaveInsert.java
trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPresenter.java
trunk/src/main/resources/dozerBeanMapping.xml
trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java
trunk/src/test/java/cc/kune/core/client/state/StateTokenTest.java
trunk/src/test/java/org/ourproject/kune/blogs/server/BlogServerToolTest.java
trunk/src/test/java/org/ourproject/kune/gallery/server/GalleryServerToolTest.java
trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java
trunk/src/test/java/org/ourproject/kune/platf/client/actions/ContentIconsRegistryTest.java
trunk/src/test/java/org/ourproject/kune/platf/client/actions/KeyStrokeTest.java
trunk/src/test/java/org/ourproject/kune/platf/client/actions/ShortcutTest.java
trunk/src/test/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTOTest.java
trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java
trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java
trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java
trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java
trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenterTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceSaveTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptorTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManagerTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java
trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java
trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java
trunk/src/test/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenterTest.java
trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java
trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java
trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java
trunk/src/test/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenterTest.java
Log:
CLOSED - # 6: Common Actions integration
http://kune.ourproject.org/issues/ticket/6
Incomplete - task : Startup cleanup
Modified: trunk/src/main/java/cc/kune/core/Core.gwt.xml
===================================================================
--- trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-09 16:03:51 UTC (rev 1163)
@@ -6,13 +6,15 @@
see http://code.google.com/p/google-web-toolkit/issues/detail?id=4454 -->
<source path='client'
excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" />
+ <source path="shared" />
<public path="public" />
<!-- Dependencies ============================================= -->
<inherits name="com.google.gwt.user.User" />
- <inherits name='com.mvp4g.Mvp4gModule' />
+ <inherits name='com.mvp4g.Mvp4gModule' />
<inherits name="org.ourproject.kune.ws.armor.WsArmor" />
<inherits name="org.ourproject.common.Common" />
<inherits name="com.extjs.gxt.ui.GXT" />
+ <inherits name="com.calclab.suco.Suco" />
<!-- Styles =================================================== -->
<stylesheet src="ws.css" />
<stylesheet src="fontface/stylesheet.css" />
Modified: trunk/src/main/java/cc/kune/core/client/CoreEventBus.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,11 +1,16 @@
package cc.kune.core.client;
import org.ourproject.common.client.CommonGinModule;
+import org.ourproject.common.client.notify.ConfirmationAsk;
+import org.ourproject.common.client.notify.NotifyLevel;
+import cc.kune.core.client.cookies.CookiesManager;
+import cc.kune.core.client.notify.UserNotifierPresenter;
import cc.kune.core.client.ws.CorePresenter;
import cc.kune.core.client.ws.CoreView;
import com.mvp4g.client.annotation.Debug;
+import com.mvp4g.client.annotation.Debug.LogLevel;
import com.mvp4g.client.annotation.Event;
import com.mvp4g.client.annotation.Events;
import com.mvp4g.client.annotation.Start;
@@ -15,14 +20,44 @@
* The Kune Core EventBus.
*/
@Events(startView = CoreView.class, ginModules = { CoreGinModule.class, CommonGinModule.class })
- at Debug
+ at Debug(logLevel = LogLevel.DETAILED)
public interface CoreEventBus extends EventBus {
+ @Event(handlers = UserNotifierPresenter.class)
+ public void alert(String title, String message);
+
+ @Event(handlers = UserNotifierPresenter.class)
+ public void confirmationAsk(ConfirmationAsk<?> confirmation);
+
+ @Event(handlers = CookiesManager.class)
+ public void doNothing();
+
+ @Event
+ // FIXME (nobody do nothing with this)
+ public void gotoToken(String token);
+
+ @Event(handlers = UserNotifierPresenter.class)
+ public void hideSpin();
+
+ @Event
+ // FIXME (nobody do nothing with this)
+ public void i18nReady();
+
+ @Event(handlers = UserNotifierPresenter.class)
+ public void notify(NotifyLevel level, String message);
+
+ @Event(handlers = UserNotifierPresenter.class)
+ public void showSpin(String message);
+
+ @Event
+ // FIXME (nobody do nothing with this)
+ public void showSpinLoading();
+
/**
* Application start event
*/
@Start
- @Event(handlers = CorePresenter.class)
+ @Event(handlers = { CorePresenter.class })
void start();
}
Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -3,6 +3,15 @@
import org.ourproject.kune.ws.armor.client.Body;
import org.ourproject.kune.ws.armor.client.IBody;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.state.ContentProvider;
+import cc.kune.core.client.state.ContentProviderDefault;
+import cc.kune.core.client.state.HistoryWrapper;
+import cc.kune.core.client.state.HistoryWrapperDefault;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.SessionDefault;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.inject.client.AbstractGinModule;
import com.google.inject.Singleton;
@@ -19,6 +28,12 @@
@Override
protected void configure() {
bind(IBody.class).to(Body.class).in(Singleton.class);
+ bind(Session.class).to(SessionDefault.class).in(Singleton.class);
+ bind(I18nTranslationService.class).to(I18nUITranslationService.class).in(Singleton.class);
+ // bind(ErrorHandler.class).in(Singleton.class);
+ bind(ContentProvider.class).to(ContentProviderDefault.class).in(Singleton.class);
+ bind(HistoryWrapper.class).to(HistoryWrapperDefault.class).in(Singleton.class);
+ // bind(StateManager.class).to(StateManagerDefault.class).in(Singleton.class);
}
}
Modified: trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -2,10 +2,16 @@
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.core.client.GWT.UncaughtExceptionHandler;
+import com.google.gwt.core.client.Scheduler;
+import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.user.client.ui.RootLayoutPanel;
import com.google.gwt.user.client.ui.Widget;
import com.mvp4g.client.Mvp4gModule;
+/**
+ * The Class KuneEntryPoint.
+ */
public class KuneEntryPoint implements EntryPoint {
/*
@@ -13,8 +19,26 @@
*
* @see com.google.gwt.core.client.EntryPoint#onModuleLoad()
*/
- @Override
public void onModuleLoad() {
+ GWT.setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
+ @Override
+ public void onUncaughtException(final Throwable e) {
+ GWT.log("Error in 'onModuleLoad()' method", e);
+ e.printStackTrace();
+ }
+ });
+
+ Scheduler.get().scheduleDeferred(new ScheduledCommand() {
+ public void execute() {
+ onModuleLoadCont();
+ }
+ });
+ }
+
+ /**
+ * On module load cont.
+ */
+ public void onModuleLoadCont() {
final Mvp4gModule module = (Mvp4gModule) GWT.create(Mvp4gModule.class);
module.createAndStartModule();
RootLayoutPanel.get().add((Widget) module.getStartView());
Copied: trunk/src/main/java/cc/kune/core/client/actions/BeforeActionCollection.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionCollection.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/actions/BeforeActionCollection.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/actions/BeforeActionCollection.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,45 @@
+/*
+ *
+ * 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 cc.kune.core.client.actions;
+
+import java.util.ArrayList;
+
+/**
+ * The Class BeforeActionCollection.
+ */
+public class BeforeActionCollection extends ArrayList<BeforeActionListener> {
+
+ private static final long serialVersionUID = -1508664709628420137L;
+
+ /**
+ * Check before action listeners.
+ *
+ * @return true, if all listener returns true
+ */
+ public boolean checkBeforeAction() {
+ for (BeforeActionListener listener : this) {
+ if (!listener.beforeAction()) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+}
Property changes on: trunk/src/main/java/cc/kune/core/client/actions/BeforeActionCollection.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/src/main/java/cc/kune/core/client/actions/BeforeActionListener.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionListener.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/actions/BeforeActionListener.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/actions/BeforeActionListener.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,31 @@
+/*
+ *
+ * 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 cc.kune.core.client.actions;
+
+public interface BeforeActionListener {
+
+ /**
+ * Return false to cancel the action
+ *
+ * @return
+ */
+ boolean beforeAction();
+
+}
Property changes on: trunk/src/main/java/cc/kune/core/client/actions/BeforeActionListener.java
___________________________________________________________________
Name: svn:mergeinfo
+
Added: trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,30 @@
+package cc.kune.core.client.cookies;
+
+import cc.kune.core.client.CoreEventBus;
+import cc.kune.core.client.cookies.CookiesManager.ICookiesView;
+import cc.kune.core.client.state.Session;
+
+import com.google.gwt.user.client.Cookies;
+import com.google.inject.Inject;
+import com.mvp4g.client.annotation.Presenter;
+import com.mvp4g.client.presenter.BasePresenter;
+
+ at Presenter(view = CookiesView.class)
+public class CookiesManager extends BasePresenter<ICookiesView, CoreEventBus> {
+ public interface ICookiesView {
+ String getCurrentCookie();
+ }
+
+ @Inject
+ public CookiesManager() {
+ }
+
+ public String getCurrentCookie() {
+ return Cookies.getCookie(Session.USERHASH);
+ // view.getCurrentCookie();
+ }
+
+ public void onDoNothing() {
+ }
+
+}
Property changes on: trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,19 @@
+package cc.kune.core.client.cookies;
+
+import cc.kune.core.client.cookies.CookiesManager.ICookiesView;
+import cc.kune.core.client.state.Session;
+
+import com.google.gwt.user.client.Cookies;
+import com.google.inject.Inject;
+
+public class CookiesView implements ICookiesView {
+
+ @Inject
+ public CookiesView() {
+ }
+
+ public String getCurrentCookie() {
+ return Cookies.getCookie(Session.USERHASH);
+ }
+
+}
Property changes on: trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class AccessViolationException extends DefaultException {
+ private static final long serialVersionUID = -3786772632052256999L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyGroupMemberException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class AlreadyGroupMemberException extends DefaultException {
+ private static final long serialVersionUID = 6663958867752546481L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyUserMemberException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class AlreadyUserMemberException extends DefaultException {
+ private static final long serialVersionUID = -6365615768192330492L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContainerNotPermittedException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class ContainerNotPermittedException extends DefaultException {
+ private static final long serialVersionUID = 6866318170714609691L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotFoundException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class ContentNotFoundException extends DefaultException {
+ private static final long serialVersionUID = -4641212341448422627L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotPermittedException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class ContentNotPermittedException extends DefaultException {
+ private static final long serialVersionUID = 4771568826852748873L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/DefaultException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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 cc.kune.core.client.errors;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+import com.google.gwt.user.client.rpc.StatusCodeException;
+
+public class DefaultException extends StatusCodeException implements IsSerializable {
+
+ private static final long serialVersionUID = -6111471089427505005L;
+
+ public DefaultException() {
+ this(0, "");
+ }
+
+ public DefaultException(final int statusCode, final String message) {
+ super(statusCode, message);
+ }
+
+ public DefaultException(final String message) {
+ this(0, message);
+ }
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/EmailAddressInUseException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class EmailAddressInUseException extends DefaultException {
+ private static final long serialVersionUID = 3740509040361715407L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/services/ErrorHandler.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,121 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+import org.ourproject.common.client.notify.NotifyLevel;
+
+import cc.kune.core.client.CoreEventBus;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.calclab.suco.client.events.Event0;
+import com.calclab.suco.client.events.Listener0;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException;
+import com.google.inject.Inject;
+import com.mvp4g.client.event.BaseEventHandler;
+
+public class ErrorHandler extends BaseEventHandler<CoreEventBus> {
+ private final Session session;
+ private final I18nTranslationService i18n;
+ private final Event0 onSessionExpired;
+
+ @Inject
+ public ErrorHandler(final Session session, final I18nTranslationService i18n) {
+ this.session = session;
+ this.i18n = i18n;
+ this.onSessionExpired = new Event0("onSessionExpired");
+ }
+
+ public void doSessionExpired() {
+ onSessionExpired.fire();
+ eventBus.notify(NotifyLevel.info, "Your session has expired. Please log in again.");
+ }
+
+ public void onSessionExpired(final Listener0 listener) {
+ onSessionExpired.add(listener);
+ }
+
+ public void process(final Throwable caught) {
+ eventBus.hideSpin();
+ if (caught instanceof AccessViolationException) {
+ logException(caught);
+ eventBus.notify(NotifyLevel.error, i18n.t("You do not have rights to perform that action"));
+ } else if (caught instanceof SessionExpiredException) {
+ logException(caught);
+ doSessionExpired();
+ } else if (caught instanceof UserMustBeLoggedException) {
+ logException(caught);
+ if (session.isLogged()) {
+ doSessionExpired();
+ } else {
+ eventBus.notify(NotifyLevel.important, i18n.t("Please sign in or register to collaborate"));
+ }
+ } else if (caught instanceof GroupNotFoundException) {
+ logException(caught);
+
+ eventBus.notify(NotifyLevel.veryImportant, i18n.t("Group not found"));
+ eventBus.gotoToken("");
+ } else if (caught instanceof IncompatibleRemoteServiceException) {
+ eventBus.notify(NotifyLevel.error,
+ i18n.t("Your browser is outdated with the server software. Please reload this page."));
+ } else if (caught instanceof ContentNotFoundException) {
+ logException(caught);
+ eventBus.notify(NotifyLevel.veryImportant, i18n.t("Content not found"));
+ eventBus.gotoToken("");
+ } else if (caught instanceof ContentNotPermittedException) {
+ logException(caught);
+ eventBus.notify(NotifyLevel.error, i18n.t("Action not permitted in this location"));
+ eventBus.gotoToken("");
+ } else if (caught instanceof ContainerNotPermittedException) {
+ logException(caught);
+ eventBus.notify(NotifyLevel.error, i18n.t("Action not permitted in this location"));
+ eventBus.gotoToken("");
+ } else if (caught instanceof LastAdminInGroupException) {
+ logException(caught);
+ eventBus.alert(i18n.t("Warning"), i18n.t("Sorry, you are the last admin of this group."
+ + " Look for someone to substitute you appropriately as admin before leaving this group."));
+ } else if (caught instanceof AlreadyGroupMemberException) {
+ logException(caught);
+ eventBus.notify(NotifyLevel.error, i18n.t("This group is already a group member"));
+ } else if (caught instanceof AlreadyUserMemberException) {
+ logException(caught);
+ eventBus.notify(NotifyLevel.error, i18n.t("This user is already a group member"));
+ } else {
+ logException(caught, true);
+ eventBus.notify(NotifyLevel.error, i18n.t("Error performing operation"));
+ GWT.log("Other kind of exception in StateManagerDefault/processErrorException", caught);
+ }
+ }
+
+ private void logException(final Throwable caught) {
+ logException(caught, false);
+ }
+
+ private void logException(final Throwable caught, final boolean showException) {
+ if (showException) {
+ Log.debug("Exception in KuneErrorHandler", caught);
+ } else {
+ Log.debug("Exception in KuneErrorHandler: " + caught.getMessage());
+ }
+ }
+
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNameInUseException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class GroupNameInUseException extends DefaultException {
+ private static final long serialVersionUID = -4746775725822225687L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNotFoundException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class GroupNotFoundException extends DefaultException {
+ private static final long serialVersionUID = 2358855015943550817L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/I18nNotFoundException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class I18nNotFoundException extends DefaultException {
+ private static final long serialVersionUID = -2400899465805236215L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class LastAdminInGroupException extends DefaultException {
+ private static final long serialVersionUID = -8727443733339361388L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameInUseException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class NameInUseException extends DefaultException {
+ private static final long serialVersionUID = 4890594846432830537L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameNotPermittedException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class NameNotPermittedException extends DefaultException {
+ private static final long serialVersionUID = -8022844560909422614L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class NoDefaultContentException extends DefaultException {
+ private static final long serialVersionUID = 7443824340580555859L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/SessionExpiredException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class SessionExpiredException extends DefaultException {
+ private static final long serialVersionUID = -1603881986661302041L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class ToolNotFoundException extends DefaultException {
+ private static final long serialVersionUID = 472511647264356558L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/UIException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/UIException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/UIException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/UIException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,43 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+import com.allen_sauer.gwt.log.client.Log;
+
+public class UIException extends RuntimeException {
+
+ private static final long serialVersionUID = -1327164226202923181L;
+
+ public UIException(final String text) {
+ super(text);
+ Log.error(text);
+ }
+
+ public UIException(final String text, final Throwable cause) {
+ super(text, cause);
+ Log.error(text, cause);
+ }
+
+ public UIException(final Throwable cause) {
+ super(cause);
+ Log.error("UIException", cause);
+ }
+
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/UnknownPropertyException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,28 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class UnknownPropertyException extends DefaultException {
+ private static final long serialVersionUID = -5921396887476497824L;
+
+ public UnknownPropertyException(final String message) {
+ super(message);
+ }
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserAuthException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class UserAuthException extends DefaultException {
+ private static final long serialVersionUID = -8383513776573054971L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserMustBeLoggedException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class UserMustBeLoggedException extends DefaultException {
+ private static final long serialVersionUID = -5091069990899662849L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserNotFoundException.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,24 @@
+/*
+ *
+ * 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 cc.kune.core.client.errors;
+
+public class UserNotFoundException extends DefaultException {
+ private static final long serialVersionUID = 6207713694613166661L;
+}
Copied: trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationServiceMocked.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,31 @@
+/*
+ *
+ * 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 cc.kune.core.client.i18n;
+
+import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
+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/cc/kune/core/client/i18n/I18nUITranslationService.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,215 @@
+/*
+ *
+ * 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 cc.kune.core.client.i18n;
+
+import java.util.Date;
+import java.util.HashMap;
+
+import cc.kune.core.client.rpcservices.I18nServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.utils.Location;
+import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.client.utils.WindowUtils;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
+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;
+import com.google.inject.Inject;
+
+public class I18nUITranslationService extends I18nTranslationService {
+ private HashMap<String, String> lexicon;
+ private String currentLanguageCode;
+ private I18nLanguageDTO currentLang;
+ private final I18nServiceAsync i18nService;
+ private final Session session;
+
+ @Inject
+ public I18nUITranslationService(final Session session, final I18nServiceAsync i18nService) {
+ this.session = session;
+ this.i18nService = i18nService;
+ 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: " + caught.getMessage());
+ }
+
+ 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:" + caught.getMessage());
+ }
+
+ public void onSuccess(final HashMap<String, String> result) {
+ lexicon = result;
+ session.setCurrentLanguage(currentLang);
+ }
+ });
+ }
+ });
+ }
+
+ public void changeCurrentLanguage(final String newLanguage) {
+ if (!newLanguage.equals(this.currentLanguageCode)) {
+ setCurrentLanguage(newLanguage);
+ changeLocale(newLanguage);
+ }
+ }
+
+ public String formatDateWithLocale(final Date date) {
+ return formatDateWithLocale(date, false);
+ }
+
+ public String formatDateWithLocale(final Date date, final boolean shortFormat) {
+ String dateFormat = shortFormat ? currentLang.getDateFormatShort() : currentLang.getDateFormat();
+
+ final DateTimeFormat fmt;
+ if (dateFormat == null) {
+ fmt = DateTimeFormat.getFormat("M/d/yyyy h:mm a");
+ } else {
+ if (shortFormat) {
+ fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a");
+ } else {
+ final String abrevMonthInEnglish = DateTimeFormat.getFormat("MMM").format(date);
+ final String monthToTranslate = abrevMonthInEnglish + " [%NT abbreviated month]";
+ dateFormat = dateFormat.replaceFirst("MMM", "'" + t(monthToTranslate) + "'");
+ fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a");
+ }
+ }
+ final 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) {
+
+ }
+
+ public void setCurrentLanguage(final String newLanguage) {
+ this.currentLanguageCode = newLanguage;
+ }
+
+ public void setLexicon(final HashMap<String, String> lexicon) {
+ this.lexicon = lexicon;
+ }
+
+ public void setTranslationAfterSave(final String text, final String translation) {
+ lexicon.put(text, translation);
+ }
+
+ /**
+ * 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);
+ }-*/;
+
+}
Added: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,47 @@
+package cc.kune.core.client.notify;
+
+import org.ourproject.common.client.notify.ConfirmationAsk;
+import org.ourproject.common.client.notify.NotifyLevel;
+
+import cc.kune.core.client.CoreEventBus;
+import cc.kune.core.client.notify.UserNotifierPresenter.IUserNotifierView;
+
+import com.mvp4g.client.annotation.Presenter;
+import com.mvp4g.client.presenter.LazyPresenter;
+import com.mvp4g.client.view.LazyView;
+
+ at Presenter(view = UserNotifierView.class)
+public class UserNotifierPresenter extends LazyPresenter<IUserNotifierView, CoreEventBus> {
+
+ public interface IUserNotifierView extends LazyView {
+ public void alert(String title, String message);
+
+ public void confirmationAsk(ConfirmationAsk<?> ask);
+
+ public void hideSpin();
+
+ public void notify(NotifyLevel level, String message);
+
+ public void showSpin(String message);
+ }
+
+ public void onAlert(final String title, final String message) {
+ view.alert(title, message);
+ }
+
+ public void onConfirmationAsk(final ConfirmationAsk<?> ask) {
+ view.confirmationAsk(ask);
+ };
+
+ public void onHideSpin() {
+ view.hideSpin();
+ }
+
+ public void onNotify(final NotifyLevel level, final String message) {
+ view.notify(level, message);
+ }
+
+ public void onShowSpin(final String message) {
+ view.showSpin(message);
+ }
+}
\ No newline at end of file
Property changes on: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,49 @@
+package cc.kune.core.client.notify;
+
+import org.ourproject.common.client.notify.ConfirmationAsk;
+import org.ourproject.common.client.notify.NotifyLevel;
+
+import cc.kune.core.client.notify.UserNotifierPresenter.IUserNotifierView;
+
+import com.google.gwt.user.client.Window;
+
+public class UserNotifierView implements IUserNotifierView {
+
+ @Override
+ public void alert(final String title, final String message) {
+ message(title, message);
+ }
+
+ @Override
+ public void confirmationAsk(final ConfirmationAsk<?> ask) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void createView() {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ public void hideSpin() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void notify(final NotifyLevel level, final String message) {
+ message("", message);
+ }
+
+ @Override
+ public void showSpin(final String message) {
+ // TODO Auto-generated method stub
+
+ }
+
+ private void message(final String title, final String message) {
+ Window.alert(title + " " + message);
+ }
+
+}
Property changes on: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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 cc.kune.core.client.rpcservices;
+
+import cc.kune.core.client.errors.ErrorHandler;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.inject.Inject;
+
+public abstract class AsyncCallbackSimple<T> implements AsyncCallback<T> {
+
+ @Inject
+ private ErrorHandler errorHandler;
+
+ public void onFailure(final Throwable caught) {
+ errorHandler.process(caught);
+ }
+
+}
Added: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,90 @@
+/*
+ *
+ * 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 cc.kune.core.client.rpcservices;
+
+import java.util.Date;
+
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.shared.dto.CommentDTO;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.ContentStatusDTO;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+import cc.kune.core.shared.dto.RateResultDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.TagCloudResultDTO;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+
+ at RemoteServiceRelativePath("ContentService")
+public interface ContentService extends RemoteService {
+
+ void addAuthor(String userHash, StateToken token, String authorShortName) throws DefaultException;
+
+ CommentDTO addComment(String userHash, StateToken token, Long parentCommentId, String commentText)
+ throws DefaultException;
+
+ CommentDTO addComment(String userHash, StateToken token, String commentText) throws DefaultException;
+
+ StateContentDTO addContent(String user, StateToken parentToken, String name, String typeId) throws DefaultException;
+
+ StateContainerDTO addFolder(String hash, StateToken parentToken, String typeId, String title)
+ throws DefaultException;
+
+ StateContainerDTO addRoom(String user, StateToken parentToken, String name) throws DefaultException;
+
+ StateContentDTO addWave(String userHash, StateToken parentToken, String waveFileType, String waveId);
+
+ StateContentDTO delContent(String userHash, StateToken token) throws DefaultException;
+
+ StateAbstractDTO getContent(String userHash, StateToken token) throws DefaultException;
+
+ TagCloudResultDTO getSummaryTags(String userHash, StateToken groupToken) throws DefaultException;
+
+ CommentDTO markCommentAsAbuse(String userHash, StateToken token, Long commentId) throws DefaultException;
+
+ RateResultDTO rateContent(String userHash, StateToken token, Double value) throws DefaultException;
+
+ void removeAuthor(String userHash, StateToken token, String authorShortName) throws DefaultException;
+
+ StateAbstractDTO renameContainer(String userHash, StateToken token, String newName) throws DefaultException;
+
+ StateAbstractDTO renameContent(String userHash, StateToken token, String newName) throws DefaultException;
+
+ void save(String user, StateToken token, String content) throws DefaultException;
+
+ ContentSimpleDTO setAsDefaultContent(String userHash, StateToken token);
+
+ I18nLanguageDTO setLanguage(String userHash, StateToken token, String languageCode) throws DefaultException;
+
+ void setPublishedOn(String userHash, StateToken token, Date date) throws DefaultException;
+
+ StateAbstractDTO setStatus(String userHash, StateToken stateToken, ContentStatusDTO status);
+
+ StateAbstractDTO setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status);
+
+ TagCloudResultDTO setTags(String userHash, StateToken token, String tags) throws DefaultException;
+
+ CommentDTO voteComment(String userHash, StateToken token, Long commentId, boolean votePositive)
+ throws DefaultException;
+}
Added: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,94 @@
+/*
+ *
+ * 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 cc.kune.core.client.rpcservices;
+
+import java.util.Date;
+
+
+import cc.kune.core.shared.dto.CommentDTO;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.ContentStatusDTO;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+import cc.kune.core.shared.dto.RateResultDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.TagCloudResultDTO;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+public interface ContentServiceAsync {
+
+ void addAuthor(String userHash, StateToken token, String authorShortName, AsyncCallback<Void> asyncCallback);
+
+ void addComment(String userHash, StateToken token, Long parentCommentId, String commentText,
+ AsyncCallback<CommentDTO> asyncCallback);
+
+ void addComment(String userHash, StateToken token, String commentText, AsyncCallback<CommentDTO> asyncCallback);
+
+ void addContent(String user, StateToken parentToken, String name, String typeId,
+ AsyncCallback<StateContentDTO> callback);
+
+ void addFolder(String hash, StateToken parentToken, String title, String typeId,
+ AsyncCallback<StateContainerDTO> callback);
+
+ void addRoom(String user, StateToken parentToken, String name, AsyncCallback<StateContainerDTO> callback);
+
+ void addWave(String userHash, StateToken parentToken, String waveFileType, String waveId,
+ AsyncCallback<StateContentDTO> asyncCallbackSimple);
+
+ void delContent(String userHash, StateToken token, AsyncCallback<StateContentDTO> asyncCallback);
+
+ void getContent(String user, StateToken newState, AsyncCallback<StateAbstractDTO> callback);
+
+ void getSummaryTags(String userHash, StateToken groupToken, AsyncCallback<TagCloudResultDTO> asyncCallback);
+
+ void markCommentAsAbuse(String userHash, StateToken token, Long commentId, AsyncCallback<CommentDTO> asyncCallback);
+
+ void rateContent(String userHash, StateToken token, Double value, AsyncCallback<RateResultDTO> asyncCallback);
+
+ void removeAuthor(String userHash, StateToken token, String authorShortName, AsyncCallback<Void> asyncCallback);
+
+ void renameContainer(String userHash, StateToken token, String newName,
+ AsyncCallback<StateAbstractDTO> asyncCallback);
+
+ void renameContent(String userHash, StateToken token, String newName, AsyncCallback<StateAbstractDTO> asyncCallback);
+
+ void save(String user, StateToken token, String content, AsyncCallback<Void> asyncCallback);
+
+ void setAsDefaultContent(String userHash, StateToken token, AsyncCallback<ContentSimpleDTO> asyncCallback);
+
+ void setLanguage(String userHash, StateToken token, String languageCode,
+ AsyncCallback<I18nLanguageDTO> asyncCallback);
+
+ void setPublishedOn(String userHash, StateToken token, Date publishedOn, AsyncCallback<Void> asyncCallback);
+
+ void setStatus(String userHash, StateToken stateToken, ContentStatusDTO status,
+ AsyncCallback<StateAbstractDTO> asyncCallback);
+
+ void setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status,
+ AsyncCallback<StateAbstractDTO> asyncCallback);
+
+ void setTags(String userHash, StateToken token, String tags, AsyncCallback<TagCloudResultDTO> asyncCallback);
+
+ void voteComment(String userHash, StateToken token, Long commentId, boolean votePositive,
+ AsyncCallback<CommentDTO> asyncCallback);
+}
Added: trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,54 @@
+/*
+ *
+ * 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 cc.kune.core.client.rpcservices;
+
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.shared.dto.AdmissionTypeDTO;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO;
+import cc.kune.core.shared.dto.StateToken;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+
+ at RemoteServiceRelativePath("GroupService")
+public interface GroupService extends RemoteService {
+
+ void changeDefLicense(final String userHash, final StateToken groupToken, final LicenseDTO license);
+
+ void changeGroupWsTheme(String userHash, StateToken groupToken, String theme) throws DefaultException;
+
+ GroupDTO clearGroupBackImage(String userHash, StateToken token);
+
+ StateToken createNewGroup(String userHash, GroupDTO group, String publicDesc, String tags, String[] enabledTools)
+ throws DefaultException;
+
+ GroupDTO getGroup(String userHash, StateToken token);
+
+ GroupDTO setGroupBackImage(String userHash, StateToken token);
+
+ void setGroupNewMembersJoiningPolicy(String userHash, StateToken groupToken, AdmissionTypeDTO admissionPolicy);
+
+ void setSocialNetworkVisibility(String userHash, StateToken groupToken, SocialNetworkVisibilityDTO visibility);
+
+ void setToolEnabled(String userHash, StateToken groupToken, String toolName, boolean enabled);
+
+}
Added: trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,56 @@
+/*
+ *
+ * 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 cc.kune.core.client.rpcservices;
+
+
+import cc.kune.core.shared.dto.AdmissionTypeDTO;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO;
+import cc.kune.core.shared.dto.StateToken;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+public interface GroupServiceAsync {
+
+ void changeDefLicense(final String userHash, final StateToken groupToken, final LicenseDTO license,
+ AsyncCallback<Void> asyncCallback);
+
+ void changeGroupWsTheme(String userHash, StateToken groupToken, String theme, AsyncCallback<Void> callback);
+
+ void clearGroupBackImage(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback);
+
+ void createNewGroup(String userHash, GroupDTO group, String publicDesc, String tags, String[] enabledTools,
+ AsyncCallback<StateToken> callback);
+
+ void getGroup(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback);
+
+ void setGroupBackImage(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback);
+
+ void setGroupNewMembersJoiningPolicy(String userHash, StateToken groupToken, AdmissionTypeDTO admissionPolicy,
+ AsyncCallback<Void> asyncCallback);
+
+ void setSocialNetworkVisibility(String userHash, StateToken token, SocialNetworkVisibilityDTO visibility,
+ AsyncCallback<Void> asyncCallback);
+
+ void setToolEnabled(String userHash, StateToken groupToken, String toolName, boolean enabled,
+ AsyncCallback<Void> asyncCallback);
+
+}
Added: trunk/src/main/java/cc/kune/core/client/rpcservices/I18nService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/I18nService.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/I18nService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,41 @@
+/*
+ *
+ * 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 cc.kune.core.client.rpcservices;
+
+import java.util.HashMap;
+
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+
+ at RemoteServiceRelativePath("I18nService")
+public interface I18nService extends RemoteService {
+
+ I18nLanguageDTO getInitialLanguage(String localeParam);
+
+ HashMap<String, String> getLexicon(String language);
+
+ String getTranslation(String userHash, String language, String text);
+
+ String setTranslation(String userHash, String id, String translation) throws DefaultException;
+
+}
Added: trunk/src/main/java/cc/kune/core/client/rpcservices/I18nServiceAsync.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/I18nServiceAsync.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/I18nServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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 cc.kune.core.client.rpcservices;
+
+import java.util.HashMap;
+
+
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+public interface I18nServiceAsync {
+
+ void getLexicon(String language, AsyncCallback<HashMap<String, String>> callback);
+
+ void getTranslation(String userHash, String language, String text, AsyncCallback<String> callback);
+
+ void setTranslation(String userHash, String id, String translation, AsyncCallback<String> asyncCallback);
+
+ void getInitialLanguage(String localeParam, AsyncCallback<I18nLanguageDTO> callback);
+
+}
Added: trunk/src/main/java/cc/kune/core/client/rpcservices/SiteService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/SiteService.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/SiteService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,33 @@
+/*
+ *
+ * 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 cc.kune.core.client.rpcservices;
+
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.shared.dto.InitDataDTO;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+
+ at RemoteServiceRelativePath("SiteService")
+public interface SiteService extends RemoteService {
+
+ InitDataDTO getInitData(String userHash) throws DefaultException;
+
+}
Added: trunk/src/main/java/cc/kune/core/client/rpcservices/SiteServiceAsync.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/SiteServiceAsync.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/SiteServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,31 @@
+/*
+ *
+ * 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 cc.kune.core.client.rpcservices;
+
+
+import cc.kune.core.shared.dto.InitDataDTO;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+public interface SiteServiceAsync {
+
+ void getInitData(String userHash, AsyncCallback<InitDataDTO> callback);
+
+}
Added: trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,62 @@
+/*
+ *
+ * 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 cc.kune.core.client.rpcservices;
+
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.shared.dto.SocialNetworkDataDTO;
+import cc.kune.core.shared.dto.SocialNetworkRequestResult;
+import cc.kune.core.shared.dto.StateToken;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+
+ at RemoteServiceRelativePath("SocialNetworkService")
+public interface SocialNetworkService extends RemoteService {
+
+ SocialNetworkDataDTO acceptJoinGroup(String hash, StateToken groupToken, String groupToAcceptShortName)
+ throws DefaultException;
+
+ SocialNetworkDataDTO addAdminMember(String hash, StateToken groupToken, String groupToAddShortName)
+ throws DefaultException;
+
+ SocialNetworkDataDTO addCollabMember(String hash, StateToken groupToken, String groupToAddShortName)
+ throws DefaultException;
+
+ SocialNetworkDataDTO addViewerMember(String hash, StateToken groupToken, String groupToAddShortName)
+ throws DefaultException;
+
+ SocialNetworkDataDTO deleteMember(String hash, StateToken groupToken, String groupToDeleteShortName)
+ throws DefaultException;
+
+ SocialNetworkDataDTO denyJoinGroup(String hash, StateToken groupToken, String groupToDenyShortName)
+ throws DefaultException;
+
+ SocialNetworkDataDTO getSocialNetwork(String hash, StateToken groupToken) throws DefaultException;
+
+ SocialNetworkRequestResult requestJoinGroup(String hash, StateToken groupToken) throws DefaultException;
+
+ SocialNetworkDataDTO setAdminAsCollab(String hash, StateToken groupToken, String groupToSetCollabShortName)
+ throws DefaultException;
+
+ SocialNetworkDataDTO setCollabAsAdmin(String hash, StateToken groupToken, String groupToSetAdminShortName)
+ throws DefaultException;
+
+ SocialNetworkDataDTO unJoinGroup(String hash, StateToken groupToken) throws DefaultException;
+}
Added: trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,60 @@
+/*
+ *
+ * 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 cc.kune.core.client.rpcservices;
+
+
+import cc.kune.core.shared.dto.SocialNetworkDataDTO;
+import cc.kune.core.shared.dto.SocialNetworkRequestResult;
+import cc.kune.core.shared.dto.StateToken;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+public interface SocialNetworkServiceAsync {
+
+ void acceptJoinGroup(String hash, StateToken groupToken, String groupToAcceptShortName,
+ AsyncCallback<SocialNetworkDataDTO> callback);
+
+ void addAdminMember(String hash, StateToken groupToken, String groupToAddShortName,
+ AsyncCallback<SocialNetworkDataDTO> callback);
+
+ void addCollabMember(String hash, StateToken groupToken, String groupToAddShortName,
+ AsyncCallback<SocialNetworkDataDTO> callback);
+
+ void addViewerMember(String hash, StateToken groupToken, String groupToAddShortName,
+ AsyncCallback<SocialNetworkDataDTO> callback);
+
+ void deleteMember(String hash, StateToken groupToken, String groupToDeleteShortName,
+ AsyncCallback<SocialNetworkDataDTO> callback);
+
+ void denyJoinGroup(String hash, StateToken groupToken, String groupToDenyShortName,
+ AsyncCallback<SocialNetworkDataDTO> callback);
+
+ void getSocialNetwork(String hash, StateToken groupToken, AsyncCallback<SocialNetworkDataDTO> callback);
+
+ void requestJoinGroup(String hash, StateToken groupToken, AsyncCallback<SocialNetworkRequestResult> callback);
+
+ void setAdminAsCollab(String hash, StateToken groupToken, String groupToSetCollabShortName,
+ AsyncCallback<SocialNetworkDataDTO> callback);
+
+ void setCollabAsAdmin(String hash, StateToken groupToken, String groupToSetAdminShortName,
+ AsyncCallback<SocialNetworkDataDTO> callback);
+
+ void unJoinGroup(String hash, StateToken groupToken, AsyncCallback<SocialNetworkDataDTO> callback);
+}
Added: trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,49 @@
+/*
+ *
+ * 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 cc.kune.core.client.rpcservices;
+
+
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.UserBuddiesVisibilityDTO;
+import cc.kune.core.shared.dto.UserDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+
+ at RemoteServiceRelativePath("UserService")
+public interface UserService extends RemoteService {
+
+ UserInfoDTO createUser(UserDTO user, boolean wantPersonalHomepage) throws DefaultException;
+
+ String getUserAvatarBaser64(String userHash, StateToken userToken) throws DefaultException;
+
+ UserInfoDTO login(String nickOrEmail, String passwd) throws DefaultException;
+
+ void logout(String userHash) throws DefaultException;
+
+ void onlyCheckSession(String userHash) throws DefaultException;
+
+ UserInfoDTO reloadUserInfo(String userHash) throws DefaultException;
+
+ void setBuddiesVisibility(String userHash, StateToken groupToken, UserBuddiesVisibilityDTO visibility);
+
+}
Added: trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,47 @@
+/*
+ *
+ * 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 cc.kune.core.client.rpcservices;
+
+
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.UserBuddiesVisibilityDTO;
+import cc.kune.core.shared.dto.UserDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+public interface UserServiceAsync {
+
+ void createUser(UserDTO user, boolean wantPersonalHomepage, AsyncCallback<UserInfoDTO> asyncCallback);
+
+ void getUserAvatarBaser64(String userHash, StateToken userToken, AsyncCallback<String> asyncCallback);
+
+ void login(String nickOrEmail, String passwd, AsyncCallback<UserInfoDTO> asyncCallback);
+
+ void logout(String userHash, AsyncCallback<Void> asyncCallback);
+
+ void onlyCheckSession(String userHash, AsyncCallback<Void> asyncCallback);
+
+ void reloadUserInfo(String userHash, AsyncCallback<UserInfoDTO> asyncCallback);
+
+ void setBuddiesVisibility(String userHash, StateToken groupToken, UserBuddiesVisibilityDTO visibility,
+ AsyncCallback<Void> asyncCallback);
+
+}
Copied: trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/AccessRightsClientManager.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,32 @@
+package cc.kune.core.client.state;
+
+
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+
+import com.calclab.suco.client.events.Event2;
+import com.calclab.suco.client.events.Listener;
+import com.calclab.suco.client.events.Listener2;
+
+public class AccessRightsClientManager {
+ private AccessRightsDTO previousRights;
+ private final Event2<AccessRightsDTO, AccessRightsDTO> onRightsChanged;
+
+ public AccessRightsClientManager(final StateManager stateManager) {
+ this.previousRights = null;
+ this.onRightsChanged = new Event2<AccessRightsDTO, AccessRightsDTO>("onRightsChanged");
+ stateManager.onStateChanged(new Listener<StateAbstractDTO>() {
+ public void onEvent(final StateAbstractDTO newState) {
+ final AccessRightsDTO rights = newState.getGroupRights();
+ if (!rights.equals(previousRights)) {
+ onRightsChanged.fire(previousRights, rights);
+ previousRights = rights;
+ }
+ }
+ });
+ }
+
+ public void onRightsChanged(final Listener2<AccessRightsDTO, AccessRightsDTO> listener) {
+ onRightsChanged.add(listener);
+ }
+}
Copied: trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProvider.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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 cc.kune.core.client.state;
+
+
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateToken;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+public interface ContentProvider {
+
+ void cache(StateToken encodeState, StateAbstractDTO content);
+
+ void getContent(String user, StateToken newState, AsyncCallback<StateAbstractDTO> callback);
+
+}
Copied: trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,62 @@
+/*
+ *
+ * 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 cc.kune.core.client.state;
+
+import java.util.HashMap;
+
+import cc.kune.core.client.CoreEventBus;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateToken;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.inject.Inject;
+import com.mvp4g.client.event.BaseEventHandler;
+
+public class ContentProviderDefault extends BaseEventHandler<CoreEventBus> implements ContentProvider {
+
+ private final ContentServiceAsync server;
+ private final HashMap<StateToken, StateAbstractDTO> cache;
+
+ @Inject
+ public ContentProviderDefault(final ContentServiceAsync server) {
+ this.server = server;
+ this.cache = new HashMap<StateToken, StateAbstractDTO>();
+ }
+
+ public void cache(final StateToken encodeState, final StateAbstractDTO content) {
+ cache.put(encodeState, content);
+ }
+
+ public void getContent(final String user, final StateToken newState, final AsyncCallback<StateAbstractDTO> callback) {
+ eventBus.showSpinLoading();
+ final StateAbstractDTO catched = getCached(newState);
+ if (catched != null) {
+ callback.onSuccess(catched);
+ } else {
+ server.getContent(user, newState, callback);
+ }
+ }
+
+ private StateAbstractDTO getCached(final StateToken newState) {
+ return cache.remove(newState);
+ }
+
+}
Copied: trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapper.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,28 @@
+/*
+ *
+ * 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 cc.kune.core.client.state;
+
+public interface HistoryWrapper {
+
+ String getToken();
+
+ void newItem(final String historyToken);
+
+}
\ No newline at end of file
Copied: trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapperDefault.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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 cc.kune.core.client.state;
+
+import com.google.gwt.user.client.History;
+
+public class HistoryWrapperDefault implements HistoryWrapper {
+
+ public String getToken() {
+ return History.getToken();
+ }
+
+ public void newItem(final String historyToken) {
+ History.newItem(historyToken);
+ }
+
+}
Copied: trunk/src/main/java/cc/kune/core/client/state/Session.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/Session.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/state/Session.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,155 @@
+/*
+ *
+ * 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/>.
+ *
+ */
+/*
+ *
+ * This file is part of kune.
+ * Copyright (C) 2007-2009 The kune development team (see CREDITS for details)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ \*/
+package cc.kune.core.client.state;
+
+import java.util.Collection;
+import java.util.List;
+
+
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.shared.dto.I18nCountryDTO;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+import cc.kune.core.shared.dto.I18nLanguageSimpleDTO;
+import cc.kune.core.shared.dto.InitDataDTO;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.ToolSimpleDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+import cc.kune.core.shared.dto.UserSimpleDTO;
+
+import com.calclab.suco.client.events.Listener;
+import com.calclab.suco.client.events.Listener0;
+
+public interface Session {
+
+ /**
+ * Duration remembering login: 2 weeks
+ */
+ int SESSION_DURATION = 1000 * 60 * 60 * 24 * 14;
+
+ String USERHASH = "userHash";
+
+ void check(AsyncCallbackSimple<Void> callback);
+
+ StateContainerDTO getContainerState();
+
+ StateContentDTO getContentState();
+
+ List<I18nCountryDTO> getCountries();
+
+ Object[][] getCountriesArray();
+
+ String getCurrentCCversion();
+
+ String getCurrentGroupShortName();
+
+ I18nLanguageDTO getCurrentLanguage();
+
+ StateAbstractDTO getCurrentState();
+
+ StateToken getCurrentStateToken();
+
+ UserSimpleDTO getCurrentUser();
+
+ UserInfoDTO getCurrentUserInfo();
+
+ LicenseDTO getDefLicense();
+
+ String getGalleryPermittedExtensions();
+
+ Collection<ToolSimpleDTO> getGroupTools();
+
+ int getImgCropsize();
+
+ int getImgIconsize();
+
+ int getImgResizewidth();
+
+ int getImgThumbsize();
+
+ InitDataDTO getInitData();
+
+ List<I18nLanguageSimpleDTO> getLanguages();
+
+ Object[][] getLanguagesArray();
+
+ List<LicenseDTO> getLicenses();
+
+ boolean getShowDeletedContent();
+
+ String getSiteUrl();
+
+ Object[][] getTimezones();
+
+ String getUserHash();
+
+ Collection<ToolSimpleDTO> getUserTools();
+
+ boolean inSameToken(StateToken token);
+
+ boolean isCurrentStateAContent();
+
+ boolean isCurrentStateAGroup();
+
+ boolean isInCurrentUserSpace();
+
+ boolean isLogged();
+
+ boolean isNotLogged();
+
+ void onInitDataReceived(Listener<InitDataDTO> listener);
+
+ void onUserSignIn(Listener<UserInfoDTO> listener);
+
+ void onUserSignOut(Listener0 listener);
+
+ void setCurrentLanguage(final I18nLanguageDTO currentLanguage);
+
+ void setCurrentState(final StateAbstractDTO currentState);
+
+ void setCurrentUserInfo(UserInfoDTO currentUserInfo);
+
+ void setInitData(InitDataDTO initData);
+
+ void setUserHash(String userHash);
+
+}
\ No newline at end of file
Copied: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,299 @@
+/*
+ *
+ * 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 cc.kune.core.client.state;
+
+import java.util.Collection;
+import java.util.List;
+
+import cc.kune.core.client.CoreEventBus;
+import cc.kune.core.client.cookies.CookiesManager;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.UserServiceAsync;
+import cc.kune.core.shared.dto.I18nCountryDTO;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+import cc.kune.core.shared.dto.I18nLanguageSimpleDTO;
+import cc.kune.core.shared.dto.InitDataDTO;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.ToolSimpleDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+import cc.kune.core.shared.dto.UserSimpleDTO;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.calclab.suco.client.events.Event;
+import com.calclab.suco.client.events.Event0;
+import com.calclab.suco.client.events.Listener;
+import com.calclab.suco.client.events.Listener0;
+import com.google.gwt.core.client.GWT;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.mvp4g.client.event.BaseEventHandler;
+
+public class SessionDefault extends BaseEventHandler<CoreEventBus> implements Session {
+ private String userHash;
+ private InitDataDTO initData;
+ private UserInfoDTO currentUserInfo;
+ private Object[][] languagesArray;
+ private Object[][] countriesArray;
+ private Object[][] timezonesArray;
+ private StateAbstractDTO currentState;
+ private I18nLanguageDTO currentLanguage;
+ private final Event<InitDataDTO> onInitDataReceived;
+ private final Event<UserInfoDTO> onUserSignIn;
+ private final Event0 onUserSignOut;
+ private final Provider<UserServiceAsync> userServiceProvider;
+
+ @Inject
+ public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider) {
+ this.userHash = cookieManager.getCurrentCookie();
+ this.userHash = userHash == null || userHash.equals("null") ? null : userHash;
+ this.userServiceProvider = userServiceProvider;
+ languagesArray = null;
+ this.onInitDataReceived = new Event<InitDataDTO>("initDataReceived");
+ this.onUserSignIn = new Event<UserInfoDTO>("onUserSignIn");
+ this.onUserSignOut = new Event0("onUserSignOut");
+ }
+
+ public void check(final AsyncCallbackSimple<Void> callback) {
+ Log.debug("Checking session (userhash: " + getUserHash() + ")");
+ userServiceProvider.get().onlyCheckSession(getUserHash(), callback);
+ }
+
+ public StateContainerDTO getContainerState() {
+ return (StateContainerDTO) currentState;
+ }
+
+ public StateContentDTO getContentState() {
+ return (StateContentDTO) currentState;
+ }
+
+ public List<I18nCountryDTO> getCountries() {
+ return initData.getCountries();
+ }
+
+ public Object[][] getCountriesArray() {
+ if (countriesArray == null) {
+ countriesArray = mapCountries();
+ }
+ return countriesArray;
+ }
+
+ public String getCurrentCCversion() {
+ return initData.getCurrentCCversion();
+ }
+
+ public String getCurrentGroupShortName() {
+ return currentState == null ? null : currentState.getStateToken().getGroup();
+ }
+
+ public I18nLanguageDTO getCurrentLanguage() {
+ return currentLanguage;
+ }
+
+ public StateAbstractDTO getCurrentState() {
+ return currentState;
+ }
+
+ public StateToken getCurrentStateToken() {
+ return currentState == null ? null : currentState.getStateToken();
+ }
+
+ public UserSimpleDTO getCurrentUser() {
+ return currentUserInfo == null ? null : currentUserInfo.getUser();
+ }
+
+ public UserInfoDTO getCurrentUserInfo() {
+ return currentUserInfo;
+ }
+
+ public LicenseDTO getDefLicense() {
+ return initData.getDefaultLicense();
+ }
+
+ public String getGalleryPermittedExtensions() {
+ return initData.getGalleryPermittedExtensions();
+ }
+
+ public Collection<ToolSimpleDTO> getGroupTools() {
+ return initData.getGroupTools();
+ }
+
+ public int getImgCropsize() {
+ return initData.getImgCropsize();
+ }
+
+ public int getImgIconsize() {
+ return initData.getImgIconsize();
+ }
+
+ public int getImgResizewidth() {
+ return initData.getImgResizewidth();
+ }
+
+ public int getImgThumbsize() {
+ return initData.getImgThumbsize();
+ }
+
+ public InitDataDTO getInitData() {
+ return initData;
+ }
+
+ public List<I18nLanguageSimpleDTO> getLanguages() {
+ return initData.getLanguages();
+ }
+
+ public Object[][] getLanguagesArray() {
+ if (languagesArray == null) {
+ languagesArray = mapLangs();
+ }
+ return languagesArray;
+ }
+
+ public List<LicenseDTO> getLicenses() {
+ return initData.getLicenses();
+ }
+
+ public boolean getShowDeletedContent() {
+ return currentUserInfo == null ? false : currentUserInfo.getShowDeletedContent();
+ }
+
+ public String getSiteUrl() {
+ final String baseURL = GWT.getModuleBaseURL();
+ return baseURL.substring(0, baseURL.lastIndexOf("/" + GWT.getModuleName()));
+ }
+
+ public Object[][] getTimezones() {
+ if (timezonesArray == null) {
+ mapTimezones();
+ }
+ return timezonesArray;
+ }
+
+ public String getUserHash() {
+ return userHash;
+ }
+
+ public Collection<ToolSimpleDTO> getUserTools() {
+ return initData.getUserTools();
+ }
+
+ public boolean inSameToken(final StateToken token) {
+ return getCurrentStateToken().equals(token);
+ }
+
+ public boolean isCurrentStateAContent() {
+ return currentState instanceof StateContentDTO;
+ }
+
+ public boolean isCurrentStateAGroup() {
+ return currentState == null ? false : !currentState.getGroup().isPersonal();
+ }
+
+ public boolean isInCurrentUserSpace() {
+ if (!isLogged()) {
+ return false;
+ }
+ if (getCurrentStateToken().getGroup().equals(getCurrentUser().getShortName())) {
+ return true;
+ }
+ return false;
+ }
+
+ public boolean isLogged() {
+ return userHash != null;
+ }
+
+ public boolean isNotLogged() {
+ return !isLogged();
+ }
+
+ public void onInitDataReceived(final Listener<InitDataDTO> listener) {
+ onInitDataReceived.add(listener);
+ }
+
+ public void onUserSignIn(final Listener<UserInfoDTO> listener) {
+ onUserSignIn.add(listener);
+ }
+
+ public void onUserSignOut(final Listener0 listener) {
+ onUserSignOut.add(listener);
+ }
+
+ public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) {
+ this.currentLanguage = currentLanguage;
+ eventBus.i18nReady();
+ }
+
+ public void setCurrentState(final StateAbstractDTO currentState) {
+ this.currentState = currentState;
+ }
+
+ public void setCurrentUserInfo(final UserInfoDTO currentUserInfo) {
+ this.currentUserInfo = currentUserInfo;
+ if (currentUserInfo != null) {
+ onUserSignIn.fire(currentUserInfo);
+ } else {
+ onUserSignOut.fire();
+ }
+ }
+
+ public void setInitData(final InitDataDTO initData) {
+ this.initData = initData;
+ onInitDataReceived.fire(initData);
+ }
+
+ public void setUserHash(final String userHash) {
+ this.userHash = userHash;
+ }
+
+ private Object[][] mapCountries() {
+ assert (initData != null);
+ final Object[][] objs = new Object[initData.getCountries().size()][1];
+ int i = 0;
+ for (final I18nCountryDTO country : initData.getCountries()) {
+ final Object[] obj = new Object[] { country.getCode(), country.getEnglishName() };
+ objs[i++] = obj;
+ }
+ return objs;
+ }
+
+ private Object[][] mapLangs() {
+ assert (initData != null);
+ final Object[][] objs = new Object[initData.getLanguages().size()][1];
+ int i = 0;
+ for (final I18nLanguageSimpleDTO language : initData.getLanguages()) {
+ final Object[] obj = new Object[] { language.getCode(), language.getEnglishName() };
+ objs[i++] = obj;
+ }
+ return objs;
+ }
+
+ private void mapTimezones() {
+ assert (initData != null);
+ timezonesArray = new Object[initData.getTimezones().length][1];
+ for (int i = 0; i < getTimezones().length; i++) {
+ final Object[] obj = new Object[] { initData.getTimezones()[i] };
+ timezonesArray[i] = obj;
+ }
+ }
+}
Copied: trunk/src/main/java/cc/kune/core/client/state/StateManager.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/StateManager.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,64 @@
+/*
+ *
+ * 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 cc.kune.core.client.state;
+
+
+import cc.kune.core.client.actions.BeforeActionListener;
+import cc.kune.core.shared.dto.SocialNetworkDataDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateToken;
+
+import com.calclab.suco.client.events.Listener;
+import com.calclab.suco.client.events.Listener0;
+import com.calclab.suco.client.events.Listener2;
+
+public interface StateManager {
+
+ void addBeforeStateChangeListener(BeforeActionListener listener);
+
+ void addSiteToken(String token, Listener0 whenToken);
+
+ void gotoToken(StateToken newToken);
+
+ void gotoToken(String newToken);
+
+ void onGroupChanged(Listener2<String, String> listener);
+
+ void onSocialNetworkChanged(Listener<StateAbstractDTO> listener);
+
+ void onStateChanged(Listener<StateAbstractDTO> listener);
+
+ void onToolChanged(Listener2<String, String> listener);
+
+ void reload();
+
+ void removeBeforeStateChangeListener(BeforeActionListener listener);
+
+ void removeSiteToken(String token);
+
+ void restorePreviousToken();
+
+ void resumeTokenChange();
+
+ void setRetrievedState(StateAbstractDTO state);
+
+ void setSocialNetwork(SocialNetworkDataDTO socialNet);
+
+}
Copied: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,237 @@
+/*
+ *
+ * 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 cc.kune.core.client.state;
+
+import java.util.HashMap;
+
+import cc.kune.core.client.CoreEventBus;
+import cc.kune.core.client.actions.BeforeActionCollection;
+import cc.kune.core.client.actions.BeforeActionListener;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.shared.dto.SocialNetworkDataDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.UserInfoDTO;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.calclab.suco.client.events.Event;
+import com.calclab.suco.client.events.Event2;
+import com.calclab.suco.client.events.Listener;
+import com.calclab.suco.client.events.Listener0;
+import com.calclab.suco.client.events.Listener2;
+import com.google.gwt.event.logical.shared.ValueChangeEvent;
+import com.google.gwt.event.logical.shared.ValueChangeHandler;
+import com.google.gwt.user.client.History;
+import com.google.inject.Inject;
+import com.mvp4g.client.event.BaseEventHandler;
+
+public class StateManagerDefault extends BaseEventHandler<CoreEventBus> implements StateManager,
+ ValueChangeHandler<String> {
+ private final ContentProvider contentProvider;
+ private StateToken previousToken;
+ /**
+ * When a historyChanged is interrupted (for instance because you are
+ * editing something), the new token is stored here
+ */
+ private StateToken resumedToken;
+ private final Session session;
+ private final HistoryWrapper history;
+ private final HashMap<String, Listener0> siteTokens;
+ private final Event<StateAbstractDTO> onStateChanged;
+ private final Event<StateAbstractDTO> onSocialNetworkChanged;
+ private final Event2<String, String> onToolChanged;
+ private final Event2<String, String> onGroupChanged;
+ private final BeforeActionCollection beforeStateChangeCollection;
+
+ @Inject
+ public StateManagerDefault(final ContentProvider contentProvider, final Session session,
+ final HistoryWrapper history) {
+ // Put this outside here
+ History.addValueChangeHandler(this);
+ this.contentProvider = contentProvider;
+ this.session = session;
+ this.history = history;
+ this.previousToken = null;
+ this.resumedToken = null;
+ this.onStateChanged = new Event<StateAbstractDTO>("onStateChanged");
+ this.onGroupChanged = new Event2<String, String>("onGroupChanged");
+ this.onToolChanged = new Event2<String, String>("onToolChanged");
+ this.onSocialNetworkChanged = new Event<StateAbstractDTO>("onSocialNetworkChanged");
+ session.onUserSignIn(new Listener<UserInfoDTO>() {
+ public void onEvent(final UserInfoDTO parameter) {
+ if (previousToken == null) {
+ // starting up
+ reload();
+ } else {
+ // do nothing, SigInPresent calls goto;
+ }
+ }
+ });
+ session.onUserSignOut(new Listener0() {
+ public void onEvent() {
+ reload();
+ }
+ });
+ siteTokens = new HashMap<String, Listener0>();
+ beforeStateChangeCollection = new BeforeActionCollection();
+ }
+
+ public void addBeforeStateChangeListener(final BeforeActionListener listener) {
+ beforeStateChangeCollection.add(listener);
+ }
+
+ public void addSiteToken(final String token, final Listener0 listener) {
+ siteTokens.put(token, listener);
+ }
+
+ public void gotoToken(final StateToken newToken) {
+ Log.debug("StateManager: history goto-token newItem (" + newToken + ")");
+ history.newItem(newToken.getEncoded());
+ }
+
+ public void gotoToken(final String token) {
+ gotoToken(new StateToken(token));
+ }
+
+ public void onGroupChanged(final Listener2<String, String> listener) {
+ onGroupChanged.add(listener);
+ }
+
+ public void onSocialNetworkChanged(final Listener<StateAbstractDTO> listener) {
+ onSocialNetworkChanged.add(listener);
+ }
+
+ public void onStateChanged(final Listener<StateAbstractDTO> listener) {
+ onStateChanged.add(listener);
+ }
+
+ public void onToolChanged(final Listener2<String, String> listener) {
+ onToolChanged.add(listener);
+ }
+
+ public void onValueChange(final ValueChangeEvent<String> event) {
+ onHistoryChanged(event.getValue());
+ }
+
+ /**
+ * <p>
+ * Reload current state (using client cache if available)
+ * </p>
+ */
+ public void reload() {
+ onHistoryChanged(history.getToken());
+ }
+
+ public void removeBeforeStateChangeListener(final BeforeActionListener listener) {
+ beforeStateChangeCollection.remove(listener);
+ }
+
+ public void removeSiteToken(final String token) {
+ siteTokens.remove(token);
+ }
+
+ public void restorePreviousToken() {
+ gotoToken(previousToken);
+ }
+
+ public void resumeTokenChange() {
+ if (resumedToken != null) {
+ reload();
+ gotoToken(resumedToken);
+ clearResumedToken();
+ }
+ }
+
+ public void setRetrievedState(final StateAbstractDTO newState) {
+ contentProvider.cache(newState.getStateToken(), newState);
+ // setState(newState);
+ history.newItem(newState.getStateToken().toString());
+ }
+
+ public void setSocialNetwork(final SocialNetworkDataDTO socialNet) {
+ StateAbstractDTO state;
+ if (session != null && (state = session.getCurrentState()) != null) {
+ // After a SN operation, usually returns a SocialNetworkResultDTO
+ // with new SN data and we refresh the state
+ // to avoid to reload() again the state
+ state.setSocialNetworkData(socialNet);
+ onSocialNetworkChanged.fire(state);
+ }
+ }
+
+ void onHistoryChanged(final String historyToken) {
+ // http://code.google.com/p/google-web-toolkit-doc-1-5/wiki/DevGuideHistory
+ if (beforeStateChangeCollection.checkBeforeAction()) {
+ final Listener0 tokenListener = siteTokens.get(historyToken);
+ Log.debug("StateManager: history token changed (" + historyToken + ")");
+ if (tokenListener == null) {
+ // Ok, normal token change
+ onHistoryChanged(new StateToken(historyToken));
+ } else {
+ // token is one of #newgroup #signin #translate ...
+ if (previousToken == null) {
+ // Starting with some token like "signin": load defContent
+ // also
+ onHistoryChanged("");
+ }
+ tokenListener.onEvent();
+ }
+ } else {
+ resumedToken = new StateToken(historyToken);
+ }
+ }
+
+ void setState(final StateAbstractDTO newState) {
+ session.setCurrentState(newState);
+ onStateChanged.fire(newState);
+ eventBus.hideSpin();
+ checkGroupAndToolChange(newState);
+ previousToken = newState.getStateToken();
+
+ }
+
+ private void checkGroupAndToolChange(final StateAbstractDTO newState) {
+ final String previousGroup = previousToken == null ? "" : previousToken.getGroup();
+ final String newGroup = newState.getStateToken().getGroup();
+ final String previousTokenTool = previousToken == null ? "" : previousToken.getTool();
+ final String newTokenTool = newState.getStateToken().getTool();
+ final String previousToolName = previousTokenTool == null ? "" : previousTokenTool;
+ final String newToolName = newTokenTool == null ? "" : newTokenTool;
+
+ if (previousToken == null || previousToolName == null || !previousToolName.equals(newToolName)) {
+ onToolChanged.fire(previousToolName, newToolName);
+ }
+ if (previousToken == null || !previousGroup.equals(newGroup)) {
+ onGroupChanged.fire(previousGroup, newGroup);
+ }
+ }
+
+ private void clearResumedToken() {
+ resumedToken = null;
+ }
+
+ private void onHistoryChanged(final StateToken newState) {
+ contentProvider.getContent(session.getUserHash(), newState, new AsyncCallbackSimple<StateAbstractDTO>() {
+ public void onSuccess(final StateAbstractDTO newState) {
+ setState(newState);
+ }
+ });
+ }
+}
Copied: trunk/src/main/java/cc/kune/core/client/utils/Location.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/utils/Location.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/utils/Location.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2006 Robert Hanson <iamroberthanson AT gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ \*/
+package cc.kune.core.client.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Location {
+ private String hash;
+ private String host;
+ private String hostName;
+ private String href;
+ private String path;
+ private String port;
+ private String protocol;
+ private String queryString;
+ private HashMap<String, String> paramMap;
+
+ /**
+ * sample: #site.docs.3.1
+ **/
+ public String getHash() {
+ return hash;
+ }
+
+ /**
+ * sample: locahost:8080
+ *
+ * @return
+ */
+ public String getHost() {
+ return host;
+ }
+
+ /**
+ * sample: locahost
+ *
+ * @return
+ */
+ public String getHostName() {
+ return hostName;
+ }
+
+ /**
+ * sample: http://localhost:8080/ws/#site.docs.3.1?locale=en&log_level=INFO
+ **/
+ public String getHref() {
+ return href;
+ }
+
+ public String getParameter(final String name) {
+ return paramMap.get(name);
+ }
+
+ public Map<String, String> getParameterMap() {
+ return paramMap;
+ }
+
+ /**
+ * sample: /ws/
+ *
+ * @return
+ */
+ public String getPath() {
+ return path;
+ }
+
+ public String getPort() {
+ return port;
+ }
+
+ public String getProtocol() {
+ return protocol;
+ }
+
+ /**
+ * sample: ?locale=en&log_level=INFO
+ *
+ * @return
+ */
+ public String getQueryString() {
+ return queryString;
+ }
+
+ protected void setHash(final String hash) {
+ this.hash = hash;
+ }
+
+ protected void setHost(final String host) {
+ this.host = host;
+ }
+
+ protected void setHostName(final String hostName) {
+ this.hostName = hostName;
+ }
+
+ protected void setHref(final String href) {
+ this.href = href;
+ }
+
+ protected void setPath(final String path) {
+ this.path = path;
+ }
+
+ protected void setPort(final String port) {
+ this.port = port;
+ }
+
+ protected void setProtocol(final String protocol) {
+ this.protocol = protocol;
+ }
+
+ protected void setQueryString(final String queryString) {
+ this.queryString = queryString;
+ paramMap = new HashMap<String, String>();
+
+ if (queryString != null && queryString.length() > 1) {
+ String qs = queryString.substring(1);
+ String[] kvPairs = qs.split("&");
+ for (String kvPair : kvPairs) {
+ String[] kv = kvPair.split("=");
+ if (kv.length > 1) {
+ paramMap.put(kv[0], unescape(kv[1]));
+ } else {
+ paramMap.put(kv[0], "");
+ }
+ }
+ }
+ }
+
+ private native String unescape(String val) /*-{
+ return unescape(val);
+ }-*/;
+
+}
\ No newline at end of file
Copied: trunk/src/main/java/cc/kune/core/client/utils/TextUtils.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/ui/TextUtils.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/utils/TextUtils.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/utils/TextUtils.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,99 @@
+/*
+ *
+ * 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 cc.kune.core.client.utils;
+
+import java.util.ArrayList;
+
+public class TextUtils {
+
+ public static final String IN_DEVELOPMENT_P = " (in development)";
+ public static final String IN_DEVELOPMENT = "In development";
+
+ // Original regexp from http://snippets.dzone.com/posts/show/452
+ public static final String URL_REGEXP = "((ftp|http|https|mailto):\\/\\/(\\w+:{0,1}\\w*@)?(\\S+)(:[0-9]+)?(\\/|\\/([\\w#!:.?+=&%@!\\-\\/]))?)";
+
+ // Original regexp from http://www.regular-expressions.info/email.html
+ public static final String EMAIL_REGEXP = "[-!#$%&\'*+/=?_`{|}~a-z0-9^]+(\\.[-!#$%&\'*+/=?_`{|}~a-z0-9^]+)*@(localhost|([a-z0-9]([-a-z0-9]*[a-z0-9])?\\.)+[a-z0-9]([-a-z0-9]*[a-z0-9]))?";
+
+ public static final String UNIX_NAME = "^[a-z0-9_\\-]+$";
+
+ public static final String NUM_REGEXP = "^[0-9]+$";
+
+ /*
+ * This method escape only some dangerous html chars
+ */
+ public static String escapeHtmlLight(final String source) {
+ if (source == null) {
+ return null;
+ }
+ String result = source;
+ result = result.replaceAll("&", "&");
+ result = result.replaceAll("\"", """);
+ // text = text.replaceAll("\'", "'");
+ result = result.replaceAll("<", "<");
+ result = result.replaceAll(">", ">");
+ return result;
+ }
+
+ public static String generateHtmlLink(final String href, final String text) {
+ return "<a href=\"" + href + "\" target=\"_blank\">" + text + "</a>";
+ }
+
+ public static ArrayList<String> splitTags(final String tagsString) {
+ final ArrayList<String> tagsList = new ArrayList<String>();
+ String tagsCopy = tagsString;
+ // remove commas and quotes
+ if (tagsString == null) {
+ return tagsList;
+ }
+ tagsCopy = tagsCopy.replaceAll(",", " ");
+ tagsCopy = tagsCopy.replaceAll("\"", "");
+ tagsCopy = tagsCopy.replaceAll("\'", "");
+ final String[] splitted = tagsCopy.split("\\s+");
+ for (String tag : splitted) {
+ tag = tag.replaceAll("\\s$", "");
+ if (tag.length() > 0) {
+ tagsList.add(tag);
+ }
+ }
+ return tagsList;
+ }
+
+ /*
+ * This method unescape only some dangerous html chars for use in GWT Html
+ * widget for instance
+ */
+ public static String unescape(final String source) {
+ if (source == null) {
+ return null;
+ }
+ String result = source;
+ result = result.replaceAll("&", "&");
+ result = result.replaceAll(""", "\"");
+ result = result.replaceAll("'", "\'");
+ result = result.replaceAll("<", "<");
+ result = result.replaceAll(">", ">");
+ return result;
+ }
+
+ public TextUtils() {
+ }
+
+}
Property changes on: trunk/src/main/java/cc/kune/core/client/utils/TextUtils.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/src/main/java/cc/kune/core/client/utils/WindowUtils.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/utils/WindowUtils.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/utils/WindowUtils.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2006 Robert Hanson <iamroberthanson AT gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cc.kune.core.client.utils;
+
+public class WindowUtils {
+
+ public static Location getLocation() {
+ Location result = new Location();
+ result.setHash(getHash());
+ result.setHost(getHost());
+ result.setHostName(getHostName());
+ result.setHref(getHref());
+ result.setPath(getPath());
+ result.setPort(getPort());
+ result.setProtocol(getProtocol());
+ result.setQueryString(getQueryString());
+ return result;
+ }
+
+ private static native String getHash() /*-{
+ return $wnd.location.hash;
+ }-*/;
+
+ private static native String getHost() /*-{
+ return $wnd.location.host;
+ }-*/;
+
+ private static native String getHostName() /*-{
+ return $wnd.location.hostname;
+ }-*/;
+
+ private static native String getHref() /*-{
+ return $wnd.location.href;
+ }-*/;
+
+ private static native String getPath() /*-{
+ return $wnd.location.pathname;
+ }-*/;
+
+ private static native String getPort() /*-{
+ return $wnd.location.port;
+ }-*/;
+
+ private static native String getProtocol() /*-{
+ return $wnd.location.protocol;
+ }-*/;
+
+ private static native String getQueryString() /*-{
+ return $wnd.location.search;
+ }-*/;
+
+}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -2,7 +2,9 @@
import cc.kune.core.client.CoreEventBus;
import cc.kune.core.client.ws.CorePresenter.ICoreView;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+import com.google.inject.Inject;
import com.mvp4g.client.annotation.Presenter;
import com.mvp4g.client.presenter.BasePresenter;
@@ -18,6 +20,10 @@
public interface ICoreView {
}
+ @Inject
+ public CorePresenter(final I18nTranslationService i18n) {
+ }
+
/**
* On start.
*/
Copied: trunk/src/main/java/cc/kune/core/shared/dto (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/dto)
Modified: trunk/src/main/java/cc/kune/core/shared/dto/AccessListsDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessListsDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/AccessListsDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/AccessRolDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRolDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/AccessRolDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
\*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
public enum AccessRolDTO {
Administrator, Editor, Viewer
Modified: trunk/src/main/java/cc/kune/core/shared/dto/AdmissionTypeDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/AdmissionTypeDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/AdmissionTypeDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/BasicMimeTypeDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/BasicMimeTypeDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
\*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/ChatUserParamsDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ChatUserParamsDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/ChatUserParamsDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,11 +17,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
\*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
-import com.calclab.emiteuimodule.client.SubscriptionMode;
import com.google.gwt.user.client.rpc.IsSerializable;
+ at Deprecated
public class ChatUserParamsDTO implements IsSerializable {
private String avatar;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/CommentDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/CommentDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/CommentDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
\*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import java.util.List;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContainerDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import java.util.List;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContainerSimpleDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContainerSimpleDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/ContainerSimpleDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContentSimpleDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContentStatusDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContentStatusDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/ContentStatusDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
\*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/ExtMediaDescripDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ExtMediaDescripDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/ExtMediaDescripDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,4 +1,4 @@
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import java.util.List;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupType.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupType.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/GroupType.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/I18nCountryDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/I18nCountryDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/I18nCountryDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/I18nLanguageDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageSimpleDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/I18nLanguageSimpleDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageSimpleDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/I18nTranslationDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/I18nTranslationDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/I18nTranslationDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/LicenseDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/LicenseDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/LicenseDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/LinkDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/LinkDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import java.util.List;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/ParticipationDataDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ParticipationDataDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/ParticipationDataDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import java.util.List;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/RateResultDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/RateResultDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/RateResultDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/RoomDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/RoomDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/RoomDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
public class RoomDTO {
Modified: trunk/src/main/java/cc/kune/core/shared/dto/SearchResultDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SearchResultDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/SearchResultDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import java.util.List;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkDataDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkRequestResult.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkRequestResult.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkRequestResult.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
\*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkVisibilityDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkVisibilityDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkVisibilityDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateAbstractDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateAbstractDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/StateAbstractDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import java.util.List;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateContainerDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateContentDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import java.util.Date;
import java.util.List;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateNoContentDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateNoContentDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/StateNoContentDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateToken.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateTokenUtils.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,6 +1,6 @@
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
-import org.ourproject.kune.platf.client.state.Session;
+import cc.kune.core.client.state.Session;
public class StateTokenUtils {
Added: trunk/src/main/java/cc/kune/core/shared/dto/SubscriptionMode.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/SubscriptionMode.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/shared/dto/SubscriptionMode.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,7 @@
+package cc.kune.core.shared.dto;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+
+public enum SubscriptionMode implements IsSerializable {
+ manual, autoAcceptAll, autoRejectAll
+}
\ No newline at end of file
Property changes on: trunk/src/main/java/cc/kune/core/shared/dto/SubscriptionMode.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/src/main/java/cc/kune/core/shared/dto/TagCloudResultDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagCloudResultDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/TagCloudResultDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import java.util.List;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/TagCountDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagCountDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/TagCountDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/TagDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/TagDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/TimeZoneDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/TimeZoneDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/TimeZoneDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/ToolSimpleDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ToolSimpleDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/ToolSimpleDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
\*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesDataDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserBuddiesDataDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesDataDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
\*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesVisibilityDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserBuddiesVisibilityDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesVisibilityDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/UserDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,9 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
-import com.calclab.emiteuimodule.client.SubscriptionMode;
import com.google.gwt.user.client.rpc.IsSerializable;
public class UserDTO implements IsSerializable {
@@ -153,6 +152,7 @@
this.timezone = timezone;
}
+ @Override
public String toString() {
return "UserDTO[" + shortName + "]";
}
Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserInfoDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/UserInfoDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import java.util.List;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserSimpleDTO.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.ourproject.kune.platf.client.dto;
+package cc.kune.core.shared.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
Copied: trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationService.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -0,0 +1,137 @@
+/*
+ *
+ * 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 cc.kune.core.shared.i18n;
+
+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("©", "©");
+ return text;
+ }
+
+ 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
+ */
+ // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:49
+ public abstract String t(final String text);
+
+ /**
+ * Use [%d] to reference the Integer parameters
+ *
+ */
+ // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:50
+ 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
+ *
+ */
+ // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:50
+ 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
+ *
+ */
+ // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:50
+ 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/app/server/KuneRackModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -23,12 +23,6 @@
import org.ourproject.kune.chat.server.ChatServerModule;
import org.ourproject.kune.docs.server.DocumentServerModule;
import org.ourproject.kune.gallery.server.GalleryServerModule;
-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.server.LoggerMethodInterceptor;
import org.ourproject.kune.platf.server.PlatformServerModule;
import org.ourproject.kune.platf.server.manager.file.EntityLogoDownloadManager;
@@ -50,6 +44,13 @@
import org.ourproject.kune.rack.filters.rest.RESTServicesModule;
import org.ourproject.kune.wiki.server.WikiServerModule;
+import cc.kune.core.client.rpcservices.ContentService;
+import cc.kune.core.client.rpcservices.GroupService;
+import cc.kune.core.client.rpcservices.I18nService;
+import cc.kune.core.client.rpcservices.SiteService;
+import cc.kune.core.client.rpcservices.SocialNetworkService;
+import cc.kune.core.client.rpcservices.UserService;
+
import com.google.inject.AbstractModule;
import com.google.inject.Module;
import com.google.inject.Scope;
Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -25,12 +25,6 @@
import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_UPLOADEDFILE;
import org.ourproject.kune.blogs.client.cnt.BlogViewer;
-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.ErrorHandler;
-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.utils.DeferredCommandWrapper;
import org.ourproject.kune.workspace.client.AbstractFoldableContentActions;
@@ -45,6 +39,13 @@
import org.ourproject.kune.workspace.client.upload.FileUploader;
import org.ourproject.kune.workspace.client.wave.WaveInsert;
+import cc.kune.core.client.errors.ErrorHandler;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+
import com.calclab.suco.client.ioc.Provider;
public class BlogClientActions extends AbstractFoldableContentActions {
Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -30,15 +30,8 @@
import org.ourproject.kune.blogs.client.ctx.BlogContext;
import org.ourproject.kune.blogs.client.ctx.BlogContextPresenter;
import org.ourproject.kune.platf.client.app.ToolGroup;
-import org.ourproject.kune.platf.client.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.AbstractExtendedModule;
-import org.ourproject.kune.platf.client.services.ErrorHandler;
-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.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
@@ -57,6 +50,14 @@
import org.ourproject.kune.workspace.client.upload.FileUploader;
import org.ourproject.kune.workspace.client.wave.WaveInsert;
+import cc.kune.core.client.errors.ErrorHandler;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.decorator.Singleton;
import com.calclab.suco.client.ioc.module.Factory;
Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,13 +19,14 @@
*/
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.workspace.client.skel.WorkspaceSkeleton;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool;
import org.ourproject.kune.workspace.client.tool.ToolSelector;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+
public class BlogClientTool extends FoldableAbstractClientTool {
public static final String NAME = "blogs";
public static final String TYPE_ROOT = NAME + "." + "root";
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
*/
package org.ourproject.kune.blogs.client.cnt;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class BlogFolderContentPanel extends FoldableContentPanel implements BlogFolderContentView {
public BlogFolderContentPanel(WorkspaceSkeleton ws, I18nTranslationService i18n) {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,16 +21,17 @@
import org.ourproject.kune.blogs.client.BlogClientTool;
import org.ourproject.kune.platf.client.actions.ActionRegistry;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-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;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.Provider;
public class BlogFolderContentPresenter extends FoldableContentPresenter implements BlogFolderContent {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
*/
package org.ourproject.kune.blogs.client.cnt;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class BlogViewerPanel extends FoldableContentPanel implements BlogViewerView {
public BlogViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) {
super(ws, i18n);
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,16 +20,17 @@
package org.ourproject.kune.blogs.client.cnt;
import org.ourproject.kune.blogs.client.BlogClientTool;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-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;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar;
import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateContentDTO;
+
import com.calclab.suco.client.ioc.Provider;
public class BlogViewerPresenter extends FoldableContentPresenter implements BlogViewer {
Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContextPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContextPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContextPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,11 +20,12 @@
package org.ourproject.kune.blogs.client.ctx;
import org.ourproject.kune.blogs.client.BlogClientTool;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
import org.ourproject.kune.workspace.client.cxt.ContextPropEditor;
import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter;
+import cc.kune.core.client.state.StateManager;
+
import com.calclab.suco.client.ioc.Provider;
public class BlogContextPresenter extends FoldableContextPresenter implements BlogContext {
Modified: trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,9 +19,6 @@
*/
package org.ourproject.kune.blogs.server;
-import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException;
-import org.ourproject.kune.platf.client.errors.ContentNotPermittedException;
-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;
@@ -36,6 +33,10 @@
import org.ourproject.kune.platf.server.tool.ServerToolRegistry;
import org.ourproject.kune.platf.server.tool.ServerToolTarget;
+import cc.kune.core.client.errors.ContainerNotPermittedException;
+import cc.kune.core.client.errors.ContentNotPermittedException;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.inject.Inject;
public class BlogServerTool implements ServerTool {
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -26,17 +26,18 @@
import org.ourproject.kune.platf.client.actions.ActionEnableCondition;
import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor;
import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator;
-import org.ourproject.kune.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.i18n.I18nUITranslationService;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
import org.ourproject.kune.wiki.client.WikiClientTool;
import org.ourproject.kune.workspace.client.AbstractFoldableContentActions;
import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry;
import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.ContentStatusDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -29,14 +29,9 @@
import org.ourproject.kune.chat.client.ctx.room.AddRoomPresenter;
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.AbstractExtendedModule;
import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister;
-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.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
@@ -48,6 +43,12 @@
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
import org.ourproject.kune.workspace.client.tool.ToolSelector;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.emiteuimodule.client.EmiteUIDialog;
import com.calclab.suco.client.ioc.decorator.Singleton;
import com.calclab.suco.client.ioc.module.Factory;
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,13 +19,14 @@
*/
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.workspace.client.skel.WorkspaceSkeleton;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool;
import org.ourproject.kune.workspace.client.tool.ToolSelector;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class ChatClientTool extends FoldableAbstractClientTool {
public static final String NAME = "chats";
public static final String TYPE_ROOT = "chat.root";
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -27,16 +27,17 @@
import org.ourproject.kune.platf.client.actions.KeyStroke;
import org.ourproject.kune.platf.client.actions.Shortcut;
import org.ourproject.kune.platf.client.app.Application;
-import org.ourproject.kune.platf.client.dto.InitDataDTO;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister;
-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;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.utils.WindowUtils;
+import cc.kune.core.shared.dto.InitDataDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.allen_sauer.gwt.log.client.Log;
import com.calclab.emite.core.client.xmpp.stanzas.XmppURI;
import com.calclab.emite.im.client.roster.RosterItem;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
*/
package org.ourproject.kune.chat.client.cnt;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class ChatRoomPanel extends FoldableContentPanel implements ChatRoomView {
public ChatRoomPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,17 +21,18 @@
import org.ourproject.kune.chat.client.ChatClientTool;
import org.ourproject.kune.platf.client.actions.ActionRegistry;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-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;
import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.ioc.Provider;
public class ChatRoomPresenter extends FoldableContentPresenter implements ChatRoom {
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,10 +20,11 @@
package org.ourproject.kune.chat.client.ctx;
import org.ourproject.kune.chat.client.ChatClientTool;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter;
+import cc.kune.core.client.state.StateManager;
+
import com.calclab.suco.client.ioc.Provider;
public class ChatContextPresenter extends FoldableContextPresenter implements ChatContext {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,9 +19,10 @@
*/
package org.ourproject.kune.chat.client.ctx.room;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
-import org.ourproject.kune.platf.client.ui.TextUtils;
+import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.emiteuimodule.client.dialog.BasicDialogExtended;
import com.calclab.emiteuimodule.client.dialog.BasicDialogListener;
import com.google.gwt.core.client.Scheduler;
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,13 +20,14 @@
package org.ourproject.kune.chat.client.ctx.room;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
-import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateContainerDTO;
+
import com.calclab.suco.client.ioc.Provider;
public class AddRoomPresenter implements AddRoom {
Modified: trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,7 +20,6 @@
package org.ourproject.kune.chat.server;
import org.ourproject.kune.chat.client.ChatClientTool;
-import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException;
import org.ourproject.kune.platf.server.content.ContainerManager;
import org.ourproject.kune.platf.server.domain.Container;
import org.ourproject.kune.platf.server.domain.Content;
@@ -32,6 +31,8 @@
import org.ourproject.kune.platf.server.tool.ServerToolRegistry;
import org.ourproject.kune.platf.server.tool.ServerToolTarget;
+import cc.kune.core.client.errors.ContainerNotPermittedException;
+
import com.google.inject.Inject;
public class ChatServerTool implements ServerTool {
Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -26,12 +26,6 @@
import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_WAVE;
import org.ourproject.kune.docs.client.cnt.DocumentViewer;
-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.ErrorHandler;
-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.utils.DeferredCommandWrapper;
import org.ourproject.kune.workspace.client.AbstractFoldableContentActions;
@@ -46,6 +40,13 @@
import org.ourproject.kune.workspace.client.upload.FileUploader;
import org.ourproject.kune.workspace.client.wave.WaveInsert;
+import cc.kune.core.client.errors.ErrorHandler;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+
import com.calclab.suco.client.ioc.Provider;
public class DocumentClientActions extends AbstractFoldableContentActions {
Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -30,15 +30,8 @@
import org.ourproject.kune.docs.client.ctx.DocumentContext;
import org.ourproject.kune.docs.client.ctx.DocumentContextPresenter;
import org.ourproject.kune.platf.client.app.ToolGroup;
-import org.ourproject.kune.platf.client.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.AbstractExtendedModule;
-import org.ourproject.kune.platf.client.services.ErrorHandler;
-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.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
@@ -57,6 +50,14 @@
import org.ourproject.kune.workspace.client.upload.FileUploader;
import org.ourproject.kune.workspace.client.wave.WaveInsert;
+import cc.kune.core.client.errors.ErrorHandler;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.decorator.Singleton;
import com.calclab.suco.client.ioc.module.Factory;
Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,13 +19,14 @@
*/
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.workspace.client.skel.WorkspaceSkeleton;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool;
import org.ourproject.kune.workspace.client.tool.ToolSelector;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+
public class DocumentClientTool extends FoldableAbstractClientTool {
public static final String NAME = "docs";
public static final String TYPE_ROOT = NAME + "." + "root";
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
*/
package org.ourproject.kune.docs.client.cnt;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class DocFolderContentPanel extends FoldableContentPanel implements DocFolderContentView {
public DocFolderContentPanel(WorkspaceSkeleton ws, I18nTranslationService i18n) {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,15 +21,16 @@
import org.ourproject.kune.docs.client.DocumentClientTool;
import org.ourproject.kune.platf.client.actions.ActionRegistry;
-import org.ourproject.kune.platf.client.dto.StateToken;
-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;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.Provider;
public class DocFolderContentPresenter extends FoldableContentPresenter implements DocFolderContent {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
*/
package org.ourproject.kune.docs.client.cnt;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class DocumentViewerPanel extends FoldableContentPanel implements DocumentViewerView {
public DocumentViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) {
super(ws, i18n);
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,16 +20,17 @@
package org.ourproject.kune.docs.client.cnt;
import org.ourproject.kune.docs.client.DocumentClientTool;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-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;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar;
import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateContentDTO;
+
import com.calclab.suco.client.ioc.Provider;
public class DocumentViewerPresenter extends FoldableContentPresenter implements DocumentViewer {
Modified: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,11 +20,12 @@
package org.ourproject.kune.docs.client.ctx;
import org.ourproject.kune.docs.client.DocumentClientTool;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
import org.ourproject.kune.workspace.client.cxt.ContextPropEditor;
import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter;
+import cc.kune.core.client.state.StateManager;
+
import com.calclab.suco.client.ioc.Provider;
public class DocumentContextPresenter extends FoldableContextPresenter implements DocumentContext {
Modified: trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,9 +21,6 @@
import java.util.Date;
-import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException;
-import org.ourproject.kune.platf.client.errors.ContentNotPermittedException;
-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;
@@ -37,6 +34,10 @@
import org.ourproject.kune.platf.server.tool.ServerToolRegistry;
import org.ourproject.kune.platf.server.tool.ServerToolTarget;
+import cc.kune.core.client.errors.ContainerNotPermittedException;
+import cc.kune.core.client.errors.ContentNotPermittedException;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.inject.Inject;
public class DocumentServerTool implements ServerTool {
Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -24,12 +24,6 @@
import static org.ourproject.kune.gallery.client.GalleryClientTool.TYPE_UPLOADEDFILE;
import org.ourproject.kune.gallery.client.cnt.GalleryViewer;
-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.ErrorHandler;
-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.utils.DeferredCommandWrapper;
import org.ourproject.kune.workspace.client.AbstractFoldableContentActions;
@@ -44,6 +38,13 @@
import org.ourproject.kune.workspace.client.upload.FileUploader;
import org.ourproject.kune.workspace.client.wave.WaveInsert;
+import cc.kune.core.client.errors.ErrorHandler;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+
import com.calclab.suco.client.ioc.Provider;
public class GalleryClientActions extends AbstractFoldableContentActions {
Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -30,15 +30,8 @@
import org.ourproject.kune.gallery.client.ctx.GalleryContext;
import org.ourproject.kune.gallery.client.ctx.GalleryContextPresenter;
import org.ourproject.kune.platf.client.app.ToolGroup;
-import org.ourproject.kune.platf.client.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.AbstractExtendedModule;
-import org.ourproject.kune.platf.client.services.ErrorHandler;
-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.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
@@ -57,6 +50,14 @@
import org.ourproject.kune.workspace.client.upload.FileUploader;
import org.ourproject.kune.workspace.client.wave.WaveInsert;
+import cc.kune.core.client.errors.ErrorHandler;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.decorator.Singleton;
import com.calclab.suco.client.ioc.module.Factory;
Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,13 +19,14 @@
*/
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.workspace.client.skel.WorkspaceSkeleton;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool;
import org.ourproject.kune.workspace.client.tool.ToolSelector;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+
public class GalleryClientTool extends FoldableAbstractClientTool {
public static final String NAME = "gallery";
public static final String TYPE_ROOT = NAME + "." + "root";
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,14 +19,15 @@
*/
package org.ourproject.kune.gallery.client.cnt;
-import org.ourproject.kune.platf.client.dto.StateToken;
-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;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.event.dom.client.ClickEvent;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,19 +21,20 @@
import org.ourproject.kune.gallery.client.GalleryClientTool;
import org.ourproject.kune.platf.client.actions.ActionRegistry;
-import org.ourproject.kune.platf.client.dto.ContainerDTO;
-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.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;
import org.ourproject.kune.platf.client.ui.download.ImageSize;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.ContainerDTO;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.Provider;
public class GalleryFolderContentPresenter extends FoldableContentPresenter implements GalleryFolderContent {
Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,9 +19,10 @@
*/
package org.ourproject.kune.gallery.client.cnt;
-import org.ourproject.kune.platf.client.dto.StateToken;
import org.ourproject.kune.workspace.client.cnt.AbstractContentView;
+import cc.kune.core.shared.dto.StateToken;
+
public interface GalleryFolderContentView extends AbstractContentView {
void addThumb(StateToken token, String title, String imgUrl);
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
*/
package org.ourproject.kune.gallery.client.cnt;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class GalleryViewerPanel extends FoldableContentPanel implements GalleryViewerView {
public GalleryViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,16 +20,17 @@
package org.ourproject.kune.gallery.client.cnt;
import org.ourproject.kune.gallery.client.GalleryClientTool;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-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;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar;
import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateContentDTO;
+
import com.calclab.suco.client.ioc.Provider;
public class GalleryViewerPresenter extends FoldableContentPresenter implements GalleryViewer {
Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,11 +20,12 @@
package org.ourproject.kune.gallery.client.ctx;
import org.ourproject.kune.gallery.client.GalleryClientTool;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
import org.ourproject.kune.workspace.client.cxt.ContextPropEditor;
import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter;
+import cc.kune.core.client.state.StateManager;
+
import com.calclab.suco.client.ioc.Provider;
public class GalleryContextPresenter extends FoldableContextPresenter implements GalleryContext {
Modified: trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,9 +19,6 @@
*/
package org.ourproject.kune.gallery.server;
-import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException;
-import org.ourproject.kune.platf.client.errors.ContentNotPermittedException;
-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;
@@ -33,6 +30,10 @@
import org.ourproject.kune.platf.server.tool.ServerToolRegistry;
import org.ourproject.kune.platf.server.tool.ServerToolTarget;
+import cc.kune.core.client.errors.ContainerNotPermittedException;
+import cc.kune.core.client.errors.ContentNotPermittedException;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.inject.Inject;
public class GalleryServerTool implements ServerTool {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
\*/
package org.ourproject.kune.platf.client.actions;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
import org.ourproject.kune.platf.client.services.ImageDescriptor;
import org.ourproject.kune.platf.client.shortcuts.ShortcutDescriptor;
+import cc.kune.core.shared.dto.AccessRolDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionItem.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionItem.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionItem.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,6 +19,7 @@
\*/
package org.ourproject.kune.platf.client.actions;
+
import com.allen_sauer.gwt.log.client.Log;
/**
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,9 @@
\*/
package org.ourproject.kune.platf.client.actions;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+
import com.calclab.suco.client.events.Listener;
public class ActionMenuItemDescriptor<T> extends ActionDescriptor<T> {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,8 +21,9 @@
import java.util.HashMap;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+
import com.allen_sauer.gwt.log.client.Log;
public class ActionRegistry<T> {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonAndItemDescriptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonAndItemDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonAndItemDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,9 @@
\*/
package org.ourproject.kune.platf.client.actions;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,9 @@
\*/
package org.ourproject.kune.platf.client.actions;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,9 @@
\*/
package org.ourproject.kune.platf.client.actions;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuAndItemDescriptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuAndItemDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuAndItemDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,9 @@
\*/
package org.ourproject.kune.platf.client.actions;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuCheckItemDescriptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuCheckItemDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuCheckItemDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,9 @@
*/
package org.ourproject.kune.platf.client.actions;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+
import com.calclab.suco.client.events.Listener0;
public class ActionToolbarMenuCheckItemDescriptor<T> extends ActionToolbarMenuDescriptor<T> {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuDescriptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,9 @@
\*/
package org.ourproject.kune.platf.client.actions;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+
import com.allen_sauer.gwt.log.client.Log;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuRadioDescriptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuRadioDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuRadioDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,9 @@
*/
package org.ourproject.kune.platf.client.actions;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+
import com.calclab.suco.client.events.Listener;
public class ActionToolbarMenuRadioDescriptor<T> extends ActionToolbarMenuDescriptor<T> {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarPushButtonDescriptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarPushButtonDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarPushButtonDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,7 +1,9 @@
package org.ourproject.kune.platf.client.actions;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+
+import cc.kune.core.shared.dto.AccessRolDTO;
+
import com.calclab.suco.client.events.Listener0;
public class ActionToolbarPushButtonDescriptor<T> extends ActionToolbarButtonDescriptor<T> {
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionCollection.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionCollection.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionCollection.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,45 +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;
-
-import java.util.ArrayList;
-
-/**
- * The Class BeforeActionCollection.
- */
-public class BeforeActionCollection extends ArrayList<BeforeActionListener> {
-
- private static final long serialVersionUID = -1508664709628420137L;
-
- /**
- * Check before action listeners.
- *
- * @return true, if all listener returns true
- */
- public boolean checkBeforeAction() {
- for (BeforeActionListener listener : this) {
- if (!listener.beforeAction()) {
- return false;
- }
- }
- return true;
- }
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionListener.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionListener.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionListener.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,31 +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;
-
-public interface BeforeActionListener {
-
- /**
- * Return false to cancel the action
- *
- * @return
- */
- boolean beforeAction();
-
-}
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/common/GotoGroupAction.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/common/GotoGroupAction.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/common/GotoGroupAction.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -3,8 +3,9 @@
import org.ourproject.kune.platf.client.actions.AbstractExtendedAction;
import org.ourproject.kune.platf.client.actions.Action;
import org.ourproject.kune.platf.client.actions.ActionEvent;
-import org.ourproject.kune.platf.client.state.StateManager;
+import cc.kune.core.client.state.StateManager;
+
public class GotoGroupAction extends AbstractExtendedAction {
private final String name;
private final StateManager stateManager;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -30,6 +30,7 @@
import org.ourproject.kune.platf.client.actions.ActionToolbarPosition;
import org.ourproject.kune.platf.client.actions.ActionToolbarPushButtonDescriptor;
+
import com.allen_sauer.gwt.log.client.Log;
public class ActionToolbarPresenter<T> implements ActionToolbar<T> {
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui
___________________________________________________________________
Name: svn:ignore
+ *.swp
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComposedGuiItem.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComposedGuiItem.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComposedGuiItem.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -2,8 +2,9 @@
import java.util.List;
-import org.ourproject.kune.platf.client.errors.UIException;
+import cc.kune.core.client.errors.UIException;
+
import com.google.gwt.user.client.ui.Composite;
public abstract class AbstractComposedGuiItem extends Composite {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,6 +1,6 @@
package org.ourproject.kune.platf.client.actions.ui;
-import org.ourproject.kune.platf.client.errors.UIException;
+import cc.kune.core.client.errors.UIException;
public class MenuBinding extends GuiBindingAdapter {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemBinding.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemBinding.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemBinding.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,7 +1,8 @@
package org.ourproject.kune.platf.client.actions.ui;
-import org.ourproject.kune.platf.client.errors.UIException;
+import cc.kune.core.client.errors.UIException;
+
import com.gwtext.client.widgets.menu.Item;
public class MenuItemBinding extends GuiBindingAdapter {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuSeparatorBinding.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuSeparatorBinding.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuSeparatorBinding.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,6 +1,6 @@
package org.ourproject.kune.platf.client.actions.ui;
-import org.ourproject.kune.platf.client.errors.UIException;
+import cc.kune.core.client.errors.UIException;
public class MenuSeparatorBinding extends GuiBindingAdapter {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,12 +19,13 @@
*/
package org.ourproject.kune.platf.client.app;
-import org.ourproject.kune.platf.client.dto.InitDataDTO;
-import org.ourproject.kune.platf.client.rpc.SiteServiceAsync;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.platf.client.utils.PrefetchUtilities;
+import cc.kune.core.client.rpcservices.SiteServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.InitDataDTO;
+
import com.allen_sauer.gwt.log.client.Log;
import com.calclab.suco.client.events.Event;
import com.calclab.suco.client.events.Event0;
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapper.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapper.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapper.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,28 +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;
-
-public interface HistoryWrapper {
-
- String getToken();
-
- void newItem(final String historyToken);
-
-}
\ No newline at end of file
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapperDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapperDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapperDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,34 +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 com.google.gwt.user.client.History;
-
-public class HistoryWrapperDefault implements HistoryWrapper {
-
- public String getToken() {
- return History.getToken();
- }
-
- public void newItem(final String historyToken) {
- History.newItem(historyToken);
- }
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class AccessViolationException extends DefaultException {
- private static final long serialVersionUID = -3786772632052256999L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyGroupMemberException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyGroupMemberException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyGroupMemberException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class AlreadyGroupMemberException extends DefaultException {
- private static final long serialVersionUID = 6663958867752546481L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyUserMemberException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyUserMemberException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyUserMemberException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class AlreadyUserMemberException extends DefaultException {
- private static final long serialVersionUID = -6365615768192330492L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContainerNotPermittedException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContainerNotPermittedException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContainerNotPermittedException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class ContainerNotPermittedException extends DefaultException {
- private static final long serialVersionUID = 6866318170714609691L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotFoundException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotFoundException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class ContentNotFoundException extends DefaultException {
- private static final long serialVersionUID = -4641212341448422627L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotPermittedException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotPermittedException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotPermittedException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class ContentNotPermittedException extends DefaultException {
- private static final long serialVersionUID = 4771568826852748873L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/DefaultException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/DefaultException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/DefaultException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.errors;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-import com.google.gwt.user.client.rpc.StatusCodeException;
-
-public class DefaultException extends StatusCodeException implements IsSerializable {
-
- private static final long serialVersionUID = -6111471089427505005L;
-
- public DefaultException() {
- this(0, "");
- }
-
- public DefaultException(final int statusCode, final String message) {
- super(statusCode, message);
- }
-
- public DefaultException(final String message) {
- this(0, message);
- }
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/EmailAddressInUseException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/EmailAddressInUseException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/EmailAddressInUseException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class EmailAddressInUseException extends DefaultException {
- private static final long serialVersionUID = 3740509040361715407L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNameInUseException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNameInUseException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNameInUseException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class GroupNameInUseException extends DefaultException {
- private static final long serialVersionUID = -4746775725822225687L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNotFoundException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNotFoundException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class GroupNotFoundException extends DefaultException {
- private static final long serialVersionUID = 2358855015943550817L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/I18nNotFoundException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/I18nNotFoundException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/I18nNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class I18nNotFoundException extends DefaultException {
- private static final long serialVersionUID = -2400899465805236215L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class LastAdminInGroupException extends DefaultException {
- private static final long serialVersionUID = -8727443733339361388L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameInUseException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameInUseException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameInUseException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class NameInUseException extends DefaultException {
- private static final long serialVersionUID = 4890594846432830537L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameNotPermittedException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameNotPermittedException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameNotPermittedException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class NameNotPermittedException extends DefaultException {
- private static final long serialVersionUID = -8022844560909422614L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class NoDefaultContentException extends DefaultException {
- private static final long serialVersionUID = 7443824340580555859L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/SessionExpiredException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/SessionExpiredException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/SessionExpiredException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class SessionExpiredException extends DefaultException {
- private static final long serialVersionUID = -1603881986661302041L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class ToolNotFoundException extends DefaultException {
- private static final long serialVersionUID = 472511647264356558L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/UIException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/UIException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/UIException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,43 +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.errors;
-
-import com.allen_sauer.gwt.log.client.Log;
-
-public class UIException extends RuntimeException {
-
- private static final long serialVersionUID = -1327164226202923181L;
-
- public UIException(final String text) {
- super(text);
- Log.error(text);
- }
-
- public UIException(final String text, final Throwable cause) {
- super(text, cause);
- Log.error(text, cause);
- }
-
- public UIException(final Throwable cause) {
- super(cause);
- Log.error("UIException", cause);
- }
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/UnknownPropertyException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/UnknownPropertyException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/UnknownPropertyException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,28 +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.errors;
-
-public class UnknownPropertyException extends DefaultException {
- private static final long serialVersionUID = -5921396887476497824L;
-
- public UnknownPropertyException(final String message) {
- super(message);
- }
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserAuthException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserAuthException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserAuthException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class UserAuthException extends DefaultException {
- private static final long serialVersionUID = -8383513776573054971L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserMustBeLoggedException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserMustBeLoggedException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserMustBeLoggedException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class UserMustBeLoggedException extends DefaultException {
- private static final long serialVersionUID = -5091069990899662849L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserNotFoundException.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserNotFoundException.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.platf.client.errors;
-
-public class UserNotFoundException extends DefaultException {
- private static final long serialVersionUID = 6207713694613166661L;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListener.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListener.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListener.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.i18n;
-
-import com.google.gwt.user.client.EventListener;
-
-public interface I18nChangeListener extends EventListener {
-
- void onI18nLanguageChange();
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListenerCollection.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListenerCollection.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListenerCollection.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,42 +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.i18n;
-
-import java.util.ArrayList;
-
-/**
- * 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 = -2435290836445582410L;
-
- /**
- * Fires a locale change event to all listeners.
- *
- */
- public void fireI18nLanguageChange() {
- for (I18nChangeListener listener : this) {
- listener.onI18nLanguageChange();
- }
- }
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,137 +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.i18n;
-
-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("©", "©");
- return text;
- }
-
- 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
- */
- // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:49
- public abstract String t(final String text);
-
- /**
- * Use [%d] to reference the Integer parameters
- *
- */
- // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:50
- 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
- *
- */
- // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:50
- 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
- *
- */
- // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:50
- 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);
- }
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationServiceMocked.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationServiceMocked.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationServiceMocked.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,30 +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.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);
- }
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,235 +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.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) {
- return formatDateWithLocale(date, false);
- }
-
- public String formatDateWithLocale(final Date date, final boolean shortFormat) {
- String dateFormat = shortFormat ? currentLang.getDateFormatShort() : currentLang.getDateFormat();
-
- final DateTimeFormat fmt;
- if (dateFormat == null) {
- fmt = DateTimeFormat.getFormat("M/d/yyyy h:mm a");
- } else {
- if (shortFormat) {
- fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a");
- } else {
- final String abrevMonthInEnglish = DateTimeFormat.getFormat("MMM").format(date);
- final String monthToTranslate = abrevMonthInEnglish + " [%NT abbreviated month]";
- dateFormat = dateFormat.replaceFirst("MMM", "'" + t(monthToTranslate) + "'");
- fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a");
- }
- }
- final 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: " + caught.getMessage());
- }
-
- 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:" + caught.getMessage());
- }
-
- 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/i18n/Resources.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/Resources.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/Resources.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,5 +1,7 @@
package org.ourproject.kune.platf.client.i18n;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class Resources {
public static I18nTranslationService i18n;
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.rpc;
-
-import org.ourproject.kune.platf.client.services.ErrorHandler;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-public abstract class AsyncCallbackSimple<T> implements AsyncCallback<T> {
-
- private static ErrorHandler errorHandler;
-
- public static void init(ErrorHandler kuneErrorHandler) {
- errorHandler = kuneErrorHandler;
- }
-
- public void onFailure(final Throwable caught) {
- errorHandler.process(caught);
- }
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,88 +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.rpc;
-
-import java.util.Date;
-
-import org.ourproject.kune.platf.client.dto.CommentDTO;
-import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
-import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.dto.RateResultDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.TagCloudResultDTO;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-
-import com.google.gwt.user.client.rpc.RemoteService;
-
-public interface ContentService extends RemoteService {
-
- void addAuthor(String userHash, StateToken token, String authorShortName) throws DefaultException;
-
- CommentDTO addComment(String userHash, StateToken token, Long parentCommentId, String commentText)
- throws DefaultException;
-
- CommentDTO addComment(String userHash, StateToken token, String commentText) throws DefaultException;
-
- StateContentDTO addContent(String user, StateToken parentToken, String name, String typeId) throws DefaultException;
-
- StateContainerDTO addFolder(String hash, StateToken parentToken, String typeId, String title)
- throws DefaultException;
-
- StateContainerDTO addRoom(String user, StateToken parentToken, String name) throws DefaultException;
-
- StateContentDTO addWave(String userHash, StateToken parentToken, String waveFileType, String waveId);
-
- StateContentDTO delContent(String userHash, StateToken token) throws DefaultException;
-
- StateAbstractDTO getContent(String userHash, StateToken token) throws DefaultException;
-
- TagCloudResultDTO getSummaryTags(String userHash, StateToken groupToken) throws DefaultException;
-
- CommentDTO markCommentAsAbuse(String userHash, StateToken token, Long commentId) throws DefaultException;
-
- RateResultDTO rateContent(String userHash, StateToken token, Double value) throws DefaultException;
-
- void removeAuthor(String userHash, StateToken token, String authorShortName) throws DefaultException;
-
- StateAbstractDTO renameContainer(String userHash, StateToken token, String newName) throws DefaultException;
-
- StateAbstractDTO renameContent(String userHash, StateToken token, String newName) throws DefaultException;
-
- void save(String user, StateToken token, String content) throws DefaultException;
-
- ContentSimpleDTO setAsDefaultContent(String userHash, StateToken token);
-
- I18nLanguageDTO setLanguage(String userHash, StateToken token, String languageCode) throws DefaultException;
-
- void setPublishedOn(String userHash, StateToken token, Date date) throws DefaultException;
-
- StateAbstractDTO setStatus(String userHash, StateToken stateToken, ContentStatusDTO status);
-
- StateAbstractDTO setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status);
-
- TagCloudResultDTO setTags(String userHash, StateToken token, String tags) throws DefaultException;
-
- CommentDTO voteComment(String userHash, StateToken token, Long commentId, boolean votePositive)
- throws DefaultException;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,93 +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.rpc;
-
-import java.util.Date;
-
-import org.ourproject.kune.platf.client.dto.CommentDTO;
-import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
-import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.dto.RateResultDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.TagCloudResultDTO;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-public interface ContentServiceAsync {
-
- void addAuthor(String userHash, StateToken token, String authorShortName, AsyncCallback<Void> asyncCallback);
-
- void addComment(String userHash, StateToken token, Long parentCommentId, String commentText,
- AsyncCallback<CommentDTO> asyncCallback);
-
- void addComment(String userHash, StateToken token, String commentText, AsyncCallback<CommentDTO> asyncCallback);
-
- void addContent(String user, StateToken parentToken, String name, String typeId,
- AsyncCallback<StateContentDTO> callback);
-
- void addFolder(String hash, StateToken parentToken, String title, String typeId,
- AsyncCallback<StateContainerDTO> callback);
-
- void addRoom(String user, StateToken parentToken, String name, AsyncCallback<StateContainerDTO> callback);
-
- void addWave(String userHash, StateToken parentToken, String waveFileType, String waveId,
- AsyncCallback<StateContentDTO> asyncCallbackSimple);
-
- void delContent(String userHash, StateToken token, AsyncCallback<StateContentDTO> asyncCallback);
-
- void getContent(String user, StateToken newState, AsyncCallback<StateAbstractDTO> callback);
-
- void getSummaryTags(String userHash, StateToken groupToken, AsyncCallback<TagCloudResultDTO> asyncCallback);
-
- void markCommentAsAbuse(String userHash, StateToken token, Long commentId, AsyncCallback<CommentDTO> asyncCallback);
-
- void rateContent(String userHash, StateToken token, Double value, AsyncCallback<RateResultDTO> asyncCallback);
-
- void removeAuthor(String userHash, StateToken token, String authorShortName, AsyncCallback<Void> asyncCallback);
-
- void renameContainer(String userHash, StateToken token, String newName,
- AsyncCallback<StateAbstractDTO> asyncCallback);
-
- void renameContent(String userHash, StateToken token, String newName, AsyncCallback<StateAbstractDTO> asyncCallback);
-
- void save(String user, StateToken token, String content, AsyncCallback<Void> asyncCallback);
-
- void setAsDefaultContent(String userHash, StateToken token, AsyncCallback<ContentSimpleDTO> asyncCallback);
-
- void setLanguage(String userHash, StateToken token, String languageCode,
- AsyncCallback<I18nLanguageDTO> asyncCallback);
-
- void setPublishedOn(String userHash, StateToken token, Date publishedOn, AsyncCallback<Void> asyncCallback);
-
- void setStatus(String userHash, StateToken stateToken, ContentStatusDTO status,
- AsyncCallback<StateAbstractDTO> asyncCallback);
-
- void setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status,
- AsyncCallback<StateAbstractDTO> asyncCallback);
-
- void setTags(String userHash, StateToken token, String tags, AsyncCallback<TagCloudResultDTO> asyncCallback);
-
- void voteComment(String userHash, StateToken token, Long commentId, boolean votePositive,
- AsyncCallback<CommentDTO> asyncCallback);
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,52 +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.rpc;
-
-import org.ourproject.kune.platf.client.dto.AdmissionTypeDTO;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.dto.SocialNetworkVisibilityDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-
-import com.google.gwt.user.client.rpc.RemoteService;
-
-public interface GroupService extends RemoteService {
-
- void changeDefLicense(final String userHash, final StateToken groupToken, final LicenseDTO license);
-
- void changeGroupWsTheme(String userHash, StateToken groupToken, String theme) throws DefaultException;
-
- GroupDTO clearGroupBackImage(String userHash, StateToken token);
-
- StateToken createNewGroup(String userHash, GroupDTO group, String publicDesc, String tags, String[] enabledTools)
- throws DefaultException;
-
- GroupDTO getGroup(String userHash, StateToken token);
-
- GroupDTO setGroupBackImage(String userHash, StateToken token);
-
- void setGroupNewMembersJoiningPolicy(String userHash, StateToken groupToken, AdmissionTypeDTO admissionPolicy);
-
- void setSocialNetworkVisibility(String userHash, StateToken groupToken, SocialNetworkVisibilityDTO visibility);
-
- void setToolEnabled(String userHash, StateToken groupToken, String toolName, boolean enabled);
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,55 +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.rpc;
-
-import org.ourproject.kune.platf.client.dto.AdmissionTypeDTO;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.dto.SocialNetworkVisibilityDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-public interface GroupServiceAsync {
-
- void changeDefLicense(final String userHash, final StateToken groupToken, final LicenseDTO license,
- AsyncCallback<Void> asyncCallback);
-
- void changeGroupWsTheme(String userHash, StateToken groupToken, String theme, AsyncCallback<Void> callback);
-
- void clearGroupBackImage(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback);
-
- void createNewGroup(String userHash, GroupDTO group, String publicDesc, String tags, String[] enabledTools,
- AsyncCallback<StateToken> callback);
-
- void getGroup(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback);
-
- void setGroupBackImage(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback);
-
- void setGroupNewMembersJoiningPolicy(String userHash, StateToken groupToken, AdmissionTypeDTO admissionPolicy,
- AsyncCallback<Void> asyncCallback);
-
- void setSocialNetworkVisibility(String userHash, StateToken token, SocialNetworkVisibilityDTO visibility,
- AsyncCallback<Void> asyncCallback);
-
- void setToolEnabled(String userHash, StateToken groupToken, String toolName, boolean enabled,
- AsyncCallback<Void> asyncCallback);
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,39 +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.rpc;
-
-import java.util.HashMap;
-
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-
-import com.google.gwt.user.client.rpc.RemoteService;
-
-public interface I18nService extends RemoteService {
-
- I18nLanguageDTO getInitialLanguage(String localeParam);
-
- HashMap<String, String> getLexicon(String language);
-
- String getTranslation(String userHash, String language, String text);
-
- String setTranslation(String userHash, String id, String translation) throws DefaultException;
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nServiceAsync.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nServiceAsync.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.rpc;
-
-import java.util.HashMap;
-
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-public interface I18nServiceAsync {
-
- void getLexicon(String language, AsyncCallback<HashMap<String, String>> callback);
-
- void getTranslation(String userHash, String language, String text, AsyncCallback<String> callback);
-
- void setTranslation(String userHash, String id, String translation, AsyncCallback<String> asyncCallback);
-
- void getInitialLanguage(String localeParam, AsyncCallback<I18nLanguageDTO> callback);
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,31 +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.rpc;
-
-import org.ourproject.kune.platf.client.dto.InitDataDTO;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-
-import com.google.gwt.user.client.rpc.RemoteService;
-
-public interface SiteService extends RemoteService {
-
- InitDataDTO getInitData(String userHash) throws DefaultException;
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteServiceAsync.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteServiceAsync.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,30 +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.rpc;
-
-import org.ourproject.kune.platf.client.dto.InitDataDTO;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-public interface SiteServiceAsync {
-
- void getInitData(String userHash, AsyncCallback<InitDataDTO> callback);
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,60 +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.rpc;
-
-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.errors.DefaultException;
-
-import com.google.gwt.user.client.rpc.RemoteService;
-
-public interface SocialNetworkService extends RemoteService {
-
- SocialNetworkDataDTO acceptJoinGroup(String hash, StateToken groupToken, String groupToAcceptShortName)
- throws DefaultException;
-
- SocialNetworkDataDTO addAdminMember(String hash, StateToken groupToken, String groupToAddShortName)
- throws DefaultException;
-
- SocialNetworkDataDTO addCollabMember(String hash, StateToken groupToken, String groupToAddShortName)
- throws DefaultException;
-
- SocialNetworkDataDTO addViewerMember(String hash, StateToken groupToken, String groupToAddShortName)
- throws DefaultException;
-
- SocialNetworkDataDTO deleteMember(String hash, StateToken groupToken, String groupToDeleteShortName)
- throws DefaultException;
-
- SocialNetworkDataDTO denyJoinGroup(String hash, StateToken groupToken, String groupToDenyShortName)
- throws DefaultException;
-
- SocialNetworkDataDTO getSocialNetwork(String hash, StateToken groupToken) throws DefaultException;
-
- SocialNetworkRequestResult requestJoinGroup(String hash, StateToken groupToken) throws DefaultException;
-
- SocialNetworkDataDTO setAdminAsCollab(String hash, StateToken groupToken, String groupToSetCollabShortName)
- throws DefaultException;
-
- SocialNetworkDataDTO setCollabAsAdmin(String hash, StateToken groupToken, String groupToSetAdminShortName)
- throws DefaultException;
-
- SocialNetworkDataDTO unJoinGroup(String hash, StateToken groupToken) throws DefaultException;
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkServiceAsync.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkServiceAsync.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,59 +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.rpc;
-
-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 com.google.gwt.user.client.rpc.AsyncCallback;
-
-public interface SocialNetworkServiceAsync {
-
- void acceptJoinGroup(String hash, StateToken groupToken, String groupToAcceptShortName,
- AsyncCallback<SocialNetworkDataDTO> callback);
-
- void addAdminMember(String hash, StateToken groupToken, String groupToAddShortName,
- AsyncCallback<SocialNetworkDataDTO> callback);
-
- void addCollabMember(String hash, StateToken groupToken, String groupToAddShortName,
- AsyncCallback<SocialNetworkDataDTO> callback);
-
- void addViewerMember(String hash, StateToken groupToken, String groupToAddShortName,
- AsyncCallback<SocialNetworkDataDTO> callback);
-
- void deleteMember(String hash, StateToken groupToken, String groupToDeleteShortName,
- AsyncCallback<SocialNetworkDataDTO> callback);
-
- void denyJoinGroup(String hash, StateToken groupToken, String groupToDenyShortName,
- AsyncCallback<SocialNetworkDataDTO> callback);
-
- void getSocialNetwork(String hash, StateToken groupToken, AsyncCallback<SocialNetworkDataDTO> callback);
-
- void requestJoinGroup(String hash, StateToken groupToken, AsyncCallback<SocialNetworkRequestResult> callback);
-
- void setAdminAsCollab(String hash, StateToken groupToken, String groupToSetCollabShortName,
- AsyncCallback<SocialNetworkDataDTO> callback);
-
- void setCollabAsAdmin(String hash, StateToken groupToken, String groupToSetAdminShortName,
- AsyncCallback<SocialNetworkDataDTO> callback);
-
- void unJoinGroup(String hash, StateToken groupToken, AsyncCallback<SocialNetworkDataDTO> callback);
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.rpc;
-
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.UserBuddiesVisibilityDTO;
-import org.ourproject.kune.platf.client.dto.UserDTO;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-
-import com.google.gwt.user.client.rpc.RemoteService;
-
-public interface UserService extends RemoteService {
-
- UserInfoDTO createUser(UserDTO user, boolean wantPersonalHomepage) throws DefaultException;
-
- String getUserAvatarBaser64(String userHash, StateToken userToken) throws DefaultException;
-
- UserInfoDTO login(String nickOrEmail, String passwd) throws DefaultException;
-
- void logout(String userHash) throws DefaultException;
-
- void onlyCheckSession(String userHash) throws DefaultException;
-
- UserInfoDTO reloadUserInfo(String userHash) throws DefaultException;
-
- void setBuddiesVisibility(String userHash, StateToken groupToken, UserBuddiesVisibilityDTO visibility);
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserServiceAsync.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserServiceAsync.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -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.rpc;
-
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.UserBuddiesVisibilityDTO;
-import org.ourproject.kune.platf.client.dto.UserDTO;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-public interface UserServiceAsync {
-
- void createUser(UserDTO user, boolean wantPersonalHomepage, AsyncCallback<UserInfoDTO> asyncCallback);
-
- void getUserAvatarBaser64(String userHash, StateToken userToken, AsyncCallback<String> asyncCallback);
-
- void login(String nickOrEmail, String passwd, AsyncCallback<UserInfoDTO> asyncCallback);
-
- void logout(String userHash, AsyncCallback<Void> asyncCallback);
-
- void onlyCheckSession(String userHash, AsyncCallback<Void> asyncCallback);
-
- void reloadUserInfo(String userHash, AsyncCallback<UserInfoDTO> asyncCallback);
-
- void setBuddiesVisibility(String userHash, StateToken groupToken, UserBuddiesVisibilityDTO visibility,
- AsyncCallback<Void> asyncCallback);
-
-}
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/CoreModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/CoreModule.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/CoreModule.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,35 +21,30 @@
import org.ourproject.kune.platf.client.app.ApplicationComponentGroup;
import org.ourproject.kune.platf.client.app.GroupOptionsCollection;
-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.app.UserOptionsCollection;
-import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
-import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
-import org.ourproject.kune.platf.client.rpc.I18nService;
-import org.ourproject.kune.platf.client.rpc.I18nServiceAsync;
-import org.ourproject.kune.platf.client.rpc.SiteService;
-import org.ourproject.kune.platf.client.rpc.SiteServiceAsync;
-import org.ourproject.kune.platf.client.rpc.UserService;
-import org.ourproject.kune.platf.client.rpc.UserServiceAsync;
-import org.ourproject.kune.platf.client.state.ContentProvider;
-import org.ourproject.kune.platf.client.state.ContentProviderDefault;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.SessionDefault;
-import org.ourproject.kune.platf.client.state.StateManager;
-import org.ourproject.kune.platf.client.state.StateManagerDefault;
import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageGroup;
import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkGroup;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaGroup;
import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharGroup;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.I18nService;
+import cc.kune.core.client.rpcservices.I18nServiceAsync;
+import cc.kune.core.client.rpcservices.SiteService;
+import cc.kune.core.client.rpcservices.SiteServiceAsync;
+import cc.kune.core.client.rpcservices.UserService;
+import cc.kune.core.client.rpcservices.UserServiceAsync;
+import cc.kune.core.client.state.ContentProvider;
+import cc.kune.core.client.state.HistoryWrapper;
+import cc.kune.core.client.state.HistoryWrapperDefault;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.decorator.Singleton;
import com.calclab.suco.client.ioc.module.Factory;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.Cookies;
-import com.google.gwt.user.client.History;
import com.google.gwt.user.client.rpc.ServiceDefTarget;
public class CoreModule extends AbstractExtendedModule {
@@ -66,7 +61,10 @@
register(Singleton.class, new Factory<Session>(Session.class) {
@Override
public Session create() {
- return new SessionDefault(Cookies.getCookie(Session.USERHASH), p(UserServiceAsync.class));
+ return null;
+ // return new
+ // SessionDefault(Cookies.getCookie(Session.USERHASH),
+ // p(UserServiceAsync.class));
}
}, new Factory<I18nServiceAsync>(I18nServiceAsync.class) {
@Override
@@ -94,9 +92,11 @@
register(Singleton.class, new Factory<I18nUITranslationService>(I18nUITranslationService.class) {
@Override
public I18nUITranslationService create() {
- final I18nUITranslationService i18n = new I18nUITranslationService();
- i18n.init(i(I18nServiceAsync.class), i(Session.class), onI18nReady);
- return i18n;
+ // final I18nUITranslationService i18n = new
+ // I18nUITranslationService();
+ // i18n.init(i(I18nServiceAsync.class), i(Session.class),
+ // onI18nReady);
+ return null; // i18n;
}
});
@@ -110,15 +110,17 @@
}, new Factory<ContentProvider>(ContentProvider.class) {
@Override
public ContentProvider create() {
- return new ContentProviderDefault(i(ContentServiceAsync.class));
+ return null; // new
+ // ContentProviderDefault(i(ContentServiceAsync.class));
}
}, new Factory<StateManager>(StateManager.class) {
@Override
public StateManager create() {
- final StateManagerDefault stateManager = new StateManagerDefault(i(ContentProvider.class),
- i(Session.class), i(HistoryWrapper.class));
- History.addValueChangeHandler(stateManager);
- return stateManager;
+ // final StateManagerDefault stateManager = new
+ // StateManagerDefault(i(ContentProvider.class),
+ // i(Session.class), i(HistoryWrapper.class));
+ // History.addValueChangeHandler(stateManager);
+ return null;
}
});
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/services/ErrorHandler.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/ErrorHandler.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/ErrorHandler.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,129 +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 org.ourproject.kune.platf.client.errors.AccessViolationException;
-import org.ourproject.kune.platf.client.errors.AlreadyGroupMemberException;
-import org.ourproject.kune.platf.client.errors.AlreadyUserMemberException;
-import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException;
-import org.ourproject.kune.platf.client.errors.ContentNotFoundException;
-import org.ourproject.kune.platf.client.errors.ContentNotPermittedException;
-import org.ourproject.kune.platf.client.errors.GroupNotFoundException;
-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;
-
-import com.allen_sauer.gwt.log.client.Log;
-import com.calclab.suco.client.events.Event0;
-import com.calclab.suco.client.events.Listener0;
-import com.calclab.suco.client.ioc.Provider;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException;
-
-public class ErrorHandler {
- private final Session session;
- private final I18nTranslationService i18n;
- private final Event0 onSessionExpired;
- private final Provider<StateManager> stateManagerProvider;
-
- public ErrorHandler(final Session session, final I18nTranslationService i18n,
- final Provider<StateManager> stateManagerProvider) {
- this.session = session;
- this.i18n = i18n;
- this.stateManagerProvider = stateManagerProvider;
- this.onSessionExpired = new Event0("onSessionExpired");
- }
-
- public void doSessionExpired() {
- onSessionExpired.fire();
- NotifyUser.info("Your session has expired. Please log in again.");
- }
-
- public void onSessionExpired(final Listener0 listener) {
- onSessionExpired.add(listener);
- }
-
- public void process(final Throwable caught) {
- NotifyUser.hideProgress();
- if (caught instanceof AccessViolationException) {
- logException(caught);
- NotifyUser.error(i18n.t("You do not have rights to perform that action"));
- } else if (caught instanceof SessionExpiredException) {
- logException(caught);
- doSessionExpired();
- } else if (caught instanceof UserMustBeLoggedException) {
- logException(caught);
- if (session.isLogged()) {
- doSessionExpired();
- } else {
- NotifyUser.important(i18n.t("Please sign in or register to collaborate"));
- }
- } else if (caught instanceof GroupNotFoundException) {
- logException(caught);
- NotifyUser.veryImportant(i18n.t("Group not found"));
- stateManagerProvider.get().gotoToken("");
- } else if (caught instanceof IncompatibleRemoteServiceException) {
- NotifyUser.error(i18n.t("Your browser is outdated with the server software. Please reload this page."));
- } else if (caught instanceof ContentNotFoundException) {
- logException(caught);
- NotifyUser.veryImportant(i18n.t("Content not found"));
- stateManagerProvider.get().gotoToken("");
- } else if (caught instanceof ContentNotPermittedException) {
- logException(caught);
- NotifyUser.error(i18n.t("Action not permitted in this location"));
- stateManagerProvider.get().gotoToken("");
- } else if (caught instanceof ContainerNotPermittedException) {
- logException(caught);
- NotifyUser.error(i18n.t("Action not permitted in this location"));
- stateManagerProvider.get().gotoToken("");
- } else if (caught instanceof LastAdminInGroupException) {
- logException(caught);
- NotifyUser.showAlertMessage(i18n.t("Warning"), i18n.t("Sorry, you are the last admin of this group."
- + " Look for someone to substitute you appropriately as admin before leaving this group."));
- } else if (caught instanceof AlreadyGroupMemberException) {
- logException(caught);
- NotifyUser.error(i18n.t("This group is already a group member"));
- } else if (caught instanceof AlreadyUserMemberException) {
- logException(caught);
- NotifyUser.error(i18n.t("This user is already a group member"));
- } else {
- logException(caught, true);
- NotifyUser.error(i18n.t("Error performing operation"));
- GWT.log("Other kind of exception in StateManagerDefault/processErrorException", caught);
- }
- }
-
- private void logException(final Throwable caught) {
- logException(caught, false);
- }
-
- private void logException(final Throwable caught, final boolean showException) {
- if (showException) {
- Log.debug("Exception in KuneErrorHandler", caught);
- } else {
- Log.debug("Exception in KuneErrorHandler: " + caught.getMessage());
- }
- }
-
-}
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -25,15 +25,8 @@
import org.ourproject.kune.platf.client.app.ApplicationComponentGroup;
import org.ourproject.kune.platf.client.app.ApplicationDefault;
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.i18n.Resources;
-import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
-import org.ourproject.kune.platf.client.rpc.SiteServiceAsync;
import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister;
-import org.ourproject.kune.platf.client.state.AccessRightsClientManager;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.ui.QuickTipsHelper;
import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
@@ -106,6 +99,14 @@
import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
import org.ourproject.kune.platf.client.utils.TimerWrapper;
+import cc.kune.core.client.errors.ErrorHandler;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.SiteServiceAsync;
+import cc.kune.core.client.state.AccessRightsClientManager;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.decorator.NoDecoration;
import com.calclab.suco.client.ioc.decorator.Singleton;
import com.calclab.suco.client.ioc.module.Factory;
@@ -159,7 +160,7 @@
register(Singleton.class, new Factory<ErrorHandler>(ErrorHandler.class) {
@Override
public ErrorHandler create() {
- return new ErrorHandler(i(Session.class), i18n, p(StateManager.class));
+ return null; // new ErrorHandler(i(Session.class), i18n, p(StateManager.class));
}
});
@@ -175,7 +176,7 @@
}
});
- AsyncCallbackSimple.init(i(ErrorHandler.class));
+ //AsyncCallbackSimple.init(i(ErrorHandler.class));
register(Singleton.class, new Factory<Application>(Application.class) {
@Override
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -5,8 +5,9 @@
import org.ourproject.kune.platf.client.actions.ActionDescriptor;
import org.ourproject.kune.platf.client.actions.ActionItem;
import org.ourproject.kune.platf.client.actions.KeyStroke;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+
import com.allen_sauer.gwt.log.client.Log;
import com.calclab.suco.client.events.Listener0;
import com.google.gwt.dom.client.NativeEvent;
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/AccessRightsClientManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/state/AccessRightsClientManager.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/state/AccessRightsClientManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,31 +0,0 @@
-package org.ourproject.kune.platf.client.state;
-
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-
-import com.calclab.suco.client.events.Event2;
-import com.calclab.suco.client.events.Listener;
-import com.calclab.suco.client.events.Listener2;
-
-public class AccessRightsClientManager {
- private AccessRightsDTO previousRights;
- private final Event2<AccessRightsDTO, AccessRightsDTO> onRightsChanged;
-
- public AccessRightsClientManager(final StateManager stateManager) {
- this.previousRights = null;
- this.onRightsChanged = new Event2<AccessRightsDTO, AccessRightsDTO>("onRightsChanged");
- stateManager.onStateChanged(new Listener<StateAbstractDTO>() {
- public void onEvent(final StateAbstractDTO newState) {
- final AccessRightsDTO rights = newState.getGroupRights();
- if (!rights.equals(previousRights)) {
- onRightsChanged.fire(previousRights, rights);
- previousRights = rights;
- }
- }
- });
- }
-
- public void onRightsChanged(final Listener2<AccessRightsDTO, AccessRightsDTO> listener) {
- onRightsChanged.add(listener);
- }
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProvider.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProvider.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProvider.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,33 +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.state;
-
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-public interface ContentProvider {
-
- void cache(StateToken encodeState, StateAbstractDTO content);
-
- void getContent(String user, StateToken newState, AsyncCallback<StateAbstractDTO> callback);
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,59 +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.state;
-
-import java.util.HashMap;
-
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
-import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-public class ContentProviderDefault implements ContentProvider {
-
- private final ContentServiceAsync server;
- private final HashMap<StateToken, StateAbstractDTO> cache;
-
- public ContentProviderDefault(final ContentServiceAsync server) {
- this.server = server;
- this.cache = new HashMap<StateToken, StateAbstractDTO>();
- }
-
- public void cache(final StateToken encodeState, final StateAbstractDTO content) {
- cache.put(encodeState, content);
- }
-
- public void getContent(final String user, final StateToken newState, final AsyncCallback<StateAbstractDTO> callback) {
- NotifyUser.showProgressLoading();
- final StateAbstractDTO catched = getCached(newState);
- if (catched != null) {
- callback.onSuccess(catched);
- } else {
- server.getContent(user, newState, callback);
- }
- }
-
- private StateAbstractDTO getCached(final StateToken newState) {
- return cache.remove(newState);
- }
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,154 +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/>.
- *
- */
-/*
- *
- * This file is part of kune.
- * Copyright (C) 2007-2009 The kune development team (see CREDITS for details)
- *
- * 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.state;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.ourproject.kune.platf.client.dto.I18nCountryDTO;
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.dto.I18nLanguageSimpleDTO;
-import org.ourproject.kune.platf.client.dto.InitDataDTO;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.ToolSimpleDTO;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.dto.UserSimpleDTO;
-import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
-
-import com.calclab.suco.client.events.Listener;
-import com.calclab.suco.client.events.Listener0;
-
-public interface Session {
-
- /**
- * Duration remembering login: 2 weeks
- */
- int SESSION_DURATION = 1000 * 60 * 60 * 24 * 14;
-
- String USERHASH = "userHash";
-
- void check(AsyncCallbackSimple<Void> callback);
-
- StateContainerDTO getContainerState();
-
- StateContentDTO getContentState();
-
- List<I18nCountryDTO> getCountries();
-
- Object[][] getCountriesArray();
-
- String getCurrentCCversion();
-
- String getCurrentGroupShortName();
-
- I18nLanguageDTO getCurrentLanguage();
-
- StateAbstractDTO getCurrentState();
-
- StateToken getCurrentStateToken();
-
- UserSimpleDTO getCurrentUser();
-
- UserInfoDTO getCurrentUserInfo();
-
- LicenseDTO getDefLicense();
-
- String getGalleryPermittedExtensions();
-
- Collection<ToolSimpleDTO> getGroupTools();
-
- int getImgCropsize();
-
- int getImgIconsize();
-
- int getImgResizewidth();
-
- int getImgThumbsize();
-
- InitDataDTO getInitData();
-
- List<I18nLanguageSimpleDTO> getLanguages();
-
- Object[][] getLanguagesArray();
-
- List<LicenseDTO> getLicenses();
-
- boolean getShowDeletedContent();
-
- String getSiteUrl();
-
- Object[][] getTimezones();
-
- String getUserHash();
-
- Collection<ToolSimpleDTO> getUserTools();
-
- boolean inSameToken(StateToken token);
-
- boolean isCurrentStateAContent();
-
- boolean isCurrentStateAGroup();
-
- boolean isInCurrentUserSpace();
-
- boolean isLogged();
-
- boolean isNotLogged();
-
- void onInitDataReceived(Listener<InitDataDTO> listener);
-
- void onUserSignIn(Listener<UserInfoDTO> listener);
-
- void onUserSignOut(Listener0 listener);
-
- void setCurrentLanguage(final I18nLanguageDTO currentLanguage);
-
- void setCurrentState(final StateAbstractDTO currentState);
-
- void setCurrentUserInfo(UserInfoDTO currentUserInfo);
-
- void setInitData(InitDataDTO initData);
-
- void setUserHash(String userHash);
-
-}
\ No newline at end of file
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,292 +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.state;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.ourproject.kune.platf.client.dto.I18nCountryDTO;
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.dto.I18nLanguageSimpleDTO;
-import org.ourproject.kune.platf.client.dto.InitDataDTO;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.ToolSimpleDTO;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.dto.UserSimpleDTO;
-import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
-import org.ourproject.kune.platf.client.rpc.UserServiceAsync;
-
-import com.allen_sauer.gwt.log.client.Log;
-import com.calclab.suco.client.events.Event;
-import com.calclab.suco.client.events.Event0;
-import com.calclab.suco.client.events.Listener;
-import com.calclab.suco.client.events.Listener0;
-import com.calclab.suco.client.ioc.Provider;
-import com.google.gwt.core.client.GWT;
-
-public class SessionDefault implements Session {
- private String userHash;
- private InitDataDTO initData;
- private UserInfoDTO currentUserInfo;
- private Object[][] languagesArray;
- private Object[][] countriesArray;
- private Object[][] timezonesArray;
- private StateAbstractDTO currentState;
- private I18nLanguageDTO currentLanguage;
- private final Event<InitDataDTO> onInitDataReceived;
- private final Event<UserInfoDTO> onUserSignIn;
- private final Event0 onUserSignOut;
- private final Provider<UserServiceAsync> userServiceProvider;
-
- public SessionDefault(final String userHash, final Provider<UserServiceAsync> userServiceProvider) {
- this.userHash = userHash == null || userHash.equals("null") ? null : userHash;
- this.userServiceProvider = userServiceProvider;
- languagesArray = null;
- this.onInitDataReceived = new Event<InitDataDTO>("initDataReceived");
- this.onUserSignIn = new Event<UserInfoDTO>("onUserSignIn");
- this.onUserSignOut = new Event0("onUserSignOut");
- }
-
- public void check(final AsyncCallbackSimple<Void> callback) {
- Log.debug("Checking session (userhash: " + getUserHash() + ")");
- userServiceProvider.get().onlyCheckSession(getUserHash(), callback);
- }
-
- public StateContainerDTO getContainerState() {
- return (StateContainerDTO) currentState;
- }
-
- public StateContentDTO getContentState() {
- return (StateContentDTO) currentState;
- }
-
- public List<I18nCountryDTO> getCountries() {
- return initData.getCountries();
- }
-
- public Object[][] getCountriesArray() {
- if (countriesArray == null) {
- countriesArray = mapCountries();
- }
- return countriesArray;
- }
-
- public String getCurrentCCversion() {
- return initData.getCurrentCCversion();
- }
-
- public String getCurrentGroupShortName() {
- return currentState == null ? null : currentState.getStateToken().getGroup();
- }
-
- public I18nLanguageDTO getCurrentLanguage() {
- return currentLanguage;
- }
-
- public StateAbstractDTO getCurrentState() {
- return currentState;
- }
-
- public StateToken getCurrentStateToken() {
- return currentState == null ? null : currentState.getStateToken();
- }
-
- public UserSimpleDTO getCurrentUser() {
- return currentUserInfo == null ? null : currentUserInfo.getUser();
- }
-
- public UserInfoDTO getCurrentUserInfo() {
- return currentUserInfo;
- }
-
- public LicenseDTO getDefLicense() {
- return initData.getDefaultLicense();
- }
-
- public String getGalleryPermittedExtensions() {
- return initData.getGalleryPermittedExtensions();
- }
-
- public Collection<ToolSimpleDTO> getGroupTools() {
- return initData.getGroupTools();
- }
-
- public int getImgCropsize() {
- return initData.getImgCropsize();
- }
-
- public int getImgIconsize() {
- return initData.getImgIconsize();
- }
-
- public int getImgResizewidth() {
- return initData.getImgResizewidth();
- }
-
- public int getImgThumbsize() {
- return initData.getImgThumbsize();
- }
-
- public InitDataDTO getInitData() {
- return initData;
- }
-
- public List<I18nLanguageSimpleDTO> getLanguages() {
- return initData.getLanguages();
- }
-
- public Object[][] getLanguagesArray() {
- if (languagesArray == null) {
- languagesArray = mapLangs();
- }
- return languagesArray;
- }
-
- public List<LicenseDTO> getLicenses() {
- return initData.getLicenses();
- }
-
- public boolean getShowDeletedContent() {
- return currentUserInfo == null ? false : currentUserInfo.getShowDeletedContent();
- }
-
- public String getSiteUrl() {
- final String baseURL = GWT.getModuleBaseURL();
- return baseURL.substring(0, baseURL.lastIndexOf("/" + GWT.getModuleName()));
- }
-
- public Object[][] getTimezones() {
- if (timezonesArray == null) {
- mapTimezones();
- }
- return timezonesArray;
- }
-
- public String getUserHash() {
- return userHash;
- }
-
- public Collection<ToolSimpleDTO> getUserTools() {
- return initData.getUserTools();
- }
-
- public boolean inSameToken(final StateToken token) {
- return getCurrentStateToken().equals(token);
- }
-
- public boolean isCurrentStateAContent() {
- return currentState instanceof StateContentDTO;
- }
-
- public boolean isCurrentStateAGroup() {
- return currentState == null ? false : !currentState.getGroup().isPersonal();
- }
-
- public boolean isInCurrentUserSpace() {
- if (!isLogged()) {
- return false;
- }
- if (getCurrentStateToken().getGroup().equals(getCurrentUser().getShortName())) {
- return true;
- }
- return false;
- }
-
- public boolean isLogged() {
- return userHash != null;
- }
-
- public boolean isNotLogged() {
- return !isLogged();
- }
-
- public void onInitDataReceived(final Listener<InitDataDTO> listener) {
- onInitDataReceived.add(listener);
- }
-
- public void onUserSignIn(final Listener<UserInfoDTO> listener) {
- onUserSignIn.add(listener);
- }
-
- public void onUserSignOut(final Listener0 listener) {
- onUserSignOut.add(listener);
- }
-
- public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) {
- this.currentLanguage = currentLanguage;
- }
-
- public void setCurrentState(final StateAbstractDTO currentState) {
- this.currentState = currentState;
- }
-
- public void setCurrentUserInfo(final UserInfoDTO currentUserInfo) {
- this.currentUserInfo = currentUserInfo;
- if (currentUserInfo != null) {
- onUserSignIn.fire(currentUserInfo);
- } else {
- onUserSignOut.fire();
- }
- }
-
- public void setInitData(final InitDataDTO initData) {
- this.initData = initData;
- onInitDataReceived.fire(initData);
- }
-
- public void setUserHash(final String userHash) {
- this.userHash = userHash;
- }
-
- private Object[][] mapCountries() {
- assert (initData != null);
- final Object[][] objs = new Object[initData.getCountries().size()][1];
- int i = 0;
- for (final I18nCountryDTO country : initData.getCountries()) {
- final Object[] obj = new Object[] { country.getCode(), country.getEnglishName() };
- objs[i++] = obj;
- }
- return objs;
- }
-
- private Object[][] mapLangs() {
- assert (initData != null);
- final Object[][] objs = new Object[initData.getLanguages().size()][1];
- int i = 0;
- for (final I18nLanguageSimpleDTO language : initData.getLanguages()) {
- final Object[] obj = new Object[] { language.getCode(), language.getEnglishName() };
- objs[i++] = obj;
- }
- return objs;
- }
-
- private void mapTimezones() {
- assert (initData != null);
- timezonesArray = new Object[initData.getTimezones().length][1];
- for (int i = 0; i < getTimezones().length; i++) {
- final Object[] obj = new Object[] { initData.getTimezones()[i] };
- timezonesArray[i] = obj;
- }
- }
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,63 +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.state;
-
-import org.ourproject.kune.platf.client.actions.BeforeActionListener;
-import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-
-import com.calclab.suco.client.events.Listener;
-import com.calclab.suco.client.events.Listener0;
-import com.calclab.suco.client.events.Listener2;
-
-public interface StateManager {
-
- void addBeforeStateChangeListener(BeforeActionListener listener);
-
- void addSiteToken(String token, Listener0 whenToken);
-
- void gotoToken(StateToken newToken);
-
- void gotoToken(String newToken);
-
- void onGroupChanged(Listener2<String, String> listener);
-
- void onSocialNetworkChanged(Listener<StateAbstractDTO> listener);
-
- void onStateChanged(Listener<StateAbstractDTO> listener);
-
- void onToolChanged(Listener2<String, String> listener);
-
- void reload();
-
- void removeBeforeStateChangeListener(BeforeActionListener listener);
-
- void removeSiteToken(String token);
-
- void restorePreviousToken();
-
- void resumeTokenChange();
-
- void setRetrievedState(StateAbstractDTO state);
-
- void setSocialNetwork(SocialNetworkDataDTO socialNet);
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,231 +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.state;
-
-import java.util.HashMap;
-
-import org.ourproject.kune.platf.client.actions.BeforeActionCollection;
-import org.ourproject.kune.platf.client.actions.BeforeActionListener;
-import org.ourproject.kune.platf.client.app.HistoryWrapper;
-import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
-import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
-
-import com.allen_sauer.gwt.log.client.Log;
-import com.calclab.suco.client.events.Event;
-import com.calclab.suco.client.events.Event2;
-import com.calclab.suco.client.events.Listener;
-import com.calclab.suco.client.events.Listener0;
-import com.calclab.suco.client.events.Listener2;
-import com.google.gwt.event.logical.shared.ValueChangeEvent;
-import com.google.gwt.event.logical.shared.ValueChangeHandler;
-
-public class StateManagerDefault implements StateManager, ValueChangeHandler<String> {
- private final ContentProvider contentProvider;
- private StateToken previousToken;
- /**
- * When a historyChanged is interrupted (for instance because you are
- * editing something), the new token is stored here
- */
- private StateToken resumedToken;
- private final Session session;
- private final HistoryWrapper history;
- private final HashMap<String, Listener0> siteTokens;
- private final Event<StateAbstractDTO> onStateChanged;
- private final Event<StateAbstractDTO> onSocialNetworkChanged;
- private final Event2<String, String> onToolChanged;
- private final Event2<String, String> onGroupChanged;
- private final BeforeActionCollection beforeStateChangeCollection;
-
- public StateManagerDefault(final ContentProvider contentProvider, final Session session,
- final HistoryWrapper history) {
- this.contentProvider = contentProvider;
- this.session = session;
- this.history = history;
- this.previousToken = null;
- this.resumedToken = null;
- this.onStateChanged = new Event<StateAbstractDTO>("onStateChanged");
- this.onGroupChanged = new Event2<String, String>("onGroupChanged");
- this.onToolChanged = new Event2<String, String>("onToolChanged");
- this.onSocialNetworkChanged = new Event<StateAbstractDTO>("onSocialNetworkChanged");
- session.onUserSignIn(new Listener<UserInfoDTO>() {
- public void onEvent(final UserInfoDTO parameter) {
- if (previousToken == null) {
- // starting up
- reload();
- } else {
- // do nothing, SigInPresent calls goto;
- }
- }
- });
- session.onUserSignOut(new Listener0() {
- public void onEvent() {
- reload();
- }
- });
- siteTokens = new HashMap<String, Listener0>();
- beforeStateChangeCollection = new BeforeActionCollection();
- }
-
- public void addBeforeStateChangeListener(final BeforeActionListener listener) {
- beforeStateChangeCollection.add(listener);
- }
-
- public void addSiteToken(final String token, final Listener0 listener) {
- siteTokens.put(token, listener);
- }
-
- public void gotoToken(final StateToken newToken) {
- Log.debug("StateManager: history goto-token newItem (" + newToken + ")");
- history.newItem(newToken.getEncoded());
- }
-
- public void gotoToken(final String token) {
- gotoToken(new StateToken(token));
- }
-
- public void onGroupChanged(final Listener2<String, String> listener) {
- onGroupChanged.add(listener);
- }
-
- public void onSocialNetworkChanged(final Listener<StateAbstractDTO> listener) {
- onSocialNetworkChanged.add(listener);
- }
-
- public void onStateChanged(final Listener<StateAbstractDTO> listener) {
- onStateChanged.add(listener);
- }
-
- public void onToolChanged(final Listener2<String, String> listener) {
- onToolChanged.add(listener);
- }
-
- public void onValueChange(final ValueChangeEvent<String> event) {
- onHistoryChanged(event.getValue());
- }
-
- /**
- * <p>
- * Reload current state (using client cache if available)
- * </p>
- */
- public void reload() {
- onHistoryChanged(history.getToken());
- }
-
- public void removeBeforeStateChangeListener(final BeforeActionListener listener) {
- beforeStateChangeCollection.remove(listener);
- }
-
- public void removeSiteToken(final String token) {
- siteTokens.remove(token);
- }
-
- public void restorePreviousToken() {
- gotoToken(previousToken);
- }
-
- public void resumeTokenChange() {
- if (resumedToken != null) {
- reload();
- gotoToken(resumedToken);
- clearResumedToken();
- }
- }
-
- public void setRetrievedState(final StateAbstractDTO newState) {
- contentProvider.cache(newState.getStateToken(), newState);
- // setState(newState);
- history.newItem(newState.getStateToken().toString());
- }
-
- public void setSocialNetwork(final SocialNetworkDataDTO socialNet) {
- StateAbstractDTO state;
- if (session != null && (state = session.getCurrentState()) != null) {
- // After a SN operation, usually returns a SocialNetworkResultDTO
- // with new SN data and we refresh the state
- // to avoid to reload() again the state
- state.setSocialNetworkData(socialNet);
- onSocialNetworkChanged.fire(state);
- }
- }
-
- void onHistoryChanged(final String historyToken) {
- // http://code.google.com/p/google-web-toolkit-doc-1-5/wiki/DevGuideHistory
- if (beforeStateChangeCollection.checkBeforeAction()) {
- final Listener0 tokenListener = siteTokens.get(historyToken);
- Log.debug("StateManager: history token changed (" + historyToken + ")");
- if (tokenListener == null) {
- // Ok, normal token change
- onHistoryChanged(new StateToken(historyToken));
- } else {
- // token is one of #newgroup #signin #translate ...
- if (previousToken == null) {
- // Starting with some token like "signin": load defContent
- // also
- onHistoryChanged("");
- }
- tokenListener.onEvent();
- }
- } else {
- resumedToken = new StateToken(historyToken);
- }
- }
-
- void setState(final StateAbstractDTO newState) {
- session.setCurrentState(newState);
- onStateChanged.fire(newState);
- NotifyUser.hideProgress();
- checkGroupAndToolChange(newState);
- previousToken = newState.getStateToken();
-
- }
-
- private void checkGroupAndToolChange(final StateAbstractDTO newState) {
- final String previousGroup = previousToken == null ? "" : previousToken.getGroup();
- final String newGroup = newState.getStateToken().getGroup();
- final String previousTokenTool = previousToken == null ? "" : previousToken.getTool();
- final String newTokenTool = newState.getStateToken().getTool();
- final String previousToolName = previousTokenTool == null ? "" : previousTokenTool;
- final String newToolName = newTokenTool == null ? "" : newTokenTool;
-
- if (previousToken == null || previousToolName == null || !previousToolName.equals(newToolName)) {
- onToolChanged.fire(previousToolName, newToolName);
- }
- if (previousToken == null || !previousGroup.equals(newGroup)) {
- onGroupChanged.fire(previousGroup, newGroup);
- }
- }
-
- private void clearResumedToken() {
- resumedToken = null;
- }
-
- private void onHistoryChanged(final StateToken newState) {
- contentProvider.getContent(session.getUserHash(), newState, new AsyncCallbackSimple<StateAbstractDTO>() {
- public void onSuccess(final StateAbstractDTO newState) {
- setState(newState);
- }
- });
- }
-}
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,9 @@
*/
package org.ourproject.kune.platf.client.ui;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.gwtext.client.core.Connection;
import com.gwtext.client.core.UrlParam;
import com.gwtext.client.data.FieldDef;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,6 +19,8 @@
*/
package org.ourproject.kune.platf.client.ui;
+import cc.kune.core.client.utils.TextUtils;
+
/**
* Use TextUtils
*
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,148 +0,0 @@
-/*
- * Copyright 2006 Robert Hanson <iamroberthanson AT gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- \*/
-package org.ourproject.kune.platf.client.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class Location {
- private String hash;
- private String host;
- private String hostName;
- private String href;
- private String path;
- private String port;
- private String protocol;
- private String queryString;
- private HashMap<String, String> paramMap;
-
- /**
- * sample: #site.docs.3.1
- **/
- public String getHash() {
- return hash;
- }
-
- /**
- * sample: locahost:8080
- *
- * @return
- */
- public String getHost() {
- return host;
- }
-
- /**
- * sample: locahost
- *
- * @return
- */
- public String getHostName() {
- return hostName;
- }
-
- /**
- * sample: http://localhost:8080/ws/#site.docs.3.1?locale=en&log_level=INFO
- **/
- public String getHref() {
- return href;
- }
-
- public String getParameter(final String name) {
- return paramMap.get(name);
- }
-
- public Map<String, String> getParameterMap() {
- return paramMap;
- }
-
- /**
- * sample: /ws/
- *
- * @return
- */
- public String getPath() {
- return path;
- }
-
- public String getPort() {
- return port;
- }
-
- public String getProtocol() {
- return protocol;
- }
-
- /**
- * sample: ?locale=en&log_level=INFO
- *
- * @return
- */
- public String getQueryString() {
- return queryString;
- }
-
- protected void setHash(final String hash) {
- this.hash = hash;
- }
-
- protected void setHost(final String host) {
- this.host = host;
- }
-
- protected void setHostName(final String hostName) {
- this.hostName = hostName;
- }
-
- protected void setHref(final String href) {
- this.href = href;
- }
-
- protected void setPath(final String path) {
- this.path = path;
- }
-
- protected void setPort(final String port) {
- this.port = port;
- }
-
- protected void setProtocol(final String protocol) {
- this.protocol = protocol;
- }
-
- protected void setQueryString(final String queryString) {
- this.queryString = queryString;
- paramMap = new HashMap<String, String>();
-
- if (queryString != null && queryString.length() > 1) {
- String qs = queryString.substring(1);
- String[] kvPairs = qs.split("&");
- for (String kvPair : kvPairs) {
- String[] kv = kvPair.split("=");
- if (kv.length > 1) {
- paramMap.put(kv[0], unescape(kv[1]));
- } else {
- paramMap.put(kv[0], "");
- }
- }
- }
- }
-
- private native String unescape(String val) /*-{
- return unescape(val);
- }-*/;
-
-}
\ No newline at end of file
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/TextUtils.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/TextUtils.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/TextUtils.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,99 +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;
-
-import java.util.ArrayList;
-
-public class TextUtils {
-
- public static final String IN_DEVELOPMENT_P = " (in development)";
- public static final String IN_DEVELOPMENT = "In development";
-
- // Original regexp from http://snippets.dzone.com/posts/show/452
- public static final String URL_REGEXP = "((ftp|http|https|mailto):\\/\\/(\\w+:{0,1}\\w*@)?(\\S+)(:[0-9]+)?(\\/|\\/([\\w#!:.?+=&%@!\\-\\/]))?)";
-
- // Original regexp from http://www.regular-expressions.info/email.html
- public static final String EMAIL_REGEXP = "[-!#$%&\'*+/=?_`{|}~a-z0-9^]+(\\.[-!#$%&\'*+/=?_`{|}~a-z0-9^]+)*@(localhost|([a-z0-9]([-a-z0-9]*[a-z0-9])?\\.)+[a-z0-9]([-a-z0-9]*[a-z0-9]))?";
-
- public static final String UNIX_NAME = "^[a-z0-9_\\-]+$";
-
- public static final String NUM_REGEXP = "^[0-9]+$";
-
- /*
- * This method escape only some dangerous html chars
- */
- public static String escapeHtmlLight(final String source) {
- if (source == null) {
- return null;
- }
- String result = source;
- result = result.replaceAll("&", "&");
- result = result.replaceAll("\"", """);
- // text = text.replaceAll("\'", "'");
- result = result.replaceAll("<", "<");
- result = result.replaceAll(">", ">");
- return result;
- }
-
- public static String generateHtmlLink(final String href, final String text) {
- return "<a href=\"" + href + "\" target=\"_blank\">" + text + "</a>";
- }
-
- public static ArrayList<String> splitTags(final String tagsString) {
- final ArrayList<String> tagsList = new ArrayList<String>();
- String tagsCopy = tagsString;
- // remove commas and quotes
- if (tagsString == null) {
- return tagsList;
- }
- tagsCopy = tagsCopy.replaceAll(",", " ");
- tagsCopy = tagsCopy.replaceAll("\"", "");
- tagsCopy = tagsCopy.replaceAll("\'", "");
- final String[] splitted = tagsCopy.split("\\s+");
- for (String tag : splitted) {
- tag = tag.replaceAll("\\s$", "");
- if (tag.length() > 0) {
- tagsList.add(tag);
- }
- }
- return tagsList;
- }
-
- /*
- * This method unescape only some dangerous html chars for use in GWT Html
- * widget for instance
- */
- public static String unescape(final String source) {
- if (source == null) {
- return null;
- }
- String result = source;
- result = result.replaceAll("&", "&");
- result = result.replaceAll(""", "\"");
- result = result.replaceAll("'", "\'");
- result = result.replaceAll("<", "<");
- result = result.replaceAll(">", ">");
- return result;
- }
-
- public TextUtils() {
- }
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,65 +0,0 @@
-/*
- * Copyright 2006 Robert Hanson <iamroberthanson AT gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.ourproject.kune.platf.client.ui;
-
-public class WindowUtils {
-
- public static Location getLocation() {
- Location result = new Location();
- result.setHash(getHash());
- result.setHost(getHost());
- result.setHostName(getHostName());
- result.setHref(getHref());
- result.setPath(getPath());
- result.setPort(getPort());
- result.setProtocol(getProtocol());
- result.setQueryString(getQueryString());
- return result;
- }
-
- private static native String getHash() /*-{
- return $wnd.location.hash;
- }-*/;
-
- private static native String getHost() /*-{
- return $wnd.location.host;
- }-*/;
-
- private static native String getHostName() /*-{
- return $wnd.location.hostname;
- }-*/;
-
- private static native String getHref() /*-{
- return $wnd.location.href;
- }-*/;
-
- private static native String getPath() /*-{
- return $wnd.location.pathname;
- }-*/;
-
- private static native String getPort() /*-{
- return $wnd.location.port;
- }-*/;
-
- private static native String getProtocol() /*-{
- return $wnd.location.protocol;
- }-*/;
-
- private static native String getQueryString() /*-{
- return $wnd.location.search;
- }-*/;
-
-}
\ No newline at end of file
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/WizardDialog.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,9 +20,10 @@
package org.ourproject.kune.platf.client.ui.dialogs;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.user.client.ui.DeckPanel;
import com.google.gwt.user.client.ui.Widget;
import com.gwtext.client.core.EventObject;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,13 +19,14 @@
\*/
package org.ourproject.kune.platf.client.ui.download;
-import org.ourproject.kune.platf.client.dto.StateToken;
import org.ourproject.kune.platf.client.services.ImageDescriptor;
import org.ourproject.kune.platf.client.services.ImageUtils;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.platf.client.utils.Url;
import org.ourproject.kune.platf.client.utils.UrlParam;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.ui.RootPanel;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/NotifyUser.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,9 +19,10 @@
*/
package org.ourproject.kune.platf.client.ui.noti;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.Images;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Event;
import com.calclab.suco.client.events.Event0;
import com.calclab.suco.client.events.Event2;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/SimplePalettePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/SimplePalettePanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/SimplePalettePanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,7 +1,8 @@
package org.ourproject.kune.platf.client.ui.palette;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.gwtext.client.widgets.ColorPalette;
import com.gwtext.client.widgets.event.ColorPaletteListenerAdapter;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -11,8 +11,6 @@
import org.ourproject.kune.platf.client.actions.ui.ComplexToolbar;
import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip;
import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister;
-import org.ourproject.kune.platf.client.errors.UIException;
-import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.platf.client.ui.rte.RichTextArea;
@@ -25,6 +23,9 @@
import org.xwiki.gwt.dom.client.Range;
import org.xwiki.gwt.dom.client.Selection;
+import cc.kune.core.client.errors.UIException;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -28,8 +28,6 @@
import org.ourproject.kune.platf.client.actions.ui.PushButtonDescriptor;
import org.ourproject.kune.platf.client.actions.ui.ToolbarSeparatorDescriptor;
import org.ourproject.kune.platf.client.actions.ui.ToolbarSeparatorDescriptor.Type;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.platf.client.ui.img.ImgConstants;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette;
@@ -45,6 +43,9 @@
import org.ourproject.kune.platf.client.ui.rte.inserttable.InsertTableDialog;
import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.allen_sauer.gwt.log.client.Log;
import com.calclab.suco.client.events.Event0;
import com.calclab.suco.client.events.Listener;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,11 +1,12 @@
package org.ourproject.kune.platf.client.ui.rte.edithtml;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.Images;
import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.user.client.Window;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.widgets.Button;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,9 +1,10 @@
package org.ourproject.kune.platf.client.ui.rte.edithtml.editor;
-import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialogView;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+
import com.gwtext.client.widgets.form.TextArea;
public class EditHtmlEditorPanel extends DefaultForm implements EditHtmlEditorView {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,8 +1,9 @@
package org.ourproject.kune.platf.client.ui.rte.edithtml.preview;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialogView;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.user.client.ui.HTML;
import com.gwtext.client.widgets.Panel;
import com.gwtext.client.widgets.event.PanelListenerAdapter;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,9 +1,10 @@
package org.ourproject.kune.platf.client.ui.rte.insertimg;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.Images;
import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener0;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.widgets.Button;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,9 +1,10 @@
package org.ourproject.kune.platf.client.ui.rte.insertimg.ext;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
-import org.ourproject.kune.platf.client.ui.TextUtils;
import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPanel;
+import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.user.client.ui.Frame;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
*/
package org.ourproject.kune.platf.client.ui.rte.insertlink;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.Images;
import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener0;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.widgets.Button;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
*/
package org.ourproject.kune.platf.client.ui.rte.insertlink.email;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo;
import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPanel;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.gwtext.client.widgets.form.VType;
public class InsertLinkEmailPanel extends InsertLinkAbstractPanel implements InsertLinkEmailView {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,12 +19,13 @@
*/
package org.ourproject.kune.platf.client.ui.rte.insertlink.ext;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.i18n.Resources;
-import org.ourproject.kune.platf.client.ui.TextUtils;
import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo;
import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPanel;
+import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.user.client.ui.Frame;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.widgets.Button;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
*/
package org.ourproject.kune.platf.client.ui.rte.insertlink.ext;
-import org.ourproject.kune.platf.client.ui.TextUtils;
import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialog;
import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPresenter;
+import cc.kune.core.client.utils.TextUtils;
+
public class InsertLinkExtPresenter extends InsertLinkAbstractPresenter implements InsertLinkExt {
private InsertLinkExtView view;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -4,9 +4,10 @@
import java.util.Iterator;
import java.util.List;
-import org.ourproject.kune.platf.client.dto.ExtMediaDescripDTO;
-import org.ourproject.kune.platf.client.ui.TextUtils;
+import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.shared.dto.ExtMediaDescripDTO;
+
public class ExternalMediaRegistry extends ArrayList<ExtMediaDescripDTO> {
private static final long serialVersionUID = -9109609520119776917L;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,9 +1,10 @@
package org.ourproject.kune.platf.client.ui.rte.insertmedia;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.Images;
import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener0;
import com.gwtext.client.core.EventObject;
import com.gwtext.client.widgets.Button;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,10 +1,11 @@
package org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.StateToken;
+
public class MediaUtils {
public static final String DOC_URL_TAG = "###DOC_URL###";
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,9 +1,10 @@
package org.ourproject.kune.platf.client.ui.rte.insertmedia.ext;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.ExternalMediaRegistry;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPanel;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class InsertMediaExtPanel extends InsertMediaAbstractPanel implements InsertMediaExtView {
public InsertMediaExtPanel(final InsertMediaExtPresenter presenter, final I18nTranslationService i18n,
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,11 +1,12 @@
package org.ourproject.kune.platf.client.ui.rte.insertmedia.ext;
-import org.ourproject.kune.platf.client.dto.ExtMediaDescripDTO;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.ExternalMediaRegistry;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPresenter;
+import cc.kune.core.shared.dto.ExtMediaDescripDTO;
+
public class InsertMediaExtPresenter extends InsertMediaAbstractPresenter implements InsertMediaExt {
private InsertMediaExtView view;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,10 +1,11 @@
package org.ourproject.kune.platf.client.ui.rte.insertspecialchar;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.Images;
import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel;
import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.gwtext.client.core.EventObject;
import com.gwtext.client.widgets.Button;
import com.gwtext.client.widgets.event.ButtonListenerAdapter;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/asian/InsertSpecialAsianCharPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/asian/InsertSpecialAsianCharPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/asian/InsertSpecialAsianCharPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,9 +1,10 @@
package org.ourproject.kune.platf.client.ui.rte.insertspecialchar.asian;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialog;
import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.occidental.AbstractInsertCharPanel;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class InsertSpecialAsianCharPanel extends AbstractInsertCharPanel implements InsertSpecialAsianCharView {
private static char[] SPECIAL_CHARS = { '・', '×', '【', '】', '『', '』', '《', '》', '“', '”', '「', '」', '〈', '〉', '≪',
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/occidental/InsertSpecialOccCharPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/occidental/InsertSpecialOccCharPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/occidental/InsertSpecialOccCharPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,8 +1,9 @@
package org.ourproject.kune.platf.client.ui.rte.insertspecialchar.occidental;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialog;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class InsertSpecialOccCharPanel extends AbstractInsertCharPanel implements InsertSpecialOccCharView {
private static char[] SPECIAL_CHARS = { '¡', '¢', '£', '¤', '¥', '¦', '§', '¨', '©', 'ª', '«', '¬', '', '®', '¯',
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,11 +1,12 @@
package org.ourproject.kune.platf.client.ui.rte.insertspecialchar.utf8;
-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.rte.insertspecialchar.InsertSpecialCharDialog;
import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialogView;
+import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/inserttable/InsertTableDialogPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/inserttable/InsertTableDialogPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/inserttable/InsertTableDialogPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,12 +1,13 @@
package org.ourproject.kune.platf.client.ui.rte.inserttable;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
-import org.ourproject.kune.platf.client.ui.TextUtils;
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.palette.SimplePalette;
import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources;
+import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
import com.google.gwt.user.client.DOM;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,8 +1,9 @@
package org.ourproject.kune.platf.client.ui.rte.saving;
-import org.ourproject.kune.platf.client.actions.BeforeActionListener;
import org.ourproject.kune.platf.client.ui.rte.basic.RTEditor;
+import cc.kune.core.client.actions.BeforeActionListener;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,12 +1,13 @@
package org.ourproject.kune.platf.client.ui.rte.saving;
import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister;
-import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.platf.client.ui.rte.basic.RTEditorPanel;
import org.ourproject.kune.platf.client.ui.rte.basic.RTEditorPresenter;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+
import com.calclab.suco.client.events.Listener0;
public class RTESavingEditorPanel extends RTEditorPanel implements RTESavingEditorView {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -5,15 +5,11 @@
import org.ourproject.kune.platf.client.actions.AbstractExtendedAction;
import org.ourproject.kune.platf.client.actions.ActionEvent;
-import org.ourproject.kune.platf.client.actions.BeforeActionListener;
import org.ourproject.kune.platf.client.actions.KeyStroke;
import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor;
import org.ourproject.kune.platf.client.actions.ui.MenuCheckItemDescriptor;
import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.shortcuts.Keyboard;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette;
import org.ourproject.kune.platf.client.ui.rte.basic.RTEditor;
import org.ourproject.kune.platf.client.ui.rte.basic.RTEditorPresenter;
@@ -27,6 +23,11 @@
import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
import org.ourproject.kune.platf.client.utils.TimerWrapper;
+import cc.kune.core.client.actions.BeforeActionListener;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -24,13 +24,6 @@
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.server.access.AccessRightsService;
import org.ourproject.kune.platf.server.access.AccessRightsServiceDefault;
import org.ourproject.kune.platf.server.access.AccessService;
@@ -108,6 +101,14 @@
import org.ourproject.kune.platf.server.users.UserInfoService;
import org.ourproject.kune.platf.server.users.UserInfoServiceDefault;
+import cc.kune.core.client.rpcservices.ContentService;
+import cc.kune.core.client.rpcservices.GroupService;
+import cc.kune.core.client.rpcservices.I18nService;
+import cc.kune.core.client.rpcservices.SiteService;
+import cc.kune.core.client.rpcservices.SocialNetworkService;
+import cc.kune.core.client.rpcservices.UserService;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.inject.matcher.Matchers;
import com.wideplay.warp.persist.PersistenceService;
import com.wideplay.warp.persist.UnitOfWork;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,11 +19,12 @@
*/
package org.ourproject.kune.platf.server.access;
-import org.ourproject.kune.platf.client.errors.DefaultException;
import org.ourproject.kune.platf.server.domain.Container;
import org.ourproject.kune.platf.server.domain.Content;
import org.ourproject.kune.platf.server.domain.User;
+import cc.kune.core.client.errors.DefaultException;
+
public interface AccessService {
Container accessToContainer(Long folderId, User user, AccessRol accessRol) throws DefaultException;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,13 +19,14 @@
*/
package org.ourproject.kune.platf.server.access;
-import org.ourproject.kune.platf.client.errors.AccessViolationException;
-import org.ourproject.kune.platf.client.errors.DefaultException;
import org.ourproject.kune.platf.server.domain.AccessLists;
import org.ourproject.kune.platf.server.domain.Container;
import org.ourproject.kune.platf.server.domain.Content;
import org.ourproject.kune.platf.server.domain.User;
+import cc.kune.core.client.errors.AccessViolationException;
+import cc.kune.core.client.errors.DefaultException;
+
import com.google.inject.Inject;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,6 @@
*/
package org.ourproject.kune.platf.server.access;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.errors.DefaultException;
import org.ourproject.kune.platf.server.domain.Comment;
import org.ourproject.kune.platf.server.domain.Container;
import org.ourproject.kune.platf.server.domain.Content;
@@ -28,6 +26,9 @@
import org.ourproject.kune.platf.server.domain.Rate;
import org.ourproject.kune.platf.server.domain.User;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.shared.dto.StateToken;
+
public interface FinderService {
Comment getComment(Long commentId) throws DefaultException;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,12 +22,6 @@
import javax.persistence.NoResultException;
import javax.persistence.PersistenceException;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.errors.ContentNotFoundException;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-import org.ourproject.kune.platf.client.errors.GroupNotFoundException;
-import org.ourproject.kune.platf.client.errors.NoDefaultContentException;
-import org.ourproject.kune.platf.client.errors.ToolNotFoundException;
import org.ourproject.kune.platf.server.content.CommentManager;
import org.ourproject.kune.platf.server.content.ContainerManager;
import org.ourproject.kune.platf.server.content.ContentManager;
@@ -40,6 +34,13 @@
import org.ourproject.kune.platf.server.manager.GroupManager;
import org.ourproject.kune.platf.server.manager.RateManager;
+import cc.kune.core.client.errors.ContentNotFoundException;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.errors.GroupNotFoundException;
+import cc.kune.core.client.errors.NoDefaultContentException;
+import cc.kune.core.client.errors.ToolNotFoundException;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.Inject;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -25,10 +25,11 @@
import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.ourproject.kune.platf.client.errors.SessionExpiredException;
-import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
import org.ourproject.kune.platf.server.UserSession;
+import cc.kune.core.client.errors.SessionExpiredException;
+import cc.kune.core.client.errors.UserMustBeLoggedException;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -23,8 +23,6 @@
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.errors.AccessViolationException;
import org.ourproject.kune.platf.server.UserSession;
import org.ourproject.kune.platf.server.access.AccessRights;
import org.ourproject.kune.platf.server.access.AccessRightsService;
@@ -37,6 +35,9 @@
import org.ourproject.kune.platf.server.domain.User;
import org.ourproject.kune.platf.server.manager.GroupManager;
+import cc.kune.core.client.errors.AccessViolationException;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/auth/SessionServiceDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/auth/SessionServiceDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/auth/SessionServiceDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,8 +22,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.ourproject.kune.platf.client.state.Session;
+import cc.kune.core.client.state.Session;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManager.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,11 +19,12 @@
\*/
package org.ourproject.kune.platf.server.content;
-import org.ourproject.kune.platf.client.errors.DefaultException;
import org.ourproject.kune.platf.server.domain.Comment;
import org.ourproject.kune.platf.server.domain.User;
import org.ourproject.kune.platf.server.manager.Manager;
+import cc.kune.core.client.errors.DefaultException;
+
public interface CommentManager extends Manager<Comment, Long> {
Comment addComment(User author, Long contentId, String commentText) throws DefaultException;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManagerDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,14 +21,15 @@
import javax.persistence.EntityManager;
-import org.ourproject.kune.platf.client.errors.ContentNotFoundException;
-import org.ourproject.kune.platf.client.errors.DefaultException;
import org.ourproject.kune.platf.server.access.FinderService;
import org.ourproject.kune.platf.server.domain.Comment;
import org.ourproject.kune.platf.server.domain.Content;
import org.ourproject.kune.platf.server.domain.User;
import org.ourproject.kune.platf.server.manager.impl.DefaultManager;
+import cc.kune.core.client.errors.ContentNotFoundException;
+import cc.kune.core.client.errors.DefaultException;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,7 +19,6 @@
*/
package org.ourproject.kune.platf.server.content;
-import org.ourproject.kune.platf.client.errors.DefaultException;
import org.ourproject.kune.platf.server.domain.AccessLists;
import org.ourproject.kune.platf.server.domain.Container;
import org.ourproject.kune.platf.server.domain.Group;
@@ -27,6 +26,8 @@
import org.ourproject.kune.platf.server.manager.Manager;
import org.ourproject.kune.platf.server.manager.impl.SearchResult;
+import cc.kune.core.client.errors.DefaultException;
+
public interface ContainerManager extends Manager<Container, Long> {
Container createFolder(Group group, Container parent, String name, I18nLanguage language, String typeId);
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -28,8 +28,6 @@
import org.apache.lucene.queryParser.MultiFieldQueryParser;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.Query;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-import org.ourproject.kune.platf.client.errors.NameInUseException;
import org.ourproject.kune.platf.server.domain.AccessLists;
import org.ourproject.kune.platf.server.domain.Container;
import org.ourproject.kune.platf.server.domain.Content;
@@ -41,6 +39,9 @@
import org.ourproject.kune.platf.server.manager.impl.ServerManagerException;
import org.ourproject.kune.platf.server.utils.FilenameUtils;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.errors.NameInUseException;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,7 +21,6 @@
import java.util.Date;
-import org.ourproject.kune.platf.client.errors.DefaultException;
import org.ourproject.kune.platf.server.domain.Container;
import org.ourproject.kune.platf.server.domain.Content;
import org.ourproject.kune.platf.server.domain.ContentStatus;
@@ -31,6 +30,8 @@
import org.ourproject.kune.platf.server.manager.Manager;
import org.ourproject.kune.platf.server.manager.impl.SearchResult;
+import cc.kune.core.client.errors.DefaultException;
+
public interface ContentManager extends Manager<Content, Long> {
String[] DEF_GLOBAL_SEARCH_FIELDS = new String[] { "authors.name", "authors.shortName", "container.name",
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -28,10 +28,6 @@
import org.apache.lucene.queryParser.MultiFieldQueryParser;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.Query;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-import org.ourproject.kune.platf.client.errors.I18nNotFoundException;
-import org.ourproject.kune.platf.client.errors.NameInUseException;
-import org.ourproject.kune.platf.client.errors.UserNotFoundException;
import org.ourproject.kune.platf.server.access.FinderService;
import org.ourproject.kune.platf.server.domain.Container;
import org.ourproject.kune.platf.server.domain.Content;
@@ -48,6 +44,11 @@
import org.ourproject.kune.platf.server.manager.impl.ServerManagerException;
import org.ourproject.kune.platf.server.utils.FilenameUtils;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.errors.I18nNotFoundException;
+import cc.kune.core.client.errors.NameInUseException;
+import cc.kune.core.client.errors.UserNotFoundException;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentUtils.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentUtils.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentUtils.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,7 +19,7 @@
\*/
package org.ourproject.kune.platf.server.content;
-import org.ourproject.kune.platf.client.errors.ContentNotFoundException;
+import cc.kune.core.client.errors.ContentNotFoundException;
public final class ContentUtils {
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/ChatUserParams.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/domain/ChatUserParams.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/ChatUserParams.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,8 +21,9 @@
import java.io.Serializable;
-import com.calclab.emiteuimodule.client.SubscriptionMode;
+import cc.kune.core.shared.dto.SubscriptionMode;
+ at Deprecated
public class ChatUserParams implements Serializable {
private static final long serialVersionUID = -1343712336914940957L;
@@ -31,10 +32,10 @@
private boolean publishRoster;
+ private String chatColor;
+
private SubscriptionMode subscriptionMode;
- private String chatColor;
-
public ChatUserParams() {
this(null, false, SubscriptionMode.autoAcceptAll, null);
};
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -48,8 +48,9 @@
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.IndexedEmbedded;
import org.hibernate.search.annotations.Store;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.name.Named;
import com.wideplay.warp.persist.dao.Finder;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -51,8 +51,9 @@
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.IndexedEmbedded;
import org.hibernate.validator.NotNull;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.name.Named;
import com.wideplay.warp.persist.dao.Finder;
import com.wideplay.warp.persist.dao.FirstResult;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -45,9 +45,10 @@
import org.hibernate.search.annotations.Store;
import org.hibernate.validator.Length;
import org.hibernate.validator.Pattern;
-import org.ourproject.kune.platf.client.dto.GroupType;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.GroupType;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.name.Named;
import com.wideplay.warp.persist.dao.Finder;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasStateToken.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasStateToken.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasStateToken.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,7 +19,7 @@
*/
package org.ourproject.kune.platf.server.domain;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
public interface HasStateToken {
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -44,8 +44,9 @@
import org.hibernate.validator.Length;
import org.hibernate.validator.NotNull;
import org.hibernate.validator.Pattern;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.name.Named;
import com.wideplay.warp.persist.dao.Finder;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,12 +19,13 @@
*/
package org.ourproject.kune.platf.server.i18n;
-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;
import org.ourproject.kune.platf.server.manager.I18nTranslationManager;
+import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -5,8 +5,6 @@
import javax.persistence.NoResultException;
-import org.ourproject.kune.platf.client.dto.GroupType;
-import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
import org.ourproject.kune.platf.server.content.ContentManager;
import org.ourproject.kune.platf.server.domain.Content;
import org.ourproject.kune.platf.server.domain.ContentStatus;
@@ -30,6 +28,9 @@
import org.ourproject.kune.platf.server.manager.UserManager;
import org.ourproject.kune.platf.server.properties.DatabaseProperties;
+import cc.kune.core.client.errors.UserMustBeLoggedException;
+import cc.kune.core.shared.dto.GroupType;
+
import com.calclab.emiteuimodule.client.SubscriptionMode;
import com.google.inject.Inject;
import com.wideplay.warp.persist.TransactionType;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,15 +21,16 @@
import java.util.List;
-import org.ourproject.kune.platf.client.errors.AccessViolationException;
-import org.ourproject.kune.platf.client.errors.EmailAddressInUseException;
-import org.ourproject.kune.platf.client.errors.GroupNameInUseException;
-import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
import org.ourproject.kune.platf.server.domain.Content;
import org.ourproject.kune.platf.server.domain.Group;
import org.ourproject.kune.platf.server.domain.User;
import org.ourproject.kune.platf.server.manager.impl.SearchResult;
+import cc.kune.core.client.errors.AccessViolationException;
+import cc.kune.core.client.errors.EmailAddressInUseException;
+import cc.kune.core.client.errors.GroupNameInUseException;
+import cc.kune.core.client.errors.UserMustBeLoggedException;
+
public interface GroupManager extends Manager<Group, Long> {
void changeDefLicense(User user, Group group, String licenseShortName);
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,10 +22,11 @@
import java.util.HashMap;
import java.util.List;
-import org.ourproject.kune.platf.client.errors.DefaultException;
import org.ourproject.kune.platf.server.domain.I18nTranslation;
import org.ourproject.kune.platf.server.manager.impl.SearchResult;
+import cc.kune.core.client.errors.DefaultException;
+
public interface I18nTranslationManager extends Manager<I18nTranslation, Long> {
HashMap<String, String> getLexicon(String language);
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,15 +19,16 @@
*/
package org.ourproject.kune.platf.server.manager;
-import org.ourproject.kune.platf.client.dto.SocialNetworkRequestResult;
-import org.ourproject.kune.platf.client.errors.AccessViolationException;
-import org.ourproject.kune.platf.client.errors.DefaultException;
import org.ourproject.kune.platf.server.domain.Group;
import org.ourproject.kune.platf.server.domain.SocialNetwork;
import org.ourproject.kune.platf.server.domain.SocialNetworkData;
import org.ourproject.kune.platf.server.domain.User;
import org.ourproject.kune.platf.server.sn.ParticipationData;
+import cc.kune.core.client.errors.AccessViolationException;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.shared.dto.SocialNetworkRequestResult;
+
public interface SocialNetworkManager extends Manager<SocialNetwork, Long> {
void acceptJoinGroup(User userLogged, Group group, Group inGroup) throws DefaultException;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -7,7 +7,6 @@
import javax.persistence.NoResultException;
import javax.persistence.Query;
-import org.ourproject.kune.platf.client.ui.TextUtils;
import org.ourproject.kune.platf.server.domain.Content;
import org.ourproject.kune.platf.server.domain.Group;
import org.ourproject.kune.platf.server.domain.Tag;
@@ -17,6 +16,8 @@
import org.ourproject.kune.platf.server.domain.User;
import org.ourproject.kune.platf.server.manager.impl.DefaultManager;
+import cc.kune.core.client.utils.TextUtils;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,11 +19,12 @@
*/
package org.ourproject.kune.platf.server.manager;
-import org.ourproject.kune.platf.client.errors.I18nNotFoundException;
import org.ourproject.kune.platf.server.domain.User;
import org.ourproject.kune.platf.server.manager.impl.SearchResult;
import org.ourproject.kune.platf.server.sn.UserBuddiesData;
+import cc.kune.core.client.errors.I18nNotFoundException;
+
public interface UserManager {
/**
* CreateUser new method with language country and timezone params
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -27,11 +27,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.ourproject.kune.platf.client.dto.StateToken;
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;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.Inject;
public class EntityLogoDownloadManager extends HttpServlet {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -29,8 +29,6 @@
import magick.MagickException;
import org.apache.commons.fileupload.FileItem;
-import org.ourproject.kune.platf.client.dto.StateToken;
-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;
@@ -40,6 +38,9 @@
import org.ourproject.kune.platf.server.domain.Group;
import org.ourproject.kune.platf.server.manager.GroupManager;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.inject.Inject;
import com.wideplay.warp.persist.TransactionType;
import com.wideplay.warp.persist.Transactional;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -31,8 +31,6 @@
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.errors.ContentNotFoundException;
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;
@@ -45,6 +43,9 @@
import org.ourproject.kune.platf.server.domain.Content;
import org.ourproject.kune.platf.server.properties.KuneProperties;
+import cc.kune.core.client.errors.ContentNotFoundException;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.Inject;
/**
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -26,8 +26,9 @@
import net.sf.json.JSONObject;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.inject.Inject;
public abstract class FileJsonUploadManagerAbstract extends FileUploadManagerAbstract {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -26,8 +26,6 @@
import net.sf.json.JSONObject;
import org.apache.commons.fileupload.FileItem;
-import org.ourproject.kune.platf.client.dto.StateToken;
-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;
@@ -45,6 +43,9 @@
import org.ourproject.kune.platf.server.properties.KuneProperties;
import org.ourproject.kune.platf.server.utils.StringW;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.inject.Inject;
import com.google.inject.servlet.RequestScoped;
import com.wideplay.warp.persist.TransactionType;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -37,10 +37,11 @@
import org.apache.commons.fileupload.servlet.ServletFileUpload;
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.FileConstants;
import org.ourproject.kune.platf.server.properties.KuneProperties;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.Inject;
public abstract class FileUploadManagerAbstract extends HttpServlet {
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -24,7 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
public class FileUtils {
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -31,12 +31,6 @@
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.Query;
import org.hibernate.exception.ConstraintViolationException;
-import org.ourproject.kune.platf.client.dto.GroupType;
-import org.ourproject.kune.platf.client.errors.AccessViolationException;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-import org.ourproject.kune.platf.client.errors.EmailAddressInUseException;
-import org.ourproject.kune.platf.client.errors.GroupNameInUseException;
-import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
import org.ourproject.kune.platf.server.domain.AccessLists;
import org.ourproject.kune.platf.server.domain.AdmissionType;
import org.ourproject.kune.platf.server.domain.Content;
@@ -53,6 +47,13 @@
import org.ourproject.kune.platf.server.tool.ServerTool;
import org.ourproject.kune.platf.server.tool.ServerToolRegistry;
+import cc.kune.core.client.errors.AccessViolationException;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.errors.EmailAddressInUseException;
+import cc.kune.core.client.errors.GroupNameInUseException;
+import cc.kune.core.client.errors.UserMustBeLoggedException;
+import cc.kune.core.shared.dto.GroupType;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -25,13 +25,14 @@
import javax.persistence.EntityManager;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-import org.ourproject.kune.platf.client.ui.TextUtils;
import org.ourproject.kune.platf.server.domain.I18nLanguage;
import org.ourproject.kune.platf.server.domain.I18nTranslation;
import org.ourproject.kune.platf.server.manager.I18nLanguageManager;
import org.ourproject.kune.platf.server.manager.I18nTranslationManager;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.utils.TextUtils;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertiesManagerDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertiesManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertiesManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -6,12 +6,13 @@
import javax.persistence.EntityManager;
-import org.ourproject.kune.platf.client.errors.UnknownPropertyException;
import org.ourproject.kune.platf.server.domain.Properties;
import org.ourproject.kune.platf.server.domain.Property;
import org.ourproject.kune.platf.server.domain.PropertySetted;
import org.ourproject.kune.platf.server.manager.PropertiesManager;
+import cc.kune.core.client.errors.UnknownPropertyException;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -23,14 +23,6 @@
import javax.persistence.EntityManager;
-import org.ourproject.kune.platf.client.dto.GroupType;
-import org.ourproject.kune.platf.client.dto.SocialNetworkRequestResult;
-import org.ourproject.kune.platf.client.errors.AccessViolationException;
-import org.ourproject.kune.platf.client.errors.AlreadyGroupMemberException;
-import org.ourproject.kune.platf.client.errors.AlreadyUserMemberException;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-import org.ourproject.kune.platf.client.errors.LastAdminInGroupException;
-import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
import org.ourproject.kune.platf.server.ServerException;
import org.ourproject.kune.platf.server.access.AccessRights;
import org.ourproject.kune.platf.server.access.AccessRightsService;
@@ -47,6 +39,15 @@
import org.ourproject.kune.platf.server.sn.ParticipationData;
import org.ourproject.kune.platf.server.sn.UserBuddiesData;
+import cc.kune.core.client.errors.AccessViolationException;
+import cc.kune.core.client.errors.AlreadyGroupMemberException;
+import cc.kune.core.client.errors.AlreadyUserMemberException;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.errors.LastAdminInGroupException;
+import cc.kune.core.client.errors.UserMustBeLoggedException;
+import cc.kune.core.shared.dto.GroupType;
+import cc.kune.core.shared.dto.SocialNetworkRequestResult;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -34,8 +34,6 @@
import org.jivesoftware.smack.packet.RosterPacket.ItemType;
import org.ourproject.kune.chat.server.managers.ChatConnection;
import org.ourproject.kune.chat.server.managers.XmppManager;
-import org.ourproject.kune.platf.client.errors.I18nNotFoundException;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.server.domain.I18nCountry;
import org.ourproject.kune.platf.server.domain.I18nLanguage;
import org.ourproject.kune.platf.server.domain.Properties;
@@ -49,6 +47,9 @@
import org.ourproject.kune.platf.server.properties.ChatProperties;
import org.ourproject.kune.platf.server.sn.UserBuddiesData;
+import cc.kune.core.client.errors.I18nNotFoundException;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -25,9 +25,10 @@
import net.sf.dozer.util.mapping.DozerBeanMapperSingletonWrapper;
import net.sf.dozer.util.mapping.MapperIF;
-import org.ourproject.kune.platf.client.dto.SearchResultDTO;
import org.ourproject.kune.platf.server.manager.impl.SearchResult;
+import cc.kune.core.shared.dto.SearchResultDTO;
+
import com.google.inject.Singleton;
@Singleton
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/mapper/Mapper.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/mapper/Mapper.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/mapper/Mapper.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,9 +21,10 @@
import java.util.List;
-import org.ourproject.kune.platf.client.dto.SearchResultDTO;
import org.ourproject.kune.platf.server.manager.impl.SearchResult;
+import cc.kune.core.shared.dto.SearchResultDTO;
+
public interface Mapper {
<T> T map(Object source, Class<T> type);
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,6 @@
*/
package org.ourproject.kune.platf.server.rest;
-import org.ourproject.kune.platf.client.dto.LinkDTO;
-import org.ourproject.kune.platf.client.dto.SearchResultDTO;
import org.ourproject.kune.platf.client.services.SearcherConstants;
import org.ourproject.kune.platf.server.content.ContainerManager;
import org.ourproject.kune.platf.server.content.ContentManager;
@@ -30,6 +28,9 @@
import org.ourproject.kune.platf.server.mapper.Mapper;
import org.ourproject.kune.rack.filters.rest.REST;
+import cc.kune.core.shared.dto.LinkDTO;
+import cc.kune.core.shared.dto.SearchResultDTO;
+
import com.google.inject.Inject;
public class ContentJSONService {
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,6 @@
*/
package org.ourproject.kune.platf.server.rest;
-import org.ourproject.kune.platf.client.dto.LinkDTO;
-import org.ourproject.kune.platf.client.dto.SearchResultDTO;
import org.ourproject.kune.platf.client.services.SearcherConstants;
import org.ourproject.kune.platf.server.domain.Group;
import org.ourproject.kune.platf.server.manager.GroupManager;
@@ -28,6 +26,9 @@
import org.ourproject.kune.platf.server.mapper.Mapper;
import org.ourproject.kune.rack.filters.rest.REST;
+import cc.kune.core.shared.dto.LinkDTO;
+import cc.kune.core.shared.dto.SearchResultDTO;
+
import com.google.inject.Inject;
public class GroupJSONService {
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,8 +21,6 @@
import java.util.List;
-import org.ourproject.kune.platf.client.dto.I18nTranslationDTO;
-import org.ourproject.kune.platf.client.dto.SearchResultDTO;
import org.ourproject.kune.platf.client.services.SearcherConstants;
import org.ourproject.kune.platf.server.domain.I18nTranslation;
import org.ourproject.kune.platf.server.manager.I18nTranslationManager;
@@ -30,6 +28,9 @@
import org.ourproject.kune.platf.server.mapper.Mapper;
import org.ourproject.kune.rack.filters.rest.REST;
+import cc.kune.core.shared.dto.I18nTranslationDTO;
+import cc.kune.core.shared.dto.SearchResultDTO;
+
import com.google.inject.Inject;
public class I18nTranslationJSONService {
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,6 @@
*/
package org.ourproject.kune.platf.server.rest;
-import org.ourproject.kune.platf.client.dto.LinkDTO;
-import org.ourproject.kune.platf.client.dto.SearchResultDTO;
import org.ourproject.kune.platf.client.services.SearcherConstants;
import org.ourproject.kune.platf.server.domain.User;
import org.ourproject.kune.platf.server.manager.UserManager;
@@ -28,6 +26,9 @@
import org.ourproject.kune.platf.server.mapper.Mapper;
import org.ourproject.kune.rack.filters.rest.REST;
+import cc.kune.core.shared.dto.LinkDTO;
+import cc.kune.core.shared.dto.SearchResultDTO;
+
import com.google.inject.Inject;
public class UserJSONService {
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -26,26 +26,6 @@
import org.ourproject.kune.chat.server.ChatServerTool;
import org.ourproject.kune.chat.server.managers.ChatConnection;
import org.ourproject.kune.chat.server.managers.XmppManager;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.CommentDTO;
-import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
-import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.dto.RateResultDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateNoContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.TagCloudResultDTO;
-import org.ourproject.kune.platf.client.dto.TagCountDTO;
-import org.ourproject.kune.platf.client.errors.AccessViolationException;
-import org.ourproject.kune.platf.client.errors.ContentNotFoundException;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-import org.ourproject.kune.platf.client.errors.GroupNotFoundException;
-import org.ourproject.kune.platf.client.errors.NoDefaultContentException;
-import org.ourproject.kune.platf.client.errors.ToolNotFoundException;
-import org.ourproject.kune.platf.client.rpc.ContentService;
import org.ourproject.kune.platf.server.UserSession;
import org.ourproject.kune.platf.server.access.AccessRightsService;
import org.ourproject.kune.platf.server.access.AccessRol;
@@ -75,6 +55,27 @@
import org.ourproject.kune.platf.server.state.StateContent;
import org.ourproject.kune.platf.server.state.StateService;
+import cc.kune.core.client.errors.AccessViolationException;
+import cc.kune.core.client.errors.ContentNotFoundException;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.errors.GroupNotFoundException;
+import cc.kune.core.client.errors.NoDefaultContentException;
+import cc.kune.core.client.errors.ToolNotFoundException;
+import cc.kune.core.client.rpcservices.ContentService;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.CommentDTO;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.ContentStatusDTO;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+import cc.kune.core.shared.dto.RateResultDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateNoContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.TagCloudResultDTO;
+import cc.kune.core.shared.dto.TagCountDTO;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,13 +19,6 @@
*/
package org.ourproject.kune.platf.server.rpc;
-import org.ourproject.kune.platf.client.dto.AdmissionTypeDTO;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.dto.SocialNetworkVisibilityDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-import org.ourproject.kune.platf.client.rpc.GroupService;
import org.ourproject.kune.platf.server.UserSession;
import org.ourproject.kune.platf.server.access.AccessRol;
import org.ourproject.kune.platf.server.auth.ActionLevel;
@@ -41,6 +34,14 @@
import org.ourproject.kune.platf.server.manager.GroupManager;
import org.ourproject.kune.platf.server.mapper.Mapper;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.rpcservices.GroupService;
+import cc.kune.core.shared.dto.AdmissionTypeDTO;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -24,10 +24,6 @@
import javax.persistence.NoResultException;
import javax.servlet.http.HttpServletRequest;
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-import org.ourproject.kune.platf.client.errors.SessionExpiredException;
-import org.ourproject.kune.platf.client.rpc.I18nService;
import org.ourproject.kune.platf.server.UserSession;
import org.ourproject.kune.platf.server.auth.Authenticated;
import org.ourproject.kune.platf.server.domain.I18nLanguage;
@@ -36,6 +32,11 @@
import org.ourproject.kune.platf.server.manager.I18nTranslationManager;
import org.ourproject.kune.platf.server.mapper.Mapper;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.errors.SessionExpiredException;
+import cc.kune.core.client.rpcservices.I18nService;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,9 +21,6 @@
import java.util.TimeZone;
-import org.ourproject.kune.platf.client.dto.InitDataDTO;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-import org.ourproject.kune.platf.client.rpc.SiteService;
import org.ourproject.kune.platf.server.InitData;
import org.ourproject.kune.platf.server.UserSession;
import org.ourproject.kune.platf.server.manager.ExtMediaDescripManager;
@@ -37,6 +34,10 @@
import org.ourproject.kune.platf.server.tool.ServerToolRegistry;
import org.ourproject.kune.platf.server.users.UserInfoService;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.rpcservices.SiteService;
+import cc.kune.core.shared.dto.InitDataDTO;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,11 +19,6 @@
*/
package org.ourproject.kune.platf.server.rpc;
-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.errors.DefaultException;
-import org.ourproject.kune.platf.client.rpc.SocialNetworkService;
import org.ourproject.kune.platf.server.UserSession;
import org.ourproject.kune.platf.server.access.AccessRol;
import org.ourproject.kune.platf.server.auth.ActionLevel;
@@ -35,6 +30,12 @@
import org.ourproject.kune.platf.server.manager.SocialNetworkManager;
import org.ourproject.kune.platf.server.mapper.Mapper;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.rpcservices.SocialNetworkService;
+import cc.kune.core.shared.dto.SocialNetworkDataDTO;
+import cc.kune.core.shared.dto.SocialNetworkRequestResult;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,14 +22,6 @@
import java.util.UUID;
import org.jivesoftware.smack.util.Base64;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.UserBuddiesVisibilityDTO;
-import org.ourproject.kune.platf.client.dto.UserDTO;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.errors.AccessViolationException;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-import org.ourproject.kune.platf.client.errors.UserAuthException;
-import org.ourproject.kune.platf.client.rpc.UserService;
import org.ourproject.kune.platf.server.UserSession;
import org.ourproject.kune.platf.server.access.AccessRol;
import org.ourproject.kune.platf.server.auth.ActionLevel;
@@ -45,6 +37,15 @@
import org.ourproject.kune.platf.server.users.UserInfo;
import org.ourproject.kune.platf.server.users.UserInfoService;
+import cc.kune.core.client.errors.AccessViolationException;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.errors.UserAuthException;
+import cc.kune.core.client.rpcservices.UserService;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.UserBuddiesVisibilityDTO;
+import cc.kune.core.shared.dto.UserDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,7 +21,6 @@
import java.util.List;
-import org.ourproject.kune.platf.client.dto.StateToken;
import org.ourproject.kune.platf.server.access.AccessRights;
import org.ourproject.kune.platf.server.domain.Group;
import org.ourproject.kune.platf.server.domain.SocialNetwork;
@@ -29,6 +28,8 @@
import org.ourproject.kune.platf.server.sn.ParticipationData;
import org.ourproject.kune.platf.server.sn.UserBuddiesData;
+import cc.kune.core.shared.dto.StateToken;
+
public abstract class StateAbstract {
private List<String> enabledTools;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,7 +19,6 @@
*/
package org.ourproject.kune.platf.server.state;
-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;
@@ -32,6 +31,8 @@
import org.ourproject.kune.platf.server.manager.SocialNetworkManager;
import org.ourproject.kune.platf.server.manager.TagUserContentManager;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.inject.Inject;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoService.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoService.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,9 +19,10 @@
*/
package org.ourproject.kune.platf.server.users;
-import org.ourproject.kune.platf.client.errors.DefaultException;
import org.ourproject.kune.platf.server.domain.User;
+import cc.kune.core.client.errors.DefaultException;
+
public interface UserInfoService {
UserInfo buildInfo(User user, String userHash) throws DefaultException;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,7 +19,6 @@
*/
package org.ourproject.kune.platf.server.users;
-import org.ourproject.kune.platf.client.errors.DefaultException;
import org.ourproject.kune.platf.server.domain.Content;
import org.ourproject.kune.platf.server.domain.Group;
import org.ourproject.kune.platf.server.domain.User;
@@ -27,6 +26,8 @@
import org.ourproject.kune.platf.server.manager.SocialNetworkManager;
import org.ourproject.kune.platf.server.sn.ParticipationData;
+import cc.kune.core.client.errors.DefaultException;
+
import com.google.inject.Inject;
import com.google.inject.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/utils/FilenameUtils.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/utils/FilenameUtils.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/utils/FilenameUtils.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,8 +20,9 @@
package org.ourproject.kune.platf.server.utils;
import org.apache.commons.lang.StringUtils;
-import org.ourproject.kune.platf.client.errors.NameNotPermittedException;
+import cc.kune.core.client.errors.NameNotPermittedException;
+
public class FilenameUtils {
/**
Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -24,12 +24,6 @@
import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_UPLOADEDFILE;
import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_WIKIPAGE;
-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.ErrorHandler;
-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.utils.DeferredCommandWrapper;
import org.ourproject.kune.wiki.client.cnt.WikiViewer;
@@ -45,6 +39,13 @@
import org.ourproject.kune.workspace.client.upload.FileUploader;
import org.ourproject.kune.workspace.client.wave.WaveInsert;
+import cc.kune.core.client.errors.ErrorHandler;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+
import com.calclab.suco.client.ioc.Provider;
public class WikiClientActions extends AbstractFoldableContentActions {
Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,15 +20,8 @@
package org.ourproject.kune.wiki.client;
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.AbstractExtendedModule;
-import org.ourproject.kune.platf.client.services.ErrorHandler;
-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.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
@@ -57,6 +50,14 @@
import org.ourproject.kune.workspace.client.upload.FileUploader;
import org.ourproject.kune.workspace.client.wave.WaveInsert;
+import cc.kune.core.client.errors.ErrorHandler;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.decorator.Singleton;
import com.calclab.suco.client.ioc.module.Factory;
Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,13 +19,14 @@
*/
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.workspace.client.skel.WorkspaceSkeleton;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool;
import org.ourproject.kune.workspace.client.tool.ToolSelector;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+
public class WikiClientTool extends FoldableAbstractClientTool {
public static final String NAME = "wiki";
public static final String TYPE_ROOT = NAME + "." + "root";
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
*/
package org.ourproject.kune.wiki.client.cnt;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class WikiFolderContentPanel extends FoldableContentPanel implements WikiFolderContentView {
public WikiFolderContentPanel(WorkspaceSkeleton ws, I18nTranslationService i18n) {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,18 +20,19 @@
package org.ourproject.kune.wiki.client.cnt;
import org.ourproject.kune.platf.client.actions.ActionRegistry;
-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.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;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.wiki.client.WikiClientTool;
import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.ContainerDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.Provider;
public class WikiFolderContentPresenter extends FoldableContentPresenter implements WikiFolderContent {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
*/
package org.ourproject.kune.wiki.client.cnt;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class WikiViewerPanel extends FoldableContentPanel implements WikiViewerView {
public WikiViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) {
super(ws, i18n);
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,6 @@
*/
package org.ourproject.kune.wiki.client.cnt;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-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;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.wiki.client.WikiClientTool;
@@ -30,6 +26,11 @@
import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry;
import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateContentDTO;
+
import com.calclab.suco.client.ioc.Provider;
public class WikiViewerPresenter extends FoldableContentPresenter implements WikiViewer {
Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,12 +19,13 @@
*/
package org.ourproject.kune.wiki.client.ctx;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.wiki.client.WikiClientTool;
import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
import org.ourproject.kune.workspace.client.cxt.ContextPropEditor;
import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter;
+import cc.kune.core.client.state.StateManager;
+
import com.calclab.suco.client.ioc.Provider;
public class WikiContextPresenter extends FoldableContextPresenter implements WikiContext {
Modified: trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,9 +21,6 @@
import java.util.Date;
-import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException;
-import org.ourproject.kune.platf.client.errors.ContentNotPermittedException;
-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;
@@ -39,6 +36,10 @@
import org.ourproject.kune.platf.server.tool.ServerToolRegistry;
import org.ourproject.kune.platf.server.tool.ServerToolTarget;
+import cc.kune.core.client.errors.ContainerNotPermittedException;
+import cc.kune.core.client.errors.ContentNotPermittedException;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.inject.Inject;
public class WikiServerTool implements ServerTool {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -31,23 +31,6 @@
import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor;
import org.ourproject.kune.platf.client.actions.ActionToolbarPosition;
import org.ourproject.kune.platf.client.actions.RadioMustBeChecked;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
-import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
-import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.InitDataDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.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.ErrorHandler;
-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.utils.DeferredCommandWrapper;
@@ -63,6 +46,24 @@
import org.ourproject.kune.workspace.client.upload.FileUploader;
import org.ourproject.kune.workspace.client.wave.WaveInsert;
+import cc.kune.core.client.errors.ErrorHandler;
+import cc.kune.core.client.errors.SessionExpiredException;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.ContentStatusDTO;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.InitDataDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,15 +1,16 @@
package org.ourproject.kune.workspace.client;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
-import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync;
import org.ourproject.kune.platf.client.services.AbstractExtendedModule;
-import org.ourproject.kune.platf.client.state.AccessRightsClientManager;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
import org.ourproject.kune.workspace.client.socialnet.ParticipateAction;
import org.ourproject.kune.workspace.client.socialnet.UnjoinAction;
+import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
+import cc.kune.core.client.state.AccessRightsClientManager;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.decorator.NoDecoration;
import com.calclab.suco.client.ioc.module.Factory;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -27,30 +27,13 @@
import org.ourproject.kune.platf.client.app.ApplicationComponentGroup;
import org.ourproject.kune.platf.client.app.GroupOptionsCollection;
import org.ourproject.kune.platf.client.app.UserOptionsCollection;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.StateTokenUtils;
-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;
-import org.ourproject.kune.platf.client.rpc.ContentService;
-import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
-import org.ourproject.kune.platf.client.rpc.GroupService;
-import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-import org.ourproject.kune.platf.client.rpc.I18nServiceAsync;
-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.AbstractExtendedModule;
-import org.ourproject.kune.platf.client.services.ErrorHandler;
import org.ourproject.kune.platf.client.services.ImageUtils;
import org.ourproject.kune.platf.client.services.Images;
import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister;
-import org.ourproject.kune.platf.client.state.AccessRightsClientManager;
-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.img.ImgResources;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
@@ -259,6 +242,24 @@
import org.ourproject.kune.workspace.client.wave.WaveInsertPanel;
import org.ourproject.kune.workspace.client.wave.WaveInsertPresenter;
+import cc.kune.core.client.errors.ErrorHandler;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.ContentService;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.rpcservices.GroupService;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.rpcservices.I18nServiceAsync;
+import cc.kune.core.client.rpcservices.SocialNetworkService;
+import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
+import cc.kune.core.client.rpcservices.UserServiceAsync;
+import cc.kune.core.client.state.AccessRightsClientManager;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.StateTokenUtils;
+import cc.kune.core.shared.dto.UserSimpleDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.decorator.NoDecoration;
import com.calclab.suco.client.ioc.decorator.Singleton;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,8 +20,9 @@
package org.ourproject.kune.workspace.client.cnt;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
public interface ActionContentToolbar extends ActionToolbar<StateToken> {
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,8 +21,9 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
public class ActionContentToolbarPresenter extends ActionToolbarPresenter<StateToken> implements ActionContentToolbar {
public ActionContentToolbarPresenter(ActionToolbarView<StateToken> toolbar) {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,7 +20,8 @@
package org.ourproject.kune.workspace.client.cnt;
import org.ourproject.kune.platf.client.actions.ActionRegistry;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
public class ContentActionRegistry extends ActionRegistry<StateToken> {
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentIconsRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentIconsRegistry.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentIconsRegistry.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,7 +21,7 @@
import java.util.HashMap;
-import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO;
+import cc.kune.core.shared.dto.BasicMimeTypeDTO;
public class ContentIconsRegistry {
private final HashMap<String, String> contentTypesIcons;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,13 +19,14 @@
*/
package org.ourproject.kune.workspace.client.cnt;
-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;
import org.ourproject.kune.platf.client.ui.RoundedPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.allen_sauer.gwt.log.client.Log;
import com.calclab.suco.client.events.Listener0;
import com.google.gwt.event.dom.client.ClickEvent;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,21 +21,22 @@
import org.ourproject.kune.platf.client.actions.ActionItemCollection;
import org.ourproject.kune.platf.client.actions.ActionRegistry;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.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;
import org.ourproject.kune.platf.client.ui.download.ImageSize;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils;
import org.ourproject.kune.workspace.client.AbstractFoldableContentActions;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.BasicMimeTypeDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,11 +19,12 @@
*/
package org.ourproject.kune.workspace.client.ctxnav;
-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.workspace.client.upload.FileUploader;
+import cc.kune.core.shared.dto.ContentStatusDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateToken;
+
public interface ContextNavigator {
void addFileUploaderListener(FileUploader uploader);
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,9 +20,10 @@
package org.ourproject.kune.workspace.client.ctxnav;
import org.ourproject.kune.platf.client.actions.ActionItemCollection;
-import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.ContentStatusDTO;
+import cc.kune.core.shared.dto.StateToken;
+
public class ContextNavigatorItem {
private final String id;
private final String parentId;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,12 +22,13 @@
import org.ourproject.kune.platf.client.actions.ActionItem;
import org.ourproject.kune.platf.client.actions.ActionManager;
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.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.dto.ContentStatusDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.allen_sauer.gwt.log.client.Log;
import com.calclab.suco.client.events.Listener;
import com.gwtext.client.core.EventObject;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -26,21 +26,7 @@
import org.ourproject.kune.platf.client.actions.ActionItemCollection;
import org.ourproject.kune.platf.client.actions.ActionRegistry;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO;
-import org.ourproject.kune.platf.client.dto.ContainerDTO;
-import org.ourproject.kune.platf.client.dto.ContainerSimpleDTO;
-import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
-import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
-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;
@@ -50,6 +36,21 @@
import org.ourproject.kune.workspace.client.title.RenameAction;
import org.ourproject.kune.workspace.client.upload.FileUploader;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.BasicMimeTypeDTO;
+import cc.kune.core.shared.dto.ContainerDTO;
+import cc.kune.core.shared.dto.ContainerSimpleDTO;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.ContentStatusDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.UserInfoDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.events.Listener2;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorView.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,9 +20,10 @@
package org.ourproject.kune.workspace.client.ctxnav;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.ContentStatusDTO;
+import cc.kune.core.shared.dto.StateToken;
+
public interface ContextNavigatorView extends View {
void addItem(ContextNavigatorItem contextNavigatorItem);
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AccessListsPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,13 +22,14 @@
import java.util.Iterator;
import org.ourproject.kune.platf.client.View;
-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.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.Images;
import org.ourproject.kune.platf.client.ui.IconLabel;
+import cc.kune.core.shared.dto.AccessListsDTO;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.GroupListDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.VerticalPanel;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextBottomToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextBottomToolbar.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextBottomToolbar.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,8 +22,9 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
public class ActionContextBottomToolbar extends ActionToolbarPresenter<StateToken> implements ActionToolbar<StateToken> {
public ActionContextBottomToolbar(ActionToolbarView<StateToken> toolbar) {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextTopToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextTopToolbar.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextTopToolbar.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,8 +22,9 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
public class ActionContextTopToolbar extends ActionToolbarPresenter<StateToken> implements ActionToolbar<StateToken> {
public ActionContextTopToolbar(ActionToolbarView<StateToken> toolbar) {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextActionRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextActionRegistry.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextActionRegistry.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,7 +20,8 @@
package org.ourproject.kune.workspace.client.cxt;
import org.ourproject.kune.platf.client.actions.ActionRegistry;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
public class ContextActionRegistry extends ActionRegistry<StateToken> {
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditor.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditor.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,7 +19,7 @@
*/
package org.ourproject.kune.workspace.client.cxt;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
public interface ContextPropEditor {
void attach();
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,16 +22,17 @@
import java.util.Date;
import java.util.List;
-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.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;
import org.ourproject.kune.workspace.client.i18n.LanguageSelectorPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.dto.AccessListsDTO;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+import cc.kune.core.shared.dto.UserSimpleDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.Provider;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,21 +22,22 @@
import java.util.Date;
import java.util.List;
-import org.ourproject.kune.platf.client.dto.AccessListsDTO;
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.TagCloudResultDTO;
-import org.ourproject.kune.platf.client.dto.UserSimpleDTO;
import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
-import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
-import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.workspace.client.tags.TagsSummary;
import org.ourproject.kune.workspace.client.title.EntitySubTitle;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.AccessListsDTO;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.TagCloudResultDTO;
+import cc.kune.core.shared.dto.UserSimpleDTO;
+
import com.calclab.suco.client.ioc.Provider;
public class ContextPropEditorPresenter implements ContextPropEditor {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorView.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,9 +22,9 @@
import java.util.Date;
import java.util.List;
-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 cc.kune.core.shared.dto.AccessListsDTO;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+import cc.kune.core.shared.dto.UserSimpleDTO;
public interface ContextPropEditorView {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/FoldableContextPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/FoldableContextPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/FoldableContextPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,12 +19,13 @@
*/
package org.ourproject.kune.workspace.client.cxt;
-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.state.StateManager;
import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,10 +1,11 @@
package org.ourproject.kune.workspace.client.editor;
import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister;
-import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister;
import org.ourproject.kune.platf.client.ui.rte.saving.RTESavingEditorPanel;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+
public class ContentEditorPanel extends RTESavingEditorPanel implements ContentEditorView {
public ContentEditorPanel(final ContentEditorPresenter presenter, final I18nUITranslationService i18n,
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -9,10 +9,7 @@
import org.ourproject.kune.platf.client.actions.KeyStroke;
import org.ourproject.kune.platf.client.actions.ui.ComplexToolbar;
import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.shortcuts.Keyboard;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette;
import org.ourproject.kune.platf.client.ui.rte.basic.RTEditor;
import org.ourproject.kune.platf.client.ui.rte.basic.RTEditorPanel;
@@ -31,6 +28,10 @@
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
import org.ourproject.kune.workspace.client.title.EntityTitle;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,15 +1,16 @@
package org.ourproject.kune.workspace.client.editor.insertlocalimg;
-import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO;
-import org.ourproject.kune.platf.client.dto.LinkDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.SearcherConstants;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPanel;
import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.BasicMimeTypeDTO;
+import cc.kune.core.shared.dto.LinkDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.gwtext.client.core.UrlParam;
import com.gwtext.client.widgets.form.Field;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,9 +1,10 @@
package org.ourproject.kune.workspace.client.editor.insertlocalimg;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialog;
import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPresenter;
+import cc.kune.core.client.state.Session;
+
public class InsertImageLocalPresenter extends InsertImageAbstractPresenter implements InsertImageLocal {
private final Session session;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,16 +19,17 @@
*/
package org.ourproject.kune.workspace.client.editor.insertlocallink;
-import org.ourproject.kune.platf.client.dto.LinkDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.StateTokenUtils;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.SearcherConstants;
import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPanel;
import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.dto.LinkDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.StateTokenUtils;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
public class InsertLinkLocalPanel extends InsertLinkAbstractPanel implements InsertLinkLocalView {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,14 +1,15 @@
package org.ourproject.kune.workspace.client.editor.insertlocalmedia;
-import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO;
-import org.ourproject.kune.platf.client.dto.LinkDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.SearcherConstants;
import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPanel;
import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField;
+import cc.kune.core.shared.dto.BasicMimeTypeDTO;
+import cc.kune.core.shared.dto.LinkDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.gwtext.client.core.UrlParam;
import com.gwtext.client.widgets.form.Field;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,11 +1,12 @@
package org.ourproject.kune.workspace.client.editor.insertlocalmedia;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPresenter;
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.ioc.Provider;
public class InsertMediaLocalPresenter extends InsertMediaAbstractPresenter implements InsertMediaLocal {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -25,14 +25,15 @@
import org.ourproject.kune.platf.client.actions.ui.ComplexToolbar;
import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip;
import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister;
-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;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.ioc.Provider;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,12 +21,13 @@
import org.ourproject.kune.platf.client.View;
import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.themes.WsTheme;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.GroupDTO;
+
import com.calclab.suco.client.events.Listener2;
public class EntityHeaderPresenter implements EntityHeader {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,10 +21,11 @@
import org.ourproject.kune.platf.client.View;
import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
import org.ourproject.kune.workspace.client.themes.WsTheme;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.StateToken;
+
public interface EntityHeaderView {
void addAction(GuiActionDescrip descriptor);
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -7,11 +7,12 @@
import org.ourproject.kune.platf.client.actions.KeyStroke;
import org.ourproject.kune.platf.client.actions.Shortcut;
import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.resources.client.ImageResource;
public class MaxMinWorkspacePresenter implements MaxMinWorkspace {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -31,8 +31,6 @@
import org.ourproject.kune.platf.client.actions.ui.MenuRadioItemDescriptor;
import org.ourproject.kune.platf.client.actions.ui.MenuSeparatorDescriptor;
import org.ourproject.kune.platf.client.actions.ui.PushButtonDescriptor;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationServiceMocked;
import org.ourproject.kune.platf.client.services.AbstractExtendedModule;
import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
@@ -41,6 +39,9 @@
import org.ourproject.kune.workspace.client.hello.HelloWorldModule.HelloWorldPanel.HelloWorldPresenter;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.client.i18n.I18nTranslationServiceMocked;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.allen_sauer.gwt.log.client.Log;
import com.calclab.suco.client.ioc.Provider;
import com.calclab.suco.client.ioc.decorator.Singleton;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,17 +19,18 @@
*/
package org.ourproject.kune.workspace.client.i18n;
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.Images;
import org.ourproject.kune.platf.client.services.SearcherConstants;
import org.ourproject.kune.platf.client.ui.AbstractSearcherPanel;
-import org.ourproject.kune.platf.client.ui.TextUtils;
import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.workspace.client.search.SiteBottomTrayButton;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.user.client.ui.Frame;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.gwtext.client.core.EventObject;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,12 +20,13 @@
package org.ourproject.kune.workspace.client.i18n;
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.state.Session;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.I18nServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+
import com.calclab.suco.client.events.Listener0;
import com.google.gwt.user.client.rpc.AsyncCallback;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelector.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelector.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelector.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,8 +20,9 @@
package org.ourproject.kune.workspace.client.i18n;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+
public interface LanguageSelector {
String getSelectedLanguage();
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,9 @@
*/
package org.ourproject.kune.workspace.client.i18n;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.gwtext.client.data.SimpleStore;
import com.gwtext.client.data.Store;
import com.gwtext.client.widgets.form.ComboBox;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,9 +20,10 @@
package org.ourproject.kune.workspace.client.i18n;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.state.Session;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+
public class LanguageSelectorPresenter implements LanguageSelector {
private LanguageSelectorView view;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -4,10 +4,11 @@
import org.ourproject.kune.platf.client.actions.Action;
import org.ourproject.kune.platf.client.actions.ActionEvent;
import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.Provider;
public class SiteOptionsI18nTranslatorAction extends AbstractAction {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,12 +19,13 @@
*/
package org.ourproject.kune.workspace.client.licensefoot;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.KuneWindowUtils;
import org.ourproject.kune.platf.client.ui.SimpleToolbar;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.MouseOutEvent;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,11 +20,12 @@
package org.ourproject.kune.workspace.client.licensefoot;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.state.StateManager;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+
import com.calclab.suco.client.events.Listener;
public class EntityLicensePresenter {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicenseView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicenseView.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicenseView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,8 +20,9 @@
package org.ourproject.kune.workspace.client.licensefoot;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
+import cc.kune.core.shared.dto.LicenseDTO;
+
public interface EntityLicenseView extends View {
void attach();
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,14 +19,15 @@
*/
package org.ourproject.kune.workspace.client.licensewizard;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
-import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-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 cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
import com.google.gwt.user.client.rpc.AsyncCallback;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,9 @@
*/
package org.ourproject.kune.workspace.client.licensewizard;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
+import cc.kune.core.shared.dto.LicenseDTO;
+
import com.calclab.suco.client.events.Listener;
public interface LicenseWizard {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,11 +19,12 @@
*/
package org.ourproject.kune.workspace.client.licensewizard;
-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;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class LicenseWizardPanel extends WizardDialog implements LicenseWizardView {
public static final String LIC_WIZ_DIALOG = "k-lwp-diag";
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,14 +22,15 @@
import java.util.List;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFirstFormView;
import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFrdFormView;
import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardSndFormView;
import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardTrdFormView;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.LicenseDTO;
+
import com.allen_sauer.gwt.log.client.Log;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,12 +19,13 @@
*/
package org.ourproject.kune.workspace.client.licensewizard.pages;
-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;
import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView;
+import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Event0;
import com.calclab.suco.client.events.Listener0;
import com.gwtext.client.widgets.form.Checkbox;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,11 +19,12 @@
*/
package org.ourproject.kune.workspace.client.licensewizard.pages;
-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;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.gwtext.client.widgets.Panel;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,13 +22,14 @@
import java.util.ArrayList;
import java.util.List;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-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;
import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Event0;
import com.calclab.suco.client.events.Listener0;
import com.gwtext.client.core.Template;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,11 +19,12 @@
*/
package org.ourproject.kune.workspace.client.licensewizard.pages;
-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;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.gwtext.client.widgets.form.FieldSet;
import com.gwtext.client.widgets.form.Label;
import com.gwtext.client.widgets.form.Radio;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,12 +19,13 @@
*/
package org.ourproject.kune.workspace.client.licensewizard.pages;
-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;
import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Event0;
import com.calclab.suco.client.events.Listener0;
import com.gwtext.client.widgets.PaddedPanel;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,6 @@
*/
package org.ourproject.kune.workspace.client.newgroup;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-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;
@@ -31,6 +29,9 @@
import org.ourproject.kune.workspace.client.WorkspaceMessages;
import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,22 +20,23 @@
package org.ourproject.kune.workspace.client.newgroup;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.GroupType;
-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.errors.UIException;
-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.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;
+import cc.kune.core.client.errors.GroupNameInUseException;
+import cc.kune.core.client.errors.UIException;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.GroupType;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
import com.google.gwt.user.client.rpc.AsyncCallback;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,9 +20,10 @@
package org.ourproject.kune.workspace.client.newgroup;
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;
+import cc.kune.core.shared.dto.LicenseDTO;
+
public interface NewGroupView extends View {
void center();
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,10 +20,11 @@
package org.ourproject.kune.workspace.client.nohomepage;
import org.ourproject.kune.platf.client.PlatfMessages;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.workspace.client.skel.EntityWorkspace;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.user.client.ui.Label;
public class NoHomePagePanel implements NoHomePageView {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,11 +20,12 @@
package org.ourproject.kune.workspace.client.nohomepage;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateNoContentDTO;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateNoContentDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,11 +22,12 @@
import org.ourproject.kune.platf.client.PlatfMessages;
import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip;
import org.ourproject.kune.platf.client.app.GroupOptionsCollection;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.Images;
import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel;
import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class GroupOptionsPanel extends AbstractTabbedDialogPanel implements GroupOptionsView {
public static final String GROUP_OP_PANEL_ID = "k-gop-diagpan";
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -23,13 +23,14 @@
import org.ourproject.kune.platf.client.actions.Action;
import org.ourproject.kune.platf.client.actions.ActionEvent;
import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter;
import org.ourproject.kune.platf.client.ui.img.ImgConstants;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
public class GroupOptionsPresenter extends AbstractTabbedDialogPresenter implements GroupOptions {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,11 +21,12 @@
import org.ourproject.kune.platf.client.PlatfMessages;
import org.ourproject.kune.platf.client.app.UserOptionsCollection;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.Images;
import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel;
import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class UserOptionsPanel extends AbstractTabbedDialogPanel implements UserOptionsView {
public static final String USER_OP_PANEL_ID = "k-uop-diagpan";
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -23,13 +23,14 @@
import org.ourproject.kune.platf.client.actions.Action;
import org.ourproject.kune.platf.client.actions.ActionEvent;
import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor;
-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.dialogs.tabbed.AbstractTabbedDialogPresenter;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserOptions;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener0;
public class UserOptionsPresenter extends AbstractTabbedDialogPresenter implements UserOptions {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,14 +19,15 @@
*/
package org.ourproject.kune.workspace.client.options.license;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-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;
import org.ourproject.kune.workspace.client.options.EntityOptionsView;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.ui.Image;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,13 +20,14 @@
package org.ourproject.kune.workspace.client.options.license;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction;
import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard;
import org.ourproject.kune.workspace.client.options.EntityOptions;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicenseView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicenseView.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicenseView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,8 +20,9 @@
package org.ourproject.kune.workspace.client.options.license;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
+import cc.kune.core.shared.dto.LicenseDTO;
+
public interface EntityOptionsDefLicenseView extends View {
void openWindow(String url);
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,13 +1,14 @@
package org.ourproject.kune.workspace.client.options.license;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction;
import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard;
import org.ourproject.kune.workspace.client.options.EntityOptions;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.events.Listener2;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,13 +1,14 @@
package org.ourproject.kune.workspace.client.options.license;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction;
import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard;
import org.ourproject.kune.workspace.client.options.EntityOptions;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.UserInfoDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,13 +20,14 @@
package org.ourproject.kune.workspace.client.options.logo;
import org.ourproject.kune.platf.client.PlatfMessages;
-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.FileConstants;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.workspace.client.options.EntityOptionsView;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.gwtext.client.core.Connection;
import com.gwtext.client.core.EventCallback;
import com.gwtext.client.core.EventObject;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,12 +21,13 @@
import org.ourproject.kune.chat.client.ChatEngine;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.rpc.UserServiceAsync;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
import org.ourproject.kune.workspace.client.options.EntityOptions;
+import cc.kune.core.client.rpcservices.UserServiceAsync;
+import cc.kune.core.client.state.Session;
+
import com.calclab.suco.client.ioc.Provider;
public abstract class EntityOptionsLogoPresenter implements GroupOptionsLogo, UserOptionsLogo {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,9 +1,10 @@
package org.ourproject.kune.workspace.client.options.logo;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.download.FileConstants;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class GroupOptionsLogoPanel extends EntityOptionsLogoPanel {
public static final String PANEL_ID = "k-golp-pan";
public static final String BUTTON_ID = "k-golp-sendb";
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,12 +1,13 @@
package org.ourproject.kune.workspace.client.options.logo;
import org.ourproject.kune.chat.client.ChatEngine;
-import org.ourproject.kune.platf.client.rpc.UserServiceAsync;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
import org.ourproject.kune.workspace.client.options.EntityOptions;
+import cc.kune.core.client.rpcservices.UserServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+
import com.calclab.suco.client.events.Listener2;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,9 +1,10 @@
package org.ourproject.kune.workspace.client.options.logo;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.download.FileConstants;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class UserOptionsLogoPanel extends EntityOptionsLogoPanel {
public static final String PANEL_ID = "k-uolp-pan";
public static final String BUTTON_ID = "k-uolp-sendb";
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,15 +1,16 @@
package org.ourproject.kune.workspace.client.options.logo;
import org.ourproject.kune.chat.client.ChatEngine;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
-import org.ourproject.kune.platf.client.rpc.UserServiceAsync;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
import org.ourproject.kune.workspace.client.options.EntityOptions;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.UserServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,7 @@
*/
package org.ourproject.kune.workspace.client.options.pscape;
-import org.ourproject.kune.platf.client.dto.StateToken;
-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.download.FileDownloadUtils;
import org.ourproject.kune.platf.client.ui.download.ImageSize;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
@@ -30,6 +27,10 @@
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
import org.ourproject.kune.workspace.client.themes.WsThemeSelector;
+import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.ui.HorizontalPanel;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,17 +1,18 @@
package org.ourproject.kune.workspace.client.options.pscape;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
-import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.options.EntityOptions;
import org.ourproject.kune.workspace.client.themes.WsBackManager;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,8 +20,9 @@
package org.ourproject.kune.workspace.client.options.pscape;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
public interface EntityOptionsPublicSpaceConfView extends View {
public void clearBackImage();
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/GroupOptionsPublicSpaceConfPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/GroupOptionsPublicSpaceConfPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/GroupOptionsPublicSpaceConfPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,16 +19,17 @@
*/
package org.ourproject.kune.workspace.client.options.pscape;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.options.EntityOptions;
import org.ourproject.kune.workspace.client.themes.WsBackManager;
import org.ourproject.kune.workspace.client.themes.WsTheme;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
import org.ourproject.kune.workspace.client.themes.WsThemeSelector;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/UserOptionsPublicSpaceConfPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/UserOptionsPublicSpaceConfPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/UserOptionsPublicSpaceConfPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,16 +19,17 @@
*/
package org.ourproject.kune.workspace.client.options.pscape;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.options.EntityOptions;
import org.ourproject.kune.workspace.client.themes.WsBackManager;
import org.ourproject.kune.workspace.client.themes.WsTheme;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
import org.ourproject.kune.workspace.client.themes.WsThemeSelector;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.UserInfoDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,12 +21,13 @@
import java.util.HashMap;
-import org.ourproject.kune.platf.client.dto.ToolSimpleDTO;
-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;
+import cc.kune.core.shared.dto.ToolSimpleDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.allen_sauer.gwt.log.client.Log;
import com.gwtext.client.widgets.ToolTip;
import com.gwtext.client.widgets.form.Checkbox;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -4,15 +4,16 @@
import java.util.List;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.StateToken;
-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.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
import org.ourproject.kune.workspace.client.options.EntityOptions;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.ToolSimpleDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.Provider;
import com.google.gwt.user.client.rpc.AsyncCallback;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfView.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,8 +20,9 @@
package org.ourproject.kune.workspace.client.options.tools;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.ToolSimpleDTO;
+import cc.kune.core.shared.dto.ToolSimpleDTO;
+
public interface EntityOptionsToolsConfView extends View {
void add(ToolSimpleDTO tool);
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,15 +22,16 @@
import java.util.Collection;
import java.util.List;
-import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-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.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.options.EntityOptions;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.ToolSimpleDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener2;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,15 +22,16 @@
import java.util.Collection;
import java.util.List;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.ToolSimpleDTO;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
-import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.options.EntityOptions;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.ToolSimpleDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
*/
package org.ourproject.kune.workspace.client.rate;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.Images;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.dom.client.Element;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,17 +19,18 @@
*/
package org.ourproject.kune.workspace.client.rate;
-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.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.RateResultDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
*/
package org.ourproject.kune.workspace.client.rate;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.workspace.client.skel.Toolbar;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.Image;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,12 +19,13 @@
\*/
package org.ourproject.kune.workspace.client.rate;
-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.registry.ContentCapabilitiesRegistry;
-import org.ourproject.kune.platf.client.state.StateManager;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.RateResultDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+
import com.calclab.suco.client.events.Listener;
public class RatePresenter {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,9 +1,10 @@
package org.ourproject.kune.workspace.client.search;
-import org.ourproject.kune.platf.client.dto.LinkDTO;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.SearcherConstants;
+import cc.kune.core.shared.dto.LinkDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,9 +19,10 @@
*/
package org.ourproject.kune.workspace.client.search;
-import org.ourproject.kune.platf.client.dto.LinkDTO;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import cc.kune.core.shared.dto.LinkDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.gwtext.client.widgets.form.FormPanel;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcher.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcher.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcher.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,9 @@
*/
package org.ourproject.kune.workspace.client.search;
-import org.ourproject.kune.platf.client.dto.LinkDTO;
+import cc.kune.core.shared.dto.LinkDTO;
+
import com.calclab.suco.client.events.Listener;
public interface EntityLiveSearcher {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,13 +19,14 @@
*/
package org.ourproject.kune.workspace.client.search;
-import org.ourproject.kune.platf.client.dto.LinkDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.SearcherConstants;
import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog;
import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
+import cc.kune.core.shared.dto.LinkDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
public class EntityLiveSearcherPanel implements EntityLiveSearcherView {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,8 +20,9 @@
package org.ourproject.kune.workspace.client.search;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.LinkDTO;
+import cc.kune.core.shared.dto.LinkDTO;
+
import com.calclab.suco.client.events.Listener;
public class EntityLiveSearcherPresenter implements EntityLiveSearcher {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,9 +19,10 @@
*/
package org.ourproject.kune.workspace.client.search;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class GroupLiveSearchPanel extends EntityLiveSearcherPanel {
public GroupLiveSearchPanel(final EntityLiveSearcherPresenter presenter, final I18nTranslationService i18n,
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,13 +19,14 @@
*/
package org.ourproject.kune.workspace.client.search;
-import org.ourproject.kune.platf.client.errors.UIException;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.services.SearcherConstants;
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;
+import cc.kune.core.client.errors.UIException;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.user.client.ui.HorizontalPanel;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,9 +22,10 @@
import java.util.HashMap;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
+import cc.kune.core.client.state.StateManager;
+
import com.calclab.suco.client.ioc.Provider;
public class SiteSearcherPresenter implements SiteSearcher {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,9 +19,10 @@
*/
package org.ourproject.kune.workspace.client.search;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class UserLiveSearcherPanel extends EntityLiveSearcherPanel {
public UserLiveSearcherPanel(final EntityLiveSearcherPresenter presenter, final I18nTranslationService i18n,
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,11 +19,12 @@
\*/
package org.ourproject.kune.workspace.client.signin;
-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;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.gwtext.client.data.SimpleStore;
import com.gwtext.client.data.Store;
import com.gwtext.client.widgets.form.ComboBox;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,13 +20,14 @@
package org.ourproject.kune.workspace.client.signin;
import org.ourproject.kune.platf.client.PlatfMessages;
-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;
import org.ourproject.kune.platf.client.ui.dialogs.InfoDialog;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener0;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,22 +21,23 @@
import org.ourproject.kune.platf.client.PlatfMessages;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.I18nCountryDTO;
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.dto.TimeZoneDTO;
-import org.ourproject.kune.platf.client.dto.UserDTO;
-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.errors.UIException;
-import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
-import org.ourproject.kune.platf.client.rpc.UserServiceAsync;
-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 com.calclab.emiteuimodule.client.SubscriptionMode;
+import cc.kune.core.client.errors.EmailAddressInUseException;
+import cc.kune.core.client.errors.GroupNameInUseException;
+import cc.kune.core.client.errors.UIException;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.UserServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.I18nCountryDTO;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+import cc.kune.core.shared.dto.SubscriptionMode;
+import cc.kune.core.shared.dto.TimeZoneDTO;
+import cc.kune.core.shared.dto.UserDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+
import com.calclab.suco.client.ioc.Provider;
import com.google.gwt.user.client.rpc.AsyncCallback;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,13 +21,14 @@
import java.util.Date;
-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.ExtendedDialog;
import org.ourproject.kune.platf.client.ui.dialogs.MessageToolbar;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener0;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Cookies;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,12 +19,13 @@
*/
package org.ourproject.kune.workspace.client.signin;
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-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 cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+
public class SignInAbstractPresenter {
protected final Session session;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,9 +19,10 @@
\*/
package org.ourproject.kune.workspace.client.signin;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.gwtext.client.core.EventObject;
import com.gwtext.client.widgets.form.Field;
import com.gwtext.client.widgets.form.TextField;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,11 +20,12 @@
package org.ourproject.kune.workspace.client.signin;
import org.ourproject.kune.platf.client.PlatfMessages;
-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;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener0;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,17 +21,18 @@
import org.ourproject.kune.platf.client.PlatfMessages;
import org.ourproject.kune.platf.client.View;
-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.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.site.SiteToken;
+import cc.kune.core.client.errors.UserAuthException;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.UserServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.UserDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+
import com.allen_sauer.gwt.log.client.Log;
import com.calclab.suco.client.ioc.Provider;
import com.google.gwt.user.client.rpc.AsyncCallback;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/WorkspaceNotifyUser.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,6 +1,5 @@
package org.ourproject.kune.workspace.client.site;
-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;
@@ -8,6 +7,8 @@
import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgress;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.events.Listener2;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,9 +20,10 @@
package org.ourproject.kune.workspace.client.sitebar.sitelogo;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.InitDataDTO;
-import org.ourproject.kune.platf.client.state.Session;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.InitDataDTO;
+
import com.calclab.suco.client.events.Listener;
public class SiteLogoPresenter implements SiteLogo {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
\*/
package org.ourproject.kune.workspace.client.sitebar.sitenewgroup;
-import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
import org.ourproject.kune.workspace.client.site.SiteToken;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+
import com.google.gwt.user.client.ui.Hyperlink;
public class SiteNewGroupLinkPanel implements SiteNewGroupLinkView {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,11 +20,12 @@
package org.ourproject.kune.workspace.client.sitebar.siteoptions;
import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister;
-import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
import org.ourproject.kune.platf.client.ui.AbstractToolbar;
import org.ourproject.kune.platf.client.ui.dialogs.InfoDialog;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+
import com.google.gwt.user.client.ui.Frame;
import com.gwtext.client.widgets.Panel;
import com.gwtext.client.widgets.layout.FitLayout;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -28,10 +28,11 @@
import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor;
import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor;
import org.ourproject.kune.platf.client.actions.ui.MenuSeparatorDescriptor;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.KuneWindowUtils;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
public class SiteOptionsPresenter extends AbstractActionExtensiblePresenter implements SiteOptions {
private SiteOptionsView view;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLink.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLink.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLink.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,7 +19,7 @@
\*/
package org.ourproject.kune.workspace.client.sitebar.sitepublic;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
public interface SitePublicSpaceLink {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,12 +19,13 @@
\*/
package org.ourproject.kune.workspace.client.sitebar.sitepublic;
-import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
import org.ourproject.kune.platf.client.services.Images;
import org.ourproject.kune.platf.client.ui.AbstractToolbar;
import org.ourproject.kune.platf.client.ui.IconLabel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.Window;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,15 +20,16 @@
package org.ourproject.kune.workspace.client.sitebar.sitepublic;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
-import org.ourproject.kune.platf.client.dto.GroupListDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.StateTokenUtils;
-import org.ourproject.kune.platf.client.state.StateManager;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.ContentStatusDTO;
+import cc.kune.core.shared.dto.GroupListDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.StateTokenUtils;
+
import com.calclab.suco.client.events.Listener;
public class SitePublicSpaceLinkPresenter implements SitePublicSpaceLink {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,9 +20,10 @@
package org.ourproject.kune.workspace.client.sitebar.sitesearch;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.workspace.client.search.SiteSearcher;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.Provider;
public class SiteSearchPresenter implements SiteSearch {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
\*/
package org.ourproject.kune.workspace.client.sitebar.sitesign;
-import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
import org.ourproject.kune.workspace.client.site.SiteToken;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+
import com.google.gwt.user.client.ui.Hyperlink;
public class SiteSignInLinkPanel implements SiteSignInLinkView {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,9 +20,10 @@
package org.ourproject.kune.workspace.client.sitebar.sitesign;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.state.Session;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.UserInfoDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLink.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLink.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLink.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,7 +19,7 @@
\*/
package org.ourproject.kune.workspace.client.sitebar.sitesign;
-import org.ourproject.kune.platf.client.actions.BeforeActionListener;
+import cc.kune.core.client.actions.BeforeActionListener;
public interface SiteSignOutLink {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
\*/
package org.ourproject.kune.workspace.client.sitebar.sitesign;
-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;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.ui.Label;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,17 +22,18 @@
import java.util.Date;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.actions.BeforeActionCollection;
-import org.ourproject.kune.platf.client.actions.BeforeActionListener;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-import org.ourproject.kune.platf.client.errors.SessionExpiredException;
-import org.ourproject.kune.platf.client.errors.UIException;
-import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
-import org.ourproject.kune.platf.client.rpc.UserServiceAsync;
-import org.ourproject.kune.platf.client.services.ErrorHandler;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
+import cc.kune.core.client.actions.BeforeActionCollection;
+import cc.kune.core.client.actions.BeforeActionListener;
+import cc.kune.core.client.errors.ErrorHandler;
+import cc.kune.core.client.errors.SessionExpiredException;
+import cc.kune.core.client.errors.UIException;
+import cc.kune.core.client.errors.UserMustBeLoggedException;
+import cc.kune.core.client.rpcservices.UserServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.UserInfoDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -31,14 +31,15 @@
import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip;
import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor;
import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
-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;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -26,13 +26,14 @@
import org.ourproject.kune.platf.client.actions.MenuItemsContainer;
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.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.AbstractToolbar;
import org.ourproject.kune.platf.client.ui.BasicThumb;
import org.ourproject.kune.workspace.client.skel.SummaryPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.dto.UserSimpleDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.google.gwt.dom.client.Element;
import com.google.gwt.event.dom.client.ClickEvent;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -29,26 +29,27 @@
import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor;
import org.ourproject.kune.platf.client.actions.RadioMustBeChecked;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
-import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-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.ImageUtils;
-import org.ourproject.kune.platf.client.state.AccessRightsClientManager;
-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.img.ImgResources;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionBuddiesSummaryToolbar;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
+import cc.kune.core.client.rpcservices.UserServiceAsync;
+import cc.kune.core.client.state.AccessRightsClientManager;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.SocialNetworkDataDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.UserBuddiesDataDTO;
+import cc.kune.core.shared.dto.UserBuddiesVisibilityDTO;
+import cc.kune.core.shared.dto.UserSimpleDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,8 +21,9 @@
import org.ourproject.kune.platf.client.View;
import org.ourproject.kune.platf.client.actions.ActionItemCollection;
-import org.ourproject.kune.platf.client.dto.UserSimpleDTO;
+import cc.kune.core.shared.dto.UserSimpleDTO;
+
public interface BuddiesSummaryView extends View {
String NOAVATAR = "";
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,8 +20,9 @@
package org.ourproject.kune.workspace.client.socialnet;
import org.ourproject.kune.platf.client.actions.ActionRegistry;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
/**
* The Class GroupActionRegistry stores actions over groups (mainly used in SN)
*/
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummary.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummary.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummary.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,9 +19,10 @@
*/
package org.ourproject.kune.workspace.client.socialnet;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
import org.ourproject.kune.platf.client.ui.MenuItem;
+import cc.kune.core.shared.dto.GroupDTO;
+
public interface GroupMembersSummary {
void addGroupOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged);
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,9 +22,6 @@
import org.ourproject.kune.platf.client.PlatfMessages;
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.GroupDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
import org.ourproject.kune.platf.client.ui.AbstractToolbar;
import org.ourproject.kune.platf.client.ui.gridmenu.GridDragConfiguration;
import org.ourproject.kune.platf.client.ui.gridmenu.GridItem;
@@ -32,6 +29,10 @@
import org.ourproject.kune.workspace.client.skel.SummaryPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.emiteuimodule.client.users.UserGridPanel;
import com.calclab.suco.client.events.Listener;
import com.google.gwt.core.client.Scheduler;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -26,27 +26,8 @@
import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor;
import org.ourproject.kune.platf.client.actions.RadioMustBeChecked;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
-import org.ourproject.kune.platf.client.dto.AccessListsDTO;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
-import org.ourproject.kune.platf.client.dto.AdmissionTypeDTO;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.InitDataDTO;
-import org.ourproject.kune.platf.client.dto.LinkDTO;
-import org.ourproject.kune.platf.client.dto.SocialNetworkDTO;
-import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO;
-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.ImageDescriptor;
import org.ourproject.kune.platf.client.services.ImageUtils;
-import org.ourproject.kune.platf.client.state.AccessRightsClientManager;
-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.download.FileDownloadUtils;
import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup;
@@ -55,6 +36,26 @@
import org.ourproject.kune.workspace.client.search.GroupLiveSearcher;
import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionGroupSummaryToolbar;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
+import cc.kune.core.client.state.AccessRightsClientManager;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.AccessListsDTO;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.AdmissionTypeDTO;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.InitDataDTO;
+import cc.kune.core.shared.dto.LinkDTO;
+import cc.kune.core.shared.dto.SocialNetworkDTO;
+import cc.kune.core.shared.dto.SocialNetworkDataDTO;
+import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.emite.core.client.xmpp.stanzas.XmppURI;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,9 +19,10 @@
\*/
package org.ourproject.kune.workspace.client.socialnet;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
import org.ourproject.kune.platf.client.ui.gridmenu.GridItem;
+import cc.kune.core.shared.dto.GroupDTO;
+
public interface GroupMembersSummaryView {
void addItem(GridItem<GroupDTO> gridItem);
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,17 +1,18 @@
package org.ourproject.kune.workspace.client.socialnet;
import org.ourproject.kune.platf.client.actions.ActionEvent;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
-import org.ourproject.kune.platf.client.dto.SocialNetworkRequestResult;
-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.state.AccessRightsClientManager;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
+import cc.kune.core.client.state.AccessRightsClientManager;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.SocialNetworkRequestResult;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.Provider;
public class ParticipateAction extends RolAction {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,15 +21,16 @@
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.GroupDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.AbstractToolbar;
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.SummaryPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.google.gwt.user.client.ui.Widget;
import com.gwtext.client.widgets.BoxComponent;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,21 +21,22 @@
import java.util.List;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-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.ImageUtils;
-import org.ourproject.kune.platf.client.state.AccessRightsClientManager;
-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.gridmenu.GridGroup;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionParticipationToolbar;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
+import cc.kune.core.client.state.AccessRightsClientManager;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.ParticipationDataDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,9 +20,10 @@
package org.ourproject.kune.workspace.client.socialnet;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
import org.ourproject.kune.platf.client.ui.gridmenu.GridItem;
+import cc.kune.core.shared.dto.GroupDTO;
+
public interface ParticipationSummaryView extends View {
void addItem(GridItem<GroupDTO> createGridItem);
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -2,13 +2,14 @@
import org.ourproject.kune.platf.client.actions.AbstractExtendedAction;
import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
-import org.ourproject.kune.platf.client.state.AccessRightsClientManager;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
+import cc.kune.core.client.state.AccessRightsClientManager;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener2;
import com.google.gwt.resources.client.ImageResource;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,7 +1,7 @@
package org.ourproject.kune.workspace.client.socialnet;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
public final class RolComparator {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -25,16 +25,6 @@
import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor;
import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor;
import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO;
-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.state.AccessRightsClientManager;
-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;
@@ -45,6 +35,17 @@
import org.ourproject.kune.platf.client.ui.img.ImgResources;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
+import cc.kune.core.client.state.AccessRightsClientManager;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.SocialNetworkDataDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,18 +1,19 @@
package org.ourproject.kune.workspace.client.socialnet;
import org.ourproject.kune.platf.client.actions.ActionEvent;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
-import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO;
-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.state.AccessRightsClientManager;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync;
+import cc.kune.core.client.state.AccessRightsClientManager;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.SocialNetworkDataDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UserActionRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UserActionRegistry.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UserActionRegistry.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,8 +20,9 @@
package org.ourproject.kune.workspace.client.socialnet;
import org.ourproject.kune.platf.client.actions.ActionRegistry;
-import org.ourproject.kune.platf.client.dto.UserSimpleDTO;
+import cc.kune.core.shared.dto.UserSimpleDTO;
+
/**
* The Class UserActionRegistry.
*
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -8,15 +8,16 @@
import org.ourproject.kune.platf.client.actions.PropertyChangeEvent;
import org.ourproject.kune.platf.client.actions.PropertyChangeListener;
import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-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.img.ImgConstants;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbar.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbar.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,8 +20,9 @@
package org.ourproject.kune.workspace.client.socialnet.toolbar;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
-import org.ourproject.kune.platf.client.dto.UserSimpleDTO;
+import cc.kune.core.shared.dto.UserSimpleDTO;
+
public interface ActionBuddiesSummaryToolbar extends ActionToolbar<UserSimpleDTO> {
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbarPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbarPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbarPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,8 +21,9 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
-import org.ourproject.kune.platf.client.dto.UserSimpleDTO;
+import cc.kune.core.shared.dto.UserSimpleDTO;
+
public class ActionBuddiesSummaryToolbarPresenter extends ActionToolbarPresenter<UserSimpleDTO> implements
ActionBuddiesSummaryToolbar {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbar.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbar.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,8 +20,9 @@
package org.ourproject.kune.workspace.client.socialnet.toolbar;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
public interface ActionGroupSummaryToolbar extends ActionToolbar<StateToken> {
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbarPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbarPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbarPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,8 +21,9 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
public class ActionGroupSummaryToolbarPresenter extends ActionToolbarPresenter<StateToken> implements
ActionGroupSummaryToolbar {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationSummaryToolbarPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationSummaryToolbarPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationSummaryToolbarPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -21,8 +21,9 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
public class ActionParticipationSummaryToolbarPresenter extends ActionToolbarPresenter<StateToken> implements
ActionParticipationToolbar {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationToolbar.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationToolbar.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,8 +20,9 @@
package org.ourproject.kune.workspace.client.socialnet.toolbar;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
public interface ActionParticipationToolbar extends ActionToolbar<StateToken> {
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummary.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummary.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummary.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,7 +19,7 @@
*/
package org.ourproject.kune.workspace.client.tags;
-import org.ourproject.kune.platf.client.dto.TagCloudResultDTO;
+import cc.kune.core.shared.dto.TagCloudResultDTO;
public interface TagsSummary {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,11 +19,12 @@
*/
package org.ourproject.kune.workspace.client.tags;
-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;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.ui.FlowPanel;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,15 +20,16 @@
package org.ourproject.kune.workspace.client.tags;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.TagCloudResultDTO;
-import org.ourproject.kune.platf.client.dto.TagCountDTO;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.search.SiteSearcher;
import org.ourproject.kune.workspace.client.search.SiteSearcherType;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.TagCloudResultDTO;
+import cc.kune.core.shared.dto.TagCountDTO;
+
import com.allen_sauer.gwt.log.client.Log;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,7 +1,8 @@
package org.ourproject.kune.workspace.client.themes;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,9 +1,10 @@
package org.ourproject.kune.workspace.client.themes;
import org.cobogw.gwt.user.client.CSS;
-import org.ourproject.kune.platf.client.dto.StateToken;
import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.events.Event;
import com.calclab.suco.client.events.Event0;
import com.calclab.suco.client.events.Listener;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,16 +19,17 @@
\*/
package org.ourproject.kune.workspace.client.themes;
-import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
-import org.ourproject.kune.platf.client.dto.InitDataDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
-import org.ourproject.kune.platf.client.rpc.GroupServiceAsync;
-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 cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.GroupServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.InitDataDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.events.Event2;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener2;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -8,10 +8,11 @@
import org.ourproject.kune.platf.client.actions.ui.CssStyleDescriptor;
import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor;
import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor;
-import org.ourproject.kune.platf.client.dto.InitDataDTO;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
-import org.ourproject.kune.platf.client.state.Session;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.InitDataDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Event;
import com.calclab.suco.client.events.Listener;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,13 +22,14 @@
import java.util.Date;
import org.ourproject.kune.platf.client.View;
-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.state.StateManager;
+import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+
import com.calclab.suco.client.events.Listener;
public class EntitySubTitlePresenter implements EntitySubTitle {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,15 +20,16 @@
package org.ourproject.kune.workspace.client.title;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
import org.ourproject.kune.platf.client.registry.RenamableRegistry;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.cnt.ContentIconsRegistry;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.events.Listener;
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,15 +19,16 @@
*/
package org.ourproject.kune.workspace.client.title;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-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.state.Session;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
+import cc.kune.core.client.errors.NameInUseException;
+import cc.kune.core.client.errors.NameNotPermittedException;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Event2;
import com.calclab.suco.client.events.Listener2;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tool/FoldableAbstractClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/tool/FoldableAbstractClientTool.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/tool/FoldableAbstractClientTool.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,11 +19,12 @@
*/
package org.ourproject.kune.workspace.client.tool;
-import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO;
import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
+import cc.kune.core.shared.dto.BasicMimeTypeDTO;
+
public abstract class FoldableAbstractClientTool extends AbstractClientTool {
public static final String UPLOADEDFILE_SUFFIX = "uploaded";
public static final String WAVE_SUFFIX = "wave";
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -20,10 +20,11 @@
package org.ourproject.kune.workspace.client.tool;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.StateToken;
import org.ourproject.kune.workspace.client.themes.WsTheme;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.events.Listener2;
public class ToolSelectorItemPresenter implements ToolSelectorItem {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -22,11 +22,12 @@
import java.util.HashMap;
import java.util.List;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.errors.UIException;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
+import cc.kune.core.client.errors.UIException;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+
import com.allen_sauer.gwt.log.client.Log;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener2;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,8 +19,9 @@
\*/
package org.ourproject.kune.workspace.client.upload;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.events.Listener;
public interface FileUploader {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,11 +19,12 @@
\*/
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 cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.client.utils.TextUtils;
+
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -19,10 +19,11 @@
\*/
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 cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.events.Event;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsert.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsert.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsert.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,6 +1,6 @@
package org.ourproject.kune.workspace.client.wave;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
public interface WaveInsert {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,9 +1,10 @@
package org.ourproject.kune.workspace.client.wave;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
import org.ourproject.kune.platf.client.ui.img.ImgConstants;
import org.ourproject.kune.platf.client.ui.img.ImgResources;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.emiteuimodule.client.dialog.BasicDialogExtended;
import com.calclab.emiteuimodule.client.dialog.BasicDialogListener;
import com.google.gwt.core.client.Scheduler;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPresenter.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPresenter.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -2,15 +2,16 @@
import org.ourproject.kune.docs.client.DocumentClientTool;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-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.ContentServiceAsync;
-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 cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.ioc.Provider;
public class WaveInsertPresenter implements WaveInsert {
Modified: trunk/src/main/resources/dozerBeanMapping.xml
===================================================================
--- trunk/src/main/resources/dozerBeanMapping.xml 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/main/resources/dozerBeanMapping.xml 2010-12-09 16:03:51 UTC (rev 1163)
@@ -7,69 +7,44 @@
<date-format>dd/mm/yyyy</date-format>
<wildcard>true</wildcard>
</configuration>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.InitDataDTO
- </class-a>
+ <class-a> cc.kune.core.shared.dto.InitDataDTO </class-a>
<class-b>org.ourproject.kune.platf.server.InitData</class-b>
<field>
<a>licenses</a>
<b>licenses</b>
- <a-hint>
- org.ourproject.kune.platf.client.dto.LicenseDTO
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.server.domain.License
- </b-hint>
+ <a-hint> cc.kune.core.shared.dto.LicenseDTO </a-hint>
+ <b-hint> org.ourproject.kune.platf.server.domain.License </b-hint>
</field>
<field>
<a>languages</a>
<b>languages</b>
- <a-hint>
- org.ourproject.kune.platf.client.dto.I18nLanguageSimpleDTO
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.server.domain.I18nLanguage
- </b-hint>
+ <a-hint> cc.kune.core.shared.dto.I18nLanguageSimpleDTO </a-hint>
+ <b-hint> org.ourproject.kune.platf.server.domain.I18nLanguage </b-hint>
</field>
<field>
<a>countries</a>
<b>countries</b>
- <a-hint>
- org.ourproject.kune.platf.client.dto.I18nCountryDTO
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.server.domain.I18nCountry
- </b-hint>
+ <a-hint> cc.kune.core.shared.dto.I18nCountryDTO </a-hint>
+ <b-hint> org.ourproject.kune.platf.server.domain.I18nCountry </b-hint>
</field>
</mapping>
-
<mapping>
<class-a>org.ourproject.kune.platf.server.domain.Group</class-a>
- <class-b>org.ourproject.kune.platf.client.dto.GroupDTO</class-b>
+ <class-b>cc.kune.core.shared.dto.GroupDTO</class-b>
<field type="one-way">
<a>hasLogo</a>
<b>hasLogo</b>
</field>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.GroupListDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.GroupList
- </class-b>
+ <class-a> cc.kune.core.shared.dto.GroupListDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.GroupList </class-b>
<field>
<a>list</a>
<b>list</b>
- <a-hint>
- org.ourproject.kune.platf.client.dto.GroupDTO
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.server.domain.Group
- </b-hint>
+ <a-hint> cc.kune.core.shared.dto.GroupDTO </a-hint>
+ <b-hint> org.ourproject.kune.platf.server.domain.Group </b-hint>
</field>
<field
custom-converter="org.ourproject.kune.platf.server.mapper.GroupListModeConverter">
@@ -77,141 +52,83 @@
<b>mode</b>
</field>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.AccessListsDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.AccessLists
- </class-b>
+ <class-a> cc.kune.core.shared.dto.AccessListsDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.AccessLists </class-b>
<field>
<a>admins</a>
<b>admins</b>
- <a-hint>
- org.ourproject.kune.platf.client.dto.GroupListDTO
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.server.domain.GroupList
- </b-hint>
+ <a-hint> cc.kune.core.shared.dto.GroupListDTO </a-hint>
+ <b-hint> org.ourproject.kune.platf.server.domain.GroupList </b-hint>
</field>
<field>
<a>editors</a>
<b>editors</b>
- <a-hint>
- org.ourproject.kune.platf.client.dto.GroupListDTO
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.server.domain.GroupList
- </b-hint>
+ <a-hint> cc.kune.core.shared.dto.GroupListDTO </a-hint>
+ <b-hint> org.ourproject.kune.platf.server.domain.GroupList </b-hint>
</field>
<field>
<a>viewers</a>
<b>viewers</b>
- <a-hint>
- org.ourproject.kune.platf.client.dto.GroupListDTO
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.server.domain.GroupList
- </b-hint>
+ <a-hint> cc.kune.core.shared.dto.GroupListDTO </a-hint>
+ <b-hint> org.ourproject.kune.platf.server.domain.GroupList </b-hint>
</field>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.AccessRightsDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.access.AccessRights
- </class-b>
+ <class-a> cc.kune.core.shared.dto.AccessRightsDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.access.AccessRights </class-b>
</mapping>
-
<mapping>
- <class-a>org.ourproject.kune.platf.client.dto.StateContentDTO</class-a>
+ <class-a>cc.kune.core.shared.dto.StateContentDTO</class-a>
<class-b>org.ourproject.kune.platf.server.state.StateContent</class-b>
<field>
<a>authors</a>
<b>authors</b>
- <a-hint>
- org.ourproject.kune.platf.client.dto.UserSimpleDTO
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.server.domain.User
- </b-hint>
+ <a-hint> cc.kune.core.shared.dto.UserSimpleDTO </a-hint>
+ <b-hint> org.ourproject.kune.platf.server.domain.User </b-hint>
</field>
</mapping>
-
- <mapping>
- <class-a>org.ourproject.kune.platf.client.dto.StateContainerDTO</class-a>
+ <mapping>
+ <class-a>cc.kune.core.shared.dto.StateContainerDTO</class-a>
<class-b>org.ourproject.kune.platf.server.state.StateContainer</class-b>
- <field>
+ <field>
<a>tagCloudResult</a>
<b>tagCloudResult</b>
- <a-hint>
- org.ourproject.kune.platf.client.dto.TagCloudResultDTO
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.server.domain.TagCloudResult
- </b-hint>
+ <a-hint> cc.kune.core.shared.dto.TagCloudResultDTO </a-hint>
+ <b-hint> org.ourproject.kune.platf.server.domain.TagCloudResult </b-hint>
</field>
</mapping>
-
<mapping>
- <class-a>org.ourproject.kune.platf.client.dto.StateAbstractDTO</class-a>
+ <class-a>cc.kune.core.shared.dto.StateAbstractDTO</class-a>
<class-b>org.ourproject.kune.platf.server.state.StateAbstract</class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.StateToken
- </class-a>
- <class-b>
- org.ourproject.kune.platf.client.dto.StateToken
- </class-b>
+ <class-a> cc.kune.core.shared.dto.StateToken </class-a>
+ <class-b> cc.kune.core.shared.dto.StateToken </class-b>
<field>
<a>encoded</a>
<b>encoded</b>
</field>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.BasicMimeType
- </class-b>
+ <class-a> cc.kune.core.shared.dto.BasicMimeTypeDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.BasicMimeType </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.LicenseDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.License
- </class-b>
+ <class-a> cc.kune.core.shared.dto.LicenseDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.License </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.ContainerSimpleDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.Container
- </class-b>
+ <class-a> cc.kune.core.shared.dto.ContainerSimpleDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.Container </class-b>
<field>
<a get-method="getStateToken">stateToken</a>
<b>stateToken</b>
</field>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.ContentSimpleDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.Content
- </class-b>
+ <class-a> cc.kune.core.shared.dto.ContentSimpleDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.Content </class-b>
<field>
<a>title</a>
<b>lastRevision.title</b>
@@ -221,12 +138,9 @@
<b>stateToken</b>
</field>
</mapping>
-
<mapping type="one-way">
- <class-a>
- org.ourproject.kune.platf.server.domain.Content
- </class-a>
- <class-b>org.ourproject.kune.platf.client.dto.LinkDTO</class-b>
+ <class-a> org.ourproject.kune.platf.server.domain.Content </class-a>
+ <class-b>cc.kune.core.shared.dto.LinkDTO</class-b>
<field>
<a>lastRevision.title</a>
<b>longName</b>
@@ -240,102 +154,57 @@
<b>link</b>
</field>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.ContainerDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.Container
- </class-b>
+ <class-a> cc.kune.core.shared.dto.ContainerDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.Container </class-b>
<field>
<a>contents</a>
<b>contents</b>
- <a-hint>
- org.ourproject.kune.platf.client.dto.ContentSimpleDTO
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.server.domain.Content
- </b-hint>
+ <a-hint> cc.kune.core.shared.dto.ContentSimpleDTO </a-hint>
+ <b-hint> org.ourproject.kune.platf.server.domain.Content </b-hint>
</field>
-
<field>
<a>absolutePath</a>
<b>absolutePath</b>
- <a-hint>
- org.ourproject.kune.platf.client.dto.ContainerSimpleDTO
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.server.domain.Container
- </b-hint>
+ <a-hint> cc.kune.core.shared.dto.ContainerSimpleDTO </a-hint>
+ <b-hint> org.ourproject.kune.platf.server.domain.Container </b-hint>
</field>
-
<field>
<a>childs</a>
<b>childs</b>
- <a-hint>
- org.ourproject.kune.platf.client.dto.ContainerSimpleDTO
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.server.domain.Container
- </b-hint>
+ <a-hint> cc.kune.core.shared.dto.ContainerSimpleDTO </a-hint>
+ <b-hint> org.ourproject.kune.platf.server.domain.Container </b-hint>
</field>
-
<field>
<a get-method="getStateToken">stateToken</a>
<b>stateToken</b>
</field>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.UserInfoDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.users.UserInfo
- </class-b>
+ <class-a> cc.kune.core.shared.dto.UserInfoDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.users.UserInfo </class-b>
<field>
<a>user</a>
<b>user</b>
- <a-hint>
- org.ourproject.kune.platf.client.dto.UserSimpleDTO
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.server.domain.User
- </b-hint>
+ <a-hint> cc.kune.core.shared.dto.UserSimpleDTO </a-hint>
+ <b-hint> org.ourproject.kune.platf.server.domain.User </b-hint>
</field>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.ParticipationDataDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.sn.ParticipationData
- </class-b>
+ <class-a> cc.kune.core.shared.dto.ParticipationDataDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.sn.ParticipationData </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.I18nLanguageDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.I18nLanguage
- </class-b>
+ <class-a> cc.kune.core.shared.dto.I18nLanguageDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.I18nLanguage </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.I18nCountryDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.I18nCountry
- </class-b>
+ <class-a> cc.kune.core.shared.dto.I18nCountryDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.I18nCountry </class-b>
</mapping>
-
<mapping>
<class-a>org.ourproject.kune.platf.server.domain.User</class-a>
- <class-b>org.ourproject.kune.platf.client.dto.UserSimpleDTO</class-b>
+ <class-b>cc.kune.core.shared.dto.UserSimpleDTO</class-b>
<field type="one-way">
<a>hasLogo</a>
<b>hasLogo</b>
@@ -345,177 +214,94 @@
<b>stateToken</b>
</field>
</mapping>
-
<mapping>
- <class-a>org.ourproject.kune.platf.client.dto.TagDTO</class-a>
+ <class-a>cc.kune.core.shared.dto.TagDTO</class-a>
<class-b>org.ourproject.kune.platf.server.domain.Tag</class-b>
</mapping>
-
-<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.TagCloudResultDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.TagCloudResult
- </class-b>
+ <mapping>
+ <class-a> cc.kune.core.shared.dto.TagCloudResultDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.TagCloudResult </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.TagCountDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.TagCount
- </class-b>
+ <class-a> cc.kune.core.shared.dto.TagCountDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.TagCount </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.RateResultDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.RateResult
- </class-b>
+ <class-a> cc.kune.core.shared.dto.RateResultDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.RateResult </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.server.domain.Comment
- </class-a>
- <class-b>
- org.ourproject.kune.platf.client.dto.CommentDTO
- </class-b>
+ <class-a> org.ourproject.kune.platf.server.domain.Comment </class-a>
+ <class-b> cc.kune.core.shared.dto.CommentDTO </class-b>
<field>
<a>author</a>
<b>author</b>
- <a-hint>
- org.ourproject.kune.platf.server.domain.User
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.client.dto.UserSimpleDTO
- </b-hint>
+ <a-hint> org.ourproject.kune.platf.server.domain.User </a-hint>
+ <b-hint> cc.kune.core.shared.dto.UserSimpleDTO </b-hint>
</field>
-
<field>
<a>childs</a>
<b>childs</b>
- <a-hint>
- org.ourproject.kune.platf.server.domain.Comment
- </a-hint>
- <b-hint>
- org.ourproject.kune.platf.client.dto.CommentDTO
- </b-hint>
+ <a-hint> org.ourproject.kune.platf.server.domain.Comment </a-hint>
+ <b-hint> cc.kune.core.shared.dto.CommentDTO </b-hint>
</field>
-
<field type="one-way">
- <a get-method="getPositiveVotersCount">
- positiveVotersCount
- </a>
+ <a get-method="getPositiveVotersCount"> positiveVotersCount </a>
<b>positiveVotersCount</b>
</field>
-
<field type="one-way">
- <a get-method="getNegativeVotersCount">
- negativeVotersCount
- </a>
+ <a get-method="getNegativeVotersCount"> negativeVotersCount </a>
<b>negativeVotersCount</b>
</field>
-
<field type="one-way">
- <a get-method="getAbuseInformersCount">
- abuseInformersCount
- </a>
+ <a get-method="getAbuseInformersCount"> abuseInformersCount </a>
<b>abuseInformersCount</b>
</field>
</mapping>
-
<mapping>
- <class-a>org.ourproject.kune.platf.client.dto.LinkDTO</class-a>
+ <class-a>cc.kune.core.shared.dto.LinkDTO</class-a>
<class-b>org.ourproject.kune.platf.server.domain.User</class-b>
<field>
<a>longName</a>
<b>name</b>
</field>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.ChatUserParamsDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.ChatUserParams
- </class-b>
+ <class-a> cc.kune.core.shared.dto.ChatUserParamsDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.ChatUserParams </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.SocialNetworkVisibilityDTO
- </class-a>
+ <class-a> cc.kune.core.shared.dto.SocialNetworkVisibilityDTO </class-a>
<class-b>
- org.ourproject.kune.platf.server.domain.SocialNetworkVisibility
- </class-b>
+ org.ourproject.kune.platf.server.domain.SocialNetworkVisibility </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.AdmissionTypeDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.AdmissionType
- </class-b>
+ <class-a> cc.kune.core.shared.dto.AdmissionTypeDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.AdmissionType </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.UserBuddiesVisibilityDTO
- </class-a>
+ <class-a> cc.kune.core.shared.dto.UserBuddiesVisibilityDTO </class-a>
<class-b>
- org.ourproject.kune.platf.server.domain.UserBuddiesVisibility
- </class-b>
+ org.ourproject.kune.platf.server.domain.UserBuddiesVisibility </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.ContentStatusDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.ContentStatus
- </class-b>
+ <class-a> cc.kune.core.shared.dto.ContentStatusDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.ContentStatus </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.AccessRolDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.access.AccessRol
- </class-b>
+ <class-a> cc.kune.core.shared.dto.AccessRolDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.access.AccessRol </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.ToolSimpleDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.tool.ToolSimple
- </class-b>
+ <class-a> cc.kune.core.shared.dto.ToolSimpleDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.tool.ToolSimple </class-b>
</mapping>
-
<mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.UserBuddiesDataDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.sn.UserBuddiesData
- </class-b>
+ <class-a> cc.kune.core.shared.dto.UserBuddiesDataDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.sn.UserBuddiesData </class-b>
</mapping>
-
- <mapping>
- <class-a>
- org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO
- </class-a>
- <class-b>
- org.ourproject.kune.platf.server.domain.SocialNetworkData
- </class-b>
+ <mapping>
+ <class-a> cc.kune.core.shared.dto.SocialNetworkDataDTO </class-a>
+ <class-b> org.ourproject.kune.platf.server.domain.SocialNetworkData </class-b>
</mapping>
</mappings>
\ No newline at end of file
Copied: trunk/src/test/java/cc/kune/core/client/state (from rev 1158, trunk/src/test/java/org/ourproject/kune/platf/client/state)
Modified: trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,17 +1,17 @@
-package org.ourproject.kune.platf.client.state;
+package cc.kune.core.client.state;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.ourproject.kune.platf.client.actions.BeforeActionListener;
-import org.ourproject.kune.platf.client.app.HistoryWrapper;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
import org.ourproject.kune.workspace.client.site.SiteToken;
+import cc.kune.core.client.actions.BeforeActionListener;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.testing.events.MockedListener;
import com.calclab.suco.testing.events.MockedListener0;
import com.calclab.suco.testing.events.MockedListener2;
@@ -123,7 +123,7 @@
@SuppressWarnings("unchecked")
@Test
public void oneBeforeStateChangeListenerAddAndRemove() {
- String newToken = confBeforeStateChangeListeners(false, false);
+ final String newToken = confBeforeStateChangeListeners(false, false);
stateManager.onHistoryChanged(newToken);
removeBeforeStateChangeListener();
stateManager.onHistoryChanged(newToken);
@@ -133,7 +133,7 @@
@Test
public void oneBeforeStateChangeListenerFalseAndResume() {
- String token = confBeforeStateChangeListeners(false, true);
+ final String token = confBeforeStateChangeListeners(false, true);
stateManager.onHistoryChanged(token);
Mockito.verify(history, Mockito.never()).newItem(token);
removeBeforeStateChangeListener();
@@ -179,23 +179,23 @@
@Test
public void siteTokenTest() {
- MockedListener0 siteTokenListener = new MockedListener0();
+ final MockedListener0 siteTokenListener = new MockedListener0();
stateManager.addSiteToken("signin", siteTokenListener);
stateManager.onHistoryChanged("signIn");
siteTokenListener.isCalledOnce();
}
- private void changeState(String... tokens) {
- for (String token : tokens) {
+ private void changeState(final String... tokens) {
+ for (final String token : tokens) {
Mockito.when(state.getStateToken()).thenReturn(new StateToken(token));
stateManager.setState(state);
}
}
- private String confBeforeStateChangeListeners(boolean value, boolean value2) {
+ private String confBeforeStateChangeListeners(final boolean value, final boolean value2) {
stateManager.addBeforeStateChangeListener(beforeChangeListener1);
stateManager.addBeforeStateChangeListener(beforeChangeListener2);
- String newToken = "something";
+ final String newToken = "something";
Mockito.when(beforeChangeListener1.beforeAction()).thenReturn(value);
Mockito.when(beforeChangeListener2.beforeAction()).thenReturn(value2);
return newToken;
Modified: trunk/src/test/java/cc/kune/core/client/state/StateTokenTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/state/StateTokenTest.java 2010-12-07 22:38:26 UTC (rev 1158)
+++ trunk/src/test/java/cc/kune/core/client/state/StateTokenTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,12 +1,13 @@
-package org.ourproject.kune.platf.client.state;
+package cc.kune.core.client.state;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.StateToken;
+import cc.kune.core.shared.dto.StateToken;
+
public class StateTokenTest {
@Test
Modified: trunk/src/test/java/org/ourproject/kune/blogs/server/BlogServerToolTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/blogs/server/BlogServerToolTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/blogs/server/BlogServerToolTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -7,9 +7,10 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException;
-import org.ourproject.kune.platf.client.errors.ContentNotPermittedException;
+import cc.kune.core.client.errors.ContainerNotPermittedException;
+import cc.kune.core.client.errors.ContentNotPermittedException;
+
public class BlogServerToolTest { // extends PersistenceTest {
private BlogServerTool serverTool;
Modified: trunk/src/test/java/org/ourproject/kune/gallery/server/GalleryServerToolTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/gallery/server/GalleryServerToolTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/gallery/server/GalleryServerToolTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -6,8 +6,9 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException;
+import cc.kune.core.client.errors.ContainerNotPermittedException;
+
public class GalleryServerToolTest { // extends PersistenceTest {
private GalleryServerTool serverTool;
Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -5,11 +5,12 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.state.Session;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.calclab.suco.client.events.Listener;
public class ActionRegistryTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/ContentIconsRegistryTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/actions/ContentIconsRegistryTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ContentIconsRegistryTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -4,9 +4,10 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO;
import org.ourproject.kune.workspace.client.cnt.ContentIconsRegistry;
+import cc.kune.core.shared.dto.BasicMimeTypeDTO;
+
public class ContentIconsRegistryTest {
private static final String CONTENT_TYPE_TEST = "somecontenttype";
Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/KeyStrokeTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/actions/KeyStrokeTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/KeyStrokeTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -5,11 +5,12 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationServiceMocked;
import org.ourproject.kune.platf.client.i18n.Resources;
import org.ourproject.kune.platf.client.shortcuts.Keyboard;
import org.ourproject.kune.platf.client.shortcuts.ShortcutDescriptor;
+import cc.kune.core.client.i18n.I18nTranslationServiceMocked;
+
public class KeyStrokeTest {
@Test
Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/ShortcutTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/actions/ShortcutTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ShortcutTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -4,9 +4,10 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationServiceMocked;
import org.ourproject.kune.platf.client.i18n.Resources;
+import cc.kune.core.client.i18n.I18nTranslationServiceMocked;
+
public class ShortcutTest {
@Test
public void altS() {
Modified: trunk/src/test/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTOTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTOTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTOTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -4,6 +4,8 @@
import org.junit.Test;
+import cc.kune.core.shared.dto.BasicMimeTypeDTO;
+
public class BasicMimeTypeDTOTest {
@Test
Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -6,6 +6,8 @@
import org.junit.Test;
+import cc.kune.core.client.utils.TextUtils;
+
public class KuneStringUtilsTest {
@Test
Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -4,6 +4,8 @@
import org.junit.Test;
+import cc.kune.core.client.utils.TextUtils;
+
public class TextUtilsTest {
@Test
public void matchDemoEmail() {
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -7,11 +7,12 @@
import org.junit.Test;
import org.mockito.Mockito;
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.workspace.client.upload.FileUploaderPresenter;
import org.ourproject.kune.workspace.client.upload.FileUploaderView;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.StateToken;
+
public class FileUploaderPresenterTest {
private static final String SOMEUSER_HASH = "someuserHash";
Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -6,8 +6,9 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.ExtMediaDescripDTO;
+import cc.kune.core.shared.dto.ExtMediaDescripDTO;
+
public class ExternalMediaDescriptorTest {
private ExtMediaDescripDTO ytmedia;
Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenterTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenterTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenterTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -7,14 +7,15 @@
import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.internal.verification.api.VerificationMode;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
-import org.ourproject.kune.platf.client.i18n.I18nTranslationServiceMocked;
import org.ourproject.kune.platf.client.i18n.Resources;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources;
import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper;
import org.ourproject.kune.platf.client.utils.TimerWrapper;
+import cc.kune.core.client.i18n.I18nTranslationServiceMocked;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.calclab.suco.client.events.Listener0;
import com.calclab.suco.testing.events.MockedListener;
import com.calclab.suco.testing.events.MockedListener0;
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,10 +1,11 @@
package org.ourproject.kune.platf.integration;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-import org.ourproject.kune.platf.client.rpc.UserService;
import org.ourproject.kune.platf.server.UserSession;
import org.ourproject.kune.platf.server.properties.DatabaseProperties;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.rpcservices.UserService;
+
import com.google.inject.Inject;
public abstract class IntegrationTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -4,12 +4,13 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.CommentDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.errors.DefaultException;
-import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
+import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.client.errors.UserMustBeLoggedException;
+import cc.kune.core.shared.dto.CommentDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+
public class ContentCommentServiceTest extends ContentServiceIntegrationTest {
private StateContainerDTO defaultContent;
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -9,18 +9,19 @@
import org.junit.Test;
import org.ourproject.kune.docs.client.DocumentClientTool;
import org.ourproject.kune.docs.server.DocumentServerTool;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.ContainerDTO;
-import org.ourproject.kune.platf.client.dto.ContainerSimpleDTO;
-import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
-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.errors.ContentNotFoundException;
-import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
import org.ourproject.kune.wiki.server.WikiServerTool;
+import cc.kune.core.client.errors.ContentNotFoundException;
+import cc.kune.core.client.errors.UserMustBeLoggedException;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.ContainerDTO;
+import cc.kune.core.shared.dto.ContainerSimpleDTO;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+
public class ContentServiceAddTest extends ContentServiceIntegrationTest {
private StateContentDTO defaultContent;
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -6,14 +6,15 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateNoContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.errors.ContentNotFoundException;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
+import cc.kune.core.client.errors.ContentNotFoundException;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateNoContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+
public class ContentServiceGetTest extends ContentServiceIntegrationTest {
@Test
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,11 +1,12 @@
package org.ourproject.kune.platf.integration.content;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.rpc.ContentService;
-import org.ourproject.kune.platf.client.rpc.UserService;
import org.ourproject.kune.platf.integration.IntegrationTest;
+import cc.kune.core.client.rpcservices.ContentService;
+import cc.kune.core.client.rpcservices.UserService;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.Inject;
public abstract class ContentServiceIntegrationTest extends IntegrationTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceSaveTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceSaveTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceSaveTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -4,10 +4,11 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
import org.ourproject.kune.platf.server.TestDomainHelper;
+import cc.kune.core.shared.dto.StateContentDTO;
+
public class ContentServiceSaveTest extends ContentServiceIntegrationTest {
private StateContentDTO defaultContent;
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -12,18 +12,19 @@
import org.junit.Test;
import org.ourproject.kune.docs.client.DocumentClientTool;
import org.ourproject.kune.docs.server.DocumentServerTool;
-import org.ourproject.kune.platf.client.dto.ContainerDTO;
-import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.TagCloudResultDTO;
-import org.ourproject.kune.platf.client.dto.TagCountDTO;
-import org.ourproject.kune.platf.client.dto.UserSimpleDTO;
-import org.ourproject.kune.platf.client.errors.AccessViolationException;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
+import cc.kune.core.client.errors.AccessViolationException;
+import cc.kune.core.shared.dto.ContainerDTO;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.TagCloudResultDTO;
+import cc.kune.core.shared.dto.TagCountDTO;
+import cc.kune.core.shared.dto.UserSimpleDTO;
+
public class ContentServiceVariousTest extends ContentServiceIntegrationTest {
private StateContentDTO defaultContent;
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -4,17 +4,18 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.GroupType;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
-import org.ourproject.kune.platf.client.rpc.GroupService;
import org.ourproject.kune.platf.integration.IntegrationTest;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
import org.ourproject.kune.platf.server.UserSession;
import org.ourproject.kune.platf.server.domain.AdmissionType;
import org.ourproject.kune.platf.server.domain.Group;
+import cc.kune.core.client.errors.UserMustBeLoggedException;
+import cc.kune.core.client.rpcservices.GroupService;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.GroupType;
+import cc.kune.core.shared.dto.LicenseDTO;
+
import com.google.inject.Inject;
public class GroupServiceTest extends IntegrationTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -8,15 +8,16 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.InitDataDTO;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.rpc.SiteService;
import org.ourproject.kune.platf.integration.IntegrationTest;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
import org.ourproject.kune.platf.server.UserSession;
import org.ourproject.kune.platf.server.domain.Group;
import org.ourproject.kune.platf.server.manager.I18nLanguageManager;
+import cc.kune.core.client.rpcservices.SiteService;
+import cc.kune.core.shared.dto.InitDataDTO;
+import cc.kune.core.shared.dto.LicenseDTO;
+
import com.google.inject.Inject;
public class SiteServiceTest extends IntegrationTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -1,23 +1,11 @@
package org.ourproject.kune.platf.integration.site;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.I18nCountryDTO;
-import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
-import org.ourproject.kune.platf.client.dto.TimeZoneDTO;
-import org.ourproject.kune.platf.client.dto.UserDTO;
-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.errors.SessionExpiredException;
-import org.ourproject.kune.platf.client.rpc.UserService;
import org.ourproject.kune.platf.integration.IntegrationTest;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
import org.ourproject.kune.platf.server.domain.Group;
@@ -27,7 +15,18 @@
import org.ourproject.kune.platf.server.users.UserInfo;
import org.ourproject.kune.platf.server.users.UserInfoService;
-import com.calclab.emiteuimodule.client.SubscriptionMode;
+import cc.kune.core.client.errors.EmailAddressInUseException;
+import cc.kune.core.client.errors.GroupNameInUseException;
+import cc.kune.core.client.errors.SessionExpiredException;
+import cc.kune.core.client.rpcservices.UserService;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.I18nCountryDTO;
+import cc.kune.core.shared.dto.I18nLanguageDTO;
+import cc.kune.core.shared.dto.SubscriptionMode;
+import cc.kune.core.shared.dto.TimeZoneDTO;
+import cc.kune.core.shared.dto.UserDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+
import com.google.inject.Inject;
public class UserServiceTest extends IntegrationTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -4,15 +4,16 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.errors.AlreadyUserMemberException;
-import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
-import org.ourproject.kune.platf.client.rpc.SocialNetworkService;
import org.ourproject.kune.platf.integration.IntegrationTest;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
import org.ourproject.kune.platf.server.UserSession;
+import cc.kune.core.client.errors.AlreadyUserMemberException;
+import cc.kune.core.client.errors.UserMustBeLoggedException;
+import cc.kune.core.client.rpcservices.SocialNetworkService;
+import cc.kune.core.shared.dto.SocialNetworkDataDTO;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.Inject;
public class SocialNetworkServiceTest extends IntegrationTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -6,8 +6,6 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.errors.ContentNotFoundException;
import org.ourproject.kune.platf.server.TestDomainHelper;
import org.ourproject.kune.platf.server.content.CommentManager;
import org.ourproject.kune.platf.server.content.ContainerManager;
@@ -19,6 +17,9 @@
import org.ourproject.kune.platf.server.manager.GroupManager;
import org.ourproject.kune.platf.server.manager.RateManager;
+import cc.kune.core.client.errors.ContentNotFoundException;
+import cc.kune.core.shared.dto.StateToken;
+
public class FinderTest {
private GroupManager groupManager;
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptorTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptorTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptorTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -6,11 +6,12 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.ourproject.kune.platf.client.errors.SessionExpiredException;
-import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
import org.ourproject.kune.platf.integration.IntegrationTest;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
+import cc.kune.core.client.errors.SessionExpiredException;
+import cc.kune.core.client.errors.UserMustBeLoggedException;
+
public class AuthenticatedMethodInterceptorTest extends IntegrationTest {
private AuthenticatedMethodInterceptor auth;
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -6,13 +6,14 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.errors.AccessViolationException;
-import org.ourproject.kune.platf.client.errors.ContentNotFoundException;
import org.ourproject.kune.platf.integration.IntegrationTest;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
import org.ourproject.kune.platf.server.access.AccessRol;
+import cc.kune.core.client.errors.AccessViolationException;
+import cc.kune.core.client.errors.ContentNotFoundException;
+import cc.kune.core.shared.dto.StateToken;
+
import com.wideplay.warp.persist.Transactional;
public class AuthorizatedMethodInterceptorTest extends IntegrationTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -7,10 +7,6 @@
import org.apache.lucene.queryParser.ParseException;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.GroupType;
-import org.ourproject.kune.platf.client.errors.EmailAddressInUseException;
-import org.ourproject.kune.platf.client.errors.GroupNameInUseException;
-import org.ourproject.kune.platf.client.errors.I18nNotFoundException;
import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest;
import org.ourproject.kune.platf.server.domain.AccessLists;
import org.ourproject.kune.platf.server.domain.Group;
@@ -18,6 +14,11 @@
import org.ourproject.kune.platf.server.domain.User;
import org.ourproject.kune.platf.server.manager.impl.SearchResult;
+import cc.kune.core.client.errors.EmailAddressInUseException;
+import cc.kune.core.client.errors.GroupNameInUseException;
+import cc.kune.core.client.errors.I18nNotFoundException;
+import cc.kune.core.shared.dto.GroupType;
+
public class GroupManagerTest extends PersistencePreLoadedDataTest {
@Test
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 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -9,12 +9,13 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-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;
import org.ourproject.kune.platf.server.domain.I18nTranslation;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
import com.google.inject.Inject;
public class I18nManagerTest extends PersistenceTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -11,12 +11,13 @@
import org.apache.lucene.queryParser.ParseException;
import org.hibernate.validator.InvalidStateException;
import org.junit.Test;
-import org.ourproject.kune.platf.client.errors.I18nNotFoundException;
import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest;
import org.ourproject.kune.platf.server.domain.Group;
import org.ourproject.kune.platf.server.domain.User;
import org.ourproject.kune.platf.server.manager.impl.SearchResult;
+import cc.kune.core.client.errors.I18nNotFoundException;
+
import com.google.inject.Inject;
public class UserManagerTest extends PersistencePreLoadedDataTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManagerTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManagerTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -7,12 +7,13 @@
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.errors.SessionExpiredException;
-import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
import org.ourproject.kune.platf.integration.content.ContentServiceIntegrationTest;
+import cc.kune.core.client.errors.SessionExpiredException;
+import cc.kune.core.client.errors.UserMustBeLoggedException;
+import cc.kune.core.shared.dto.StateContainerDTO;
+
import com.google.inject.Inject;
public class EntityLogoUploadManagerTest extends ContentServiceIntegrationTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -11,13 +11,14 @@
import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mockito;
-import org.ourproject.kune.platf.client.dto.StateToken;
import org.ourproject.kune.platf.client.ui.download.ImageSize;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
import org.ourproject.kune.platf.server.domain.BasicMimeType;
import org.ourproject.kune.platf.server.domain.Content;
import org.ourproject.kune.platf.server.properties.KuneProperties;
+import cc.kune.core.shared.dto.StateToken;
+
import com.google.inject.Inject;
public class FileDownloadManagerTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -2,11 +2,12 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.errors.SessionExpiredException;
-import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
import org.ourproject.kune.platf.integration.content.ContentServiceIntegrationTest;
+import cc.kune.core.client.errors.SessionExpiredException;
+import cc.kune.core.client.errors.UserMustBeLoggedException;
+
import com.google.inject.Inject;
public class FileUploadManagerTest extends ContentServiceIntegrationTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -7,11 +7,6 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.GroupType;
-import org.ourproject.kune.platf.client.dto.SocialNetworkRequestResult;
-import org.ourproject.kune.platf.client.errors.AccessViolationException;
-import org.ourproject.kune.platf.client.errors.AlreadyGroupMemberException;
-import org.ourproject.kune.platf.client.errors.LastAdminInGroupException;
import org.ourproject.kune.platf.server.PersistenceTest;
import org.ourproject.kune.platf.server.domain.AdmissionType;
import org.ourproject.kune.platf.server.domain.Group;
@@ -20,6 +15,12 @@
import org.ourproject.kune.platf.server.sn.ParticipationData;
import org.ourproject.kune.testhelper.ctx.DomainContext;
+import cc.kune.core.client.errors.AccessViolationException;
+import cc.kune.core.client.errors.AlreadyGroupMemberException;
+import cc.kune.core.client.errors.LastAdminInGroupException;
+import cc.kune.core.shared.dto.GroupType;
+import cc.kune.core.shared.dto.SocialNetworkRequestResult;
+
import com.google.inject.Inject;
import com.wideplay.warp.persist.Transactional;
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -10,19 +10,6 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.CommentDTO;
-import org.ourproject.kune.platf.client.dto.ContainerDTO;
-import org.ourproject.kune.platf.client.dto.ContainerSimpleDTO;
-import org.ourproject.kune.platf.client.dto.ContentSimpleDTO;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.GroupListDTO;
-import org.ourproject.kune.platf.client.dto.LicenseDTO;
-import org.ourproject.kune.platf.client.dto.LinkDTO;
-import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO;
-import org.ourproject.kune.platf.client.dto.SocialNetworkVisibilityDTO;
-import org.ourproject.kune.platf.client.dto.StateContentDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.dto.UserBuddiesVisibilityDTO;
import org.ourproject.kune.platf.server.TestDomainHelper;
import org.ourproject.kune.platf.server.TestHelper;
import org.ourproject.kune.platf.server.access.AccessRights;
@@ -45,6 +32,20 @@
import org.ourproject.kune.platf.server.sn.UserBuddiesData;
import org.ourproject.kune.platf.server.state.StateContent;
+import cc.kune.core.shared.dto.CommentDTO;
+import cc.kune.core.shared.dto.ContainerDTO;
+import cc.kune.core.shared.dto.ContainerSimpleDTO;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.GroupListDTO;
+import cc.kune.core.shared.dto.LicenseDTO;
+import cc.kune.core.shared.dto.LinkDTO;
+import cc.kune.core.shared.dto.SocialNetworkDataDTO;
+import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.dto.UserBuddiesVisibilityDTO;
+
import com.google.inject.Inject;
public class MapperTest {
Modified: trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -3,7 +3,6 @@
import java.util.HashMap;
import java.util.TimeZone;
-import org.ourproject.kune.platf.client.dto.GroupType;
import org.ourproject.kune.platf.server.domain.AccessLists;
import org.ourproject.kune.platf.server.domain.Group;
import org.ourproject.kune.platf.server.domain.I18nCountry;
@@ -11,6 +10,8 @@
import org.ourproject.kune.platf.server.domain.SocialNetwork;
import org.ourproject.kune.platf.server.domain.User;
+import cc.kune.core.shared.dto.GroupType;
+
public class DomainContext {
private final HashMap<String, User> users;
private final HashMap<String, Group> groups;
Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -3,13 +3,14 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.ourproject.kune.platf.client.dto.GroupDTO;
-import org.ourproject.kune.platf.client.dto.GroupType;
-import org.ourproject.kune.platf.client.dto.StateToken;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.GroupType;
+import cc.kune.core.shared.dto.StateToken;
+
public class EntityLogoPresenterTest {
private StateManager stateManager;
Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenterTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenterTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenterTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -3,12 +3,13 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFirstFormView;
import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFrdFormView;
import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardSndFormView;
import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardTrdFormView;
+import cc.kune.core.client.state.Session;
+
public class LicenseWizardPresenterTest {
private LicenseWizardView view;
Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -4,9 +4,10 @@
import org.junit.Before;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+
public class RolActionTest {
private AccessRightsDTO adminRights;
Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -4,9 +4,10 @@
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.dto.AccessRolDTO;
+
public class RolComparatorTest {
@Test
Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -5,13 +5,14 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.ourproject.kune.platf.client.dto.StateContainerDTO;
-import org.ourproject.kune.platf.client.dto.TagCloudResultDTO;
-import org.ourproject.kune.platf.client.dto.TagCountDTO;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.search.SiteSearcher;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.TagCloudResultDTO;
+import cc.kune.core.shared.dto.TagCountDTO;
+
import com.calclab.suco.client.ioc.Provider;
public class TagsSummaryPresenterTest {
Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenterTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenterTest.java 2010-12-08 20:00:05 UTC (rev 1162)
+++ trunk/src/test/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenterTest.java 2010-12-09 16:03:51 UTC (rev 1163)
@@ -3,11 +3,12 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
import org.ourproject.kune.workspace.client.tool.ToolSelectorItem;
import org.ourproject.kune.workspace.client.tool.ToolSelectorPresenter;
+import cc.kune.core.client.state.StateManager;
+
public class ToolSelectorPresenterTest {
private static final String TOOL1_NAME = "tool1";
More information about the kune-commits
mailing list